From 5c28fce38ecd9dc056e18ad124aba670f792c97e Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 13 Nov 2019 13:37:20 +0100 Subject: Regenerate qtbase tests and src/* for some small fixes Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46 Reviewed-by: Leander Beernaert Reviewed-by: Simon Hausmann --- src/plugins/bearer/connman/.prev_CMakeLists.txt | 1 - .../bearer/networkmanager/.prev_CMakeLists.txt | 1 - .../gui/kernel/qclipboard/copier/CMakeLists.txt | 1 - .../gui/kernel/qclipboard/paster/CMakeLists.txt | 1 - .../qtcpserver/crashingServer/CMakeLists.txt | 1 - .../desktopsettingsaware/.prev_CMakeLists.txt | 1 - .../desktopsettingsaware/CMakeLists.txt | 1 - .../kernel/qapplication/modal/.prev_CMakeLists.txt | 1 - .../kernel/qapplication/modal/CMakeLists.txt | 1 - .../kernel/qtimer_vs_qmetaobject/CMakeLists.txt | 1 - .../graphicsview/qgraphicsview/CMakeLists.txt | 24 +++++++++++----------- 11 files changed, 12 insertions(+), 22 deletions(-) diff --git a/src/plugins/bearer/connman/.prev_CMakeLists.txt b/src/plugins/bearer/connman/.prev_CMakeLists.txt index ff368dd693..c1940a1e16 100644 --- a/src/plugins/bearer/connman/.prev_CMakeLists.txt +++ b/src/plugins/bearer/connman/.prev_CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qconnmanbearer #### Keys ignored in scope 1:.:.:connman.pro:: # OTHER_FILES = "connman.json" -# _LOADED = "qt_plugin" diff --git a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt index 171250233e..f0748bebde 100644 --- a/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt +++ b/src/plugins/bearer/networkmanager/.prev_CMakeLists.txt @@ -22,4 +22,3 @@ add_qt_plugin(qnmbearer #### Keys ignored in scope 1:.:.:networkmanager.pro:: # OTHER_FILES = "networkmanager.json" -# _LOADED = "qt_plugin" diff --git a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt index 60d2952257..30990c1387 100644 --- a/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/copier/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(copier - GUI SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt index b47ba74d7c..2c90c1530f 100644 --- a/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt +++ b/tests/auto/gui/kernel/qclipboard/paster/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(paster - GUI SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt index aaceafbff3..ad291f2ad8 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt +++ b/tests/auto/network/socket/qtcpserver/crashingServer/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(crashingServer - GUI OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/" SOURCES main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt index ed727a43fa..df5f5f4e6c 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(desktopsettingsaware - GUI SOURCES main.cpp PUBLIC_LIBRARIES diff --git a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt index 3cde934dde..98a38da7c0 100644 --- a/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/desktopsettingsaware/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(desktopsettingsaware_helper # special case - GUI SOURCES main.cpp OUTPUT_DIRECTORY # special case diff --git a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt index b88b028343..fc990e790e 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/.prev_CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(modal - GUI SOURCES base.cpp base.h main.cpp diff --git a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt index e749d74975..c598ca600a 100644 --- a/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt +++ b/tests/auto/widgets/kernel/qapplication/modal/CMakeLists.txt @@ -5,7 +5,6 @@ ##################################################################### add_qt_executable(modal_helper # special case - GUI SOURCES base.cpp base.h main.cpp diff --git a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt index 93091210a9..4160fe7e36 100644 --- a/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt +++ b/tests/benchmarks/corelib/kernel/qtimer_vs_qmetaobject/CMakeLists.txt @@ -11,7 +11,6 @@ add_qt_benchmark(qtimer_vs_qmetaobject . PUBLIC_LIBRARIES Qt::Test - Threads::Threads ) #### Keys ignored in scope 1:.:.:qtimer_vs_qmetaobject.pro:: diff --git a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt index 51efa9a52c..d98e3dba19 100644 --- a/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt +++ b/tests/benchmarks/widgets/graphicsview/qgraphicsview/CMakeLists.txt @@ -16,18 +16,6 @@ add_qt_benchmark(tst_bench_qgraphicsview ) # Resources: -set(images_resource_files - "qt4logo.png" -) - -add_qt_resource(tst_bench_qgraphicsview "images" - PREFIX - "/" - BASE - "chiptester" - FILES - ${images_resource_files} -) set(qgraphicsview_resource_files "images/designer.png" "images/wine-big.jpeg" @@ -41,6 +29,18 @@ add_qt_resource(tst_bench_qgraphicsview "qgraphicsview" FILES ${qgraphicsview_resource_files} ) +set(images_resource_files + "qt4logo.png" +) + +add_qt_resource(tst_bench_qgraphicsview "images" + PREFIX + "/" + BASE + "chiptester" + FILES + ${images_resource_files} +) #### Keys ignored in scope 1:.:.:qgraphicsview.pro:: -- cgit v1.2.3