diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-03 01:01:00 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-04-03 09:01:44 +0200 |
| commit | 86d9e36b06b0347e1b7bd1b7f90618eab515dfaf (patch) | |
| tree | 09dcae6127adb35d6ecb5273eba7a54e842917e8 /tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | |
| parent | cabd8f860b54c1692bd03876c1bfcc3e14b56503 (diff) | |
| parent | 333d7e6de434fbe7777f948761ac5e7b5065d83f (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
tests/benchmarks/corelib/text/qstringlist/qstringlist.pro
Change-Id: Ie9b97bd83c2df00fd9b556b5f09d405f71970169
Diffstat (limited to 'tests/benchmarks/corelib/io/qiodevice/qiodevice.pro')
| -rw-r--r-- | tests/benchmarks/corelib/io/qiodevice/qiodevice.pro | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro index 7937436e13..febe6e87f9 100644 --- a/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro +++ b/tests/benchmarks/corelib/io/qiodevice/qiodevice.pro @@ -1,8 +1,6 @@ TEMPLATE = app -TARGET = tst_bench_qiodevice - +CONFIG += benchmark QT = core testlib -CONFIG += release - +TARGET = tst_bench_qiodevice SOURCES += main.cpp |