diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:27:47 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-13 23:29:51 +0100 |
| commit | c53ee1f054fee2d6092c5e24b5b6b131dbd0457b (patch) | |
| tree | ffdc87c81c72b545602c7380bbde3f0ab5c499e0 /tests/benchmarks/gui | |
| parent | 60feaae1967aca5c7b1b0f6cb732962ddd1b2115 (diff) | |
| parent | 0d177053b9406e2fb21802d23f2b2cdc0f974377 (diff) | |
Merge remote-tracking branch 'origin/wip/cmake' into dev
Conflicts:
tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt
Hopefully final merge from wip/cmake, and then all cmake changes
should target dev directly.
Change-Id: I29b04c9b0284e97334877c77a32ffdf887dbf95b
Diffstat (limited to 'tests/benchmarks/gui')
7 files changed, 8 insertions, 15 deletions
diff --git a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt index 2798fe4dbb..e75703f33d 100644 --- a/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt +++ b/tests/benchmarks/gui/image/qpixmap/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qpixmap SOURCES tst_qpixmap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt index b108753c93..add15f25fb 100644 --- a/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/drawtexture/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_drawtexture SOURCES tst_drawtexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt index a4c673af9b..677a3d98d4 100644 --- a/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/lancebench/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_benchmark(tst_bench_lancebench SOURCES ../../../../auto/other/lancelot/paintcommands.cpp ../../../../auto/other/lancelot/paintcommands.h tst_lancebench.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt index 2e365678e9..d5367704ae 100644 --- a/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qcolor/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_qcolor SOURCES tst_qcolor.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt index 926af40a2e..a4e3242409 100644 --- a/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt +++ b/tests/benchmarks/gui/painting/qpainter/CMakeLists.txt @@ -7,13 +7,12 @@ add_qt_benchmark(tst_bench_qpainter SOURCES tst_qpainter.cpp - LIBRARIES - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:qpainter.pro:<TRUE>: diff --git a/tests/benchmarks/gui/text/qtext/CMakeLists.txt b/tests/benchmarks/gui/text/qtext/CMakeLists.txt index a6d4952eba..b2380c8316 100644 --- a/tests/benchmarks/gui/text/qtext/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtext/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_QText SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) diff --git a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt index 1b956b459b..eb1f633d9b 100644 --- a/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt +++ b/tests/benchmarks/gui/text/qtextdocument/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_benchmark(tst_bench_QTextDocument SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Test ) |