From 0d177053b9406e2fb21802d23f2b2cdc0f974377 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 12 Feb 2020 10:24:49 +0100 Subject: Regenerate projects one last time before merge Change-Id: Ia24cf56b79ca6dacd370a7e397024e9b663e0167 Reviewed-by: Liang Qi Reviewed-by: Simon Hausmann --- tests/manual/cocoa/wheelevent/CMakeLists.txt | 5 ++--- .../manual/embeddedintoforeignwindow/CMakeLists.txt | 9 +++------ tests/manual/foreignwindows/CMakeLists.txt | 9 +++------ tests/manual/highdpi/CMakeLists.txt | 3 +-- tests/manual/lance/CMakeLists.txt | 5 ++--- .../manual/network_remote_stresstest/CMakeLists.txt | 5 ++--- tests/manual/network_stresstest/CMakeLists.txt | 4 +--- tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt | 5 ++--- tests/manual/qnetconmonitor/.prev_CMakeLists.txt | 4 +--- tests/manual/qnetconmonitor/CMakeLists.txt | 4 +--- tests/manual/qnetworkreply/.prev_CMakeLists.txt | 5 ++--- tests/manual/qnetworkreply/CMakeLists.txt | 5 ++--- tests/manual/qopenglcontext/CMakeLists.txt | 6 ++---- .../qopengltextureblitter/.prev_CMakeLists.txt | 20 ++++++++++++++++++++ tests/manual/qopengltextureblitter/CMakeLists.txt | 3 +-- .../manual/qopenglwidget/openglwidget/CMakeLists.txt | 7 +++---- tests/manual/qprintdevice_dump/CMakeLists.txt | 4 +--- tests/manual/qt_poll/CMakeLists.txt | 3 +-- tests/manual/qvulkaninstance/CMakeLists.txt | 3 +-- .../manual/rhi/compressedtexture_bc1/CMakeLists.txt | 3 +-- .../compressedtexture_bc1_subupload/CMakeLists.txt | 3 +-- tests/manual/rhi/computebuffer/CMakeLists.txt | 3 +-- tests/manual/rhi/computeimage/CMakeLists.txt | 3 +-- tests/manual/rhi/cubemap/CMakeLists.txt | 3 +-- tests/manual/rhi/cubemap_scissor/CMakeLists.txt | 3 +-- tests/manual/rhi/floattexture/CMakeLists.txt | 3 +-- .../rhi/hellominimalcrossgfxtriangle/CMakeLists.txt | 3 +-- tests/manual/rhi/instancing/CMakeLists.txt | 3 +-- tests/manual/rhi/mrt/CMakeLists.txt | 3 +-- tests/manual/rhi/msaarenderbuffer/CMakeLists.txt | 3 +-- tests/manual/rhi/msaatexture/CMakeLists.txt | 3 +-- tests/manual/rhi/multiwindow/CMakeLists.txt | 3 +-- tests/manual/rhi/multiwindow_threaded/CMakeLists.txt | 3 +-- tests/manual/rhi/offscreen/CMakeLists.txt | 3 +-- tests/manual/rhi/qrhiprof/CMakeLists.txt | 3 +-- tests/manual/rhi/shadowmap/CMakeLists.txt | 3 +-- tests/manual/rhi/texuploads/CMakeLists.txt | 3 +-- tests/manual/rhi/triquadcube/CMakeLists.txt | 3 +-- tests/manual/socketengine/.prev_CMakeLists.txt | 4 +--- tests/manual/socketengine/CMakeLists.txt | 4 +--- tests/manual/textrendering/nativetext/CMakeLists.txt | 5 ++--- tests/manual/triangulator/CMakeLists.txt | 3 +-- .../widgets/itemviews/qtreewidget/CMakeLists.txt | 3 +-- .../manual/widgets/kernel/sizeonhide/CMakeLists.txt | 3 +-- tests/manual/xcb_gl_integration/CMakeLists.txt | 3 +-- 45 files changed, 78 insertions(+), 113 deletions(-) create mode 100644 tests/manual/qopengltextureblitter/.prev_CMakeLists.txt (limited to 'tests/manual') diff --git a/tests/manual/cocoa/wheelevent/CMakeLists.txt b/tests/manual/cocoa/wheelevent/CMakeLists.txt index b3c1a10226..305036fa78 100644 --- a/tests/manual/cocoa/wheelevent/CMakeLists.txt +++ b/tests/manual/cocoa/wheelevent/CMakeLists.txt @@ -9,11 +9,10 @@ add_qt_manual_test(wheelevent SOURCES main.cpp window.cpp window.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt index a40a655f4d..02c0893cde 100644 --- a/tests/manual/embeddedintoforeignwindow/CMakeLists.txt +++ b/tests/manual/embeddedintoforeignwindow/CMakeLists.txt @@ -16,11 +16,10 @@ add_qt_manual_test(embeddedintoforeignwindow QT_DIAG_LIB INCLUDE_DIRECTORIES ../diaglib - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:embeddedintoforeignwindow.pro:: @@ -46,10 +45,8 @@ extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_widgets ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) extend_target(embeddedintoforeignwindow CONDITION QT_FEATURE_opengl diff --git a/tests/manual/foreignwindows/CMakeLists.txt b/tests/manual/foreignwindows/CMakeLists.txt index 707d7e7056..8a7f525198 100644 --- a/tests/manual/foreignwindows/CMakeLists.txt +++ b/tests/manual/foreignwindows/CMakeLists.txt @@ -15,11 +15,10 @@ add_qt_manual_test(foreignwindows QT_DIAG_LIB INCLUDE_DIRECTORIES ../diaglib - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) @@ -46,10 +45,8 @@ extend_target(foreignwindows CONDITION QT_FEATURE_widgets ../diaglib/debugproxystyle.cpp ../diaglib/debugproxystyle.h ../diaglib/logwidget.cpp ../diaglib/logwidget.h ../diaglib/qwidgetdump.cpp ../diaglib/qwidgetdump.h - LIBRARIES - Qt::WidgetsPrivate PUBLIC_LIBRARIES - Qt::Widgets + Qt::WidgetsPrivate ) extend_target(foreignwindows CONDITION QT_FEATURE_opengl diff --git a/tests/manual/highdpi/CMakeLists.txt b/tests/manual/highdpi/CMakeLists.txt index b1983ff00a..dee2d1ae43 100644 --- a/tests/manual/highdpi/CMakeLists.txt +++ b/tests/manual/highdpi/CMakeLists.txt @@ -12,10 +12,9 @@ add_qt_manual_test(highdpi HAVE_SCREEN_BASE_DPI INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/lance/CMakeLists.txt b/tests/manual/lance/CMakeLists.txt index bf4021f60f..ea7be24e76 100644 --- a/tests/manual/lance/CMakeLists.txt +++ b/tests/manual/lance/CMakeLists.txt @@ -13,11 +13,10 @@ add_qt_manual_test(lance INCLUDE_DIRECTORIES . ../../auto/other/lancelot - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::PrintSupport Qt::Widgets ) diff --git a/tests/manual/network_remote_stresstest/CMakeLists.txt b/tests/manual/network_remote_stresstest/CMakeLists.txt index 4293925a8f..46db952b46 100644 --- a/tests/manual/network_remote_stresstest/CMakeLists.txt +++ b/tests/manual/network_remote_stresstest/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(tst_network_remote_stresstest SOURCES tst_network_remote_stresstest.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/network_stresstest/CMakeLists.txt b/tests/manual/network_stresstest/CMakeLists.txt index a8ba9e29b6..310c62dae8 100644 --- a/tests/manual/network_stresstest/CMakeLists.txt +++ b/tests/manual/network_stresstest/CMakeLists.txt @@ -10,11 +10,9 @@ add_qt_manual_test(tst_network_stresstest tst_network_stresstest.cpp DEFINES QT_DISABLE_DEPRECATED_BEFORE=0 - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt index 30594c8e0b..9489d0675e 100644 --- a/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt +++ b/tests/manual/qcursor/qcursorhighdpi/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(qcursorhighdpi SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt index ac9e963905..ed552bc435 100644 --- a/tests/manual/qnetconmonitor/.prev_CMakeLists.txt +++ b/tests/manual/qnetconmonitor/.prev_CMakeLists.txt @@ -7,10 +7,8 @@ add_qt_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetconmonitor/CMakeLists.txt b/tests/manual/qnetconmonitor/CMakeLists.txt index 21aee91c1d..8eda85b783 100644 --- a/tests/manual/qnetconmonitor/CMakeLists.txt +++ b/tests/manual/qnetconmonitor/CMakeLists.txt @@ -13,10 +13,8 @@ endif() add_qt_manual_test(qnetconmonitor SOURCES tst_qnetconmonitor.cpp - LIBRARIES - Qt::NetworkPrivate PUBLIC_LIBRARIES - Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetworkreply/.prev_CMakeLists.txt b/tests/manual/qnetworkreply/.prev_CMakeLists.txt index f291a6aac2..24854aa64f 100644 --- a/tests/manual/qnetworkreply/.prev_CMakeLists.txt +++ b/tests/manual/qnetworkreply/.prev_CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(tst_manual_qnetworkreply SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qnetworkreply/CMakeLists.txt b/tests/manual/qnetworkreply/CMakeLists.txt index 9cad41bf58..5ac12ced95 100644 --- a/tests/manual/qnetworkreply/CMakeLists.txt +++ b/tests/manual/qnetworkreply/CMakeLists.txt @@ -13,11 +13,10 @@ endif() add_qt_manual_test(tst_manual_qnetworkreply SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::NetworkPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network + Qt::NetworkPrivate Qt::Test ) diff --git a/tests/manual/qopenglcontext/CMakeLists.txt b/tests/manual/qopenglcontext/CMakeLists.txt index fc5d4e28d4..9cec06ff1e 100644 --- a/tests/manual/qopenglcontext/CMakeLists.txt +++ b/tests/manual/qopenglcontext/CMakeLists.txt @@ -9,12 +9,10 @@ add_qt_manual_test(qopenglcontext SOURCES main.cpp qopenglcontextwindow.cpp qopenglcontextwindow.h - LIBRARIES - Qt::EglSupportPrivate - Qt::GuiPrivate PUBLIC_LIBRARIES - Qt::EglSupport + Qt::EglSupportPrivate Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qopenglcontext.pro:: diff --git a/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt new file mode 100644 index 0000000000..f56583c1e0 --- /dev/null +++ b/tests/manual/qopengltextureblitter/.prev_CMakeLists.txt @@ -0,0 +1,20 @@ +# Generated from qopengltextureblitter.pro. + +##################################################################### +## qopengltextureblitter Binary: +##################################################################### + +add_qt_manual_test(qopengltextureblitter + GUI + SOURCES + main.cpp + qopengltextureblitwindow.cpp qopengltextureblitwindow.h + INCLUDE_DIRECTORIES + . + PUBLIC_LIBRARIES + Qt::Gui + Qt::GuiPrivate +) + +#### Keys ignored in scope 1:.:.:qopengltextureblitter.pro:: +# TEMPLATE = "app" diff --git a/tests/manual/qopengltextureblitter/CMakeLists.txt b/tests/manual/qopengltextureblitter/CMakeLists.txt index 2c18c56d36..1fe33049fc 100644 --- a/tests/manual/qopengltextureblitter/CMakeLists.txt +++ b/tests/manual/qopengltextureblitter/CMakeLists.txt @@ -11,10 +11,9 @@ add_qt_manual_test(qopengltextureblitter qopengltextureblitwindow.cpp qopengltextureblitwindow.h INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::OpenGL # special case ) diff --git a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt index ddc48339b3..ffdb888040 100644 --- a/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt +++ b/tests/manual/qopenglwidget/openglwidget/CMakeLists.txt @@ -9,13 +9,12 @@ add_qt_manual_test(openglwidget SOURCES main.cpp openglwidget.cpp openglwidget.h - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate - Qt::WidgetsPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets + Qt::WidgetsPrivate ) #### Keys ignored in scope 1:.:.:openglwidget.pro:: diff --git a/tests/manual/qprintdevice_dump/CMakeLists.txt b/tests/manual/qprintdevice_dump/CMakeLists.txt index 3725ec062b..f619024286 100644 --- a/tests/manual/qprintdevice_dump/CMakeLists.txt +++ b/tests/manual/qprintdevice_dump/CMakeLists.txt @@ -8,11 +8,9 @@ add_qt_manual_test(qprintdevice_dump GUI SOURCES main.cpp - LIBRARIES - Qt::PrintSupportPrivate PUBLIC_LIBRARIES Qt::Gui - Qt::PrintSupport + Qt::PrintSupportPrivate ) #### Keys ignored in scope 1:.:.:qprintdevice_dump.pro:: diff --git a/tests/manual/qt_poll/CMakeLists.txt b/tests/manual/qt_poll/CMakeLists.txt index 5445a7a2ec..0e19e6a4e3 100644 --- a/tests/manual/qt_poll/CMakeLists.txt +++ b/tests/manual/qt_poll/CMakeLists.txt @@ -10,8 +10,7 @@ add_qt_test(tst_qt_poll tst_qt_poll.cpp INCLUDE_DIRECTORIES ../../../src/corelib/kernel - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Network ) diff --git a/tests/manual/qvulkaninstance/CMakeLists.txt b/tests/manual/qvulkaninstance/CMakeLists.txt index 74d0dab594..2071010da1 100644 --- a/tests/manual/qvulkaninstance/CMakeLists.txt +++ b/tests/manual/qvulkaninstance/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(qvulkaninstance GUI SOURCES main.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:qvulkaninstance.pro:: diff --git a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt index a3754c7d75..5da0ad2932 100644 --- a/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1 GUI SOURCES compressedtexture_bc1.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt index c3c2147eb8..bd82a5cb0d 100644 --- a/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt +++ b/tests/manual/rhi/compressedtexture_bc1_subupload/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(compressedtexture_bc1_subupload GUI SOURCES compressedtexture_bc1_subupload.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/computebuffer/CMakeLists.txt b/tests/manual/rhi/computebuffer/CMakeLists.txt index 41d46fcc56..e2a959c1e4 100644 --- a/tests/manual/rhi/computebuffer/CMakeLists.txt +++ b/tests/manual/rhi/computebuffer/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(computebuffer GUI SOURCES computebuffer.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/computeimage/CMakeLists.txt b/tests/manual/rhi/computeimage/CMakeLists.txt index ffb99b8d1c..a634f1cf98 100644 --- a/tests/manual/rhi/computeimage/CMakeLists.txt +++ b/tests/manual/rhi/computeimage/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(computeimage GUI SOURCES computeimage.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/cubemap/CMakeLists.txt b/tests/manual/rhi/cubemap/CMakeLists.txt index 5886b40138..323ad78170 100644 --- a/tests/manual/rhi/cubemap/CMakeLists.txt +++ b/tests/manual/rhi/cubemap/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(cubemap GUI SOURCES cubemap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt index 038209c448..519d9dc6ec 100644 --- a/tests/manual/rhi/cubemap_scissor/CMakeLists.txt +++ b/tests/manual/rhi/cubemap_scissor/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(cubemap_scissor GUI SOURCES cubemap_scissor.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/floattexture/CMakeLists.txt b/tests/manual/rhi/floattexture/CMakeLists.txt index b87ddabab8..3368812524 100644 --- a/tests/manual/rhi/floattexture/CMakeLists.txt +++ b/tests/manual/rhi/floattexture/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(floattexture GUI SOURCES floattexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt index d933d8ae88..ad2e1dd14e 100644 --- a/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt +++ b/tests/manual/rhi/hellominimalcrossgfxtriangle/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(hellominimalcrossgfxtriangle GUI SOURCES hellominimalcrossgfxtriangle.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/instancing/CMakeLists.txt b/tests/manual/rhi/instancing/CMakeLists.txt index f744daf900..8c8d0c2a9a 100644 --- a/tests/manual/rhi/instancing/CMakeLists.txt +++ b/tests/manual/rhi/instancing/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(instancing GUI SOURCES instancing.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/mrt/CMakeLists.txt b/tests/manual/rhi/mrt/CMakeLists.txt index 74fd026166..db63ebe07d 100644 --- a/tests/manual/rhi/mrt/CMakeLists.txt +++ b/tests/manual/rhi/mrt/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(mrt GUI SOURCES mrt.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt index 65a0388f80..26aa8798de 100644 --- a/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt +++ b/tests/manual/rhi/msaarenderbuffer/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(msaarenderbuffer GUI SOURCES msaarenderbuffer.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/msaatexture/CMakeLists.txt b/tests/manual/rhi/msaatexture/CMakeLists.txt index 79dc9d6168..5a3c447db4 100644 --- a/tests/manual/rhi/msaatexture/CMakeLists.txt +++ b/tests/manual/rhi/msaatexture/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(msaatexture GUI SOURCES msaatexture.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/multiwindow/CMakeLists.txt b/tests/manual/rhi/multiwindow/CMakeLists.txt index 67bd6d82be..a3e63b9d06 100644 --- a/tests/manual/rhi/multiwindow/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(multiwindow GUI SOURCES multiwindow.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt index 39224ef40c..f3f220dba6 100644 --- a/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt +++ b/tests/manual/rhi/multiwindow_threaded/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_manual_test(multiwindow_threaded SOURCES multiwindow_threaded.cpp window.cpp window.h - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/rhi/offscreen/CMakeLists.txt b/tests/manual/rhi/offscreen/CMakeLists.txt index ceefc4c0d6..56a9f2661d 100644 --- a/tests/manual/rhi/offscreen/CMakeLists.txt +++ b/tests/manual/rhi/offscreen/CMakeLists.txt @@ -7,10 +7,9 @@ add_qt_manual_test(offscreen SOURCES offscreen.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/qrhiprof/CMakeLists.txt b/tests/manual/rhi/qrhiprof/CMakeLists.txt index d0a11e94b3..8f4fb3797b 100644 --- a/tests/manual/rhi/qrhiprof/CMakeLists.txt +++ b/tests/manual/rhi/qrhiprof/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(qrhiprof GUI SOURCES qrhiprof.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Network Qt::Widgets ) diff --git a/tests/manual/rhi/shadowmap/CMakeLists.txt b/tests/manual/rhi/shadowmap/CMakeLists.txt index 2f80d0209d..d2de92d094 100644 --- a/tests/manual/rhi/shadowmap/CMakeLists.txt +++ b/tests/manual/rhi/shadowmap/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(shadowmap GUI SOURCES shadowmap.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/texuploads/CMakeLists.txt b/tests/manual/rhi/texuploads/CMakeLists.txt index c2efd3a1ea..2e97336a9d 100644 --- a/tests/manual/rhi/texuploads/CMakeLists.txt +++ b/tests/manual/rhi/texuploads/CMakeLists.txt @@ -8,10 +8,9 @@ add_qt_manual_test(texuploads GUI SOURCES texuploads.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/rhi/triquadcube/CMakeLists.txt b/tests/manual/rhi/triquadcube/CMakeLists.txt index 584f9aa4c7..42ebf1f55f 100644 --- a/tests/manual/rhi/triquadcube/CMakeLists.txt +++ b/tests/manual/rhi/triquadcube/CMakeLists.txt @@ -12,10 +12,9 @@ add_qt_manual_test(triquadcube triangleoncuberenderer.cpp triangleoncuberenderer.h trianglerenderer.cpp trianglerenderer.h triquadcube.cpp - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) # Resources: diff --git a/tests/manual/socketengine/.prev_CMakeLists.txt b/tests/manual/socketengine/.prev_CMakeLists.txt index 1540a1f552..61635f7e77 100644 --- a/tests/manual/socketengine/.prev_CMakeLists.txt +++ b/tests/manual/socketengine/.prev_CMakeLists.txt @@ -7,11 +7,9 @@ add_qt_manual_test(tst_socketengine SOURCES main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/socketengine/CMakeLists.txt b/tests/manual/socketengine/CMakeLists.txt index 4ac94fd180..927955c3db 100644 --- a/tests/manual/socketengine/CMakeLists.txt +++ b/tests/manual/socketengine/CMakeLists.txt @@ -13,11 +13,9 @@ endif() add_qt_manual_test(tst_socketengine SOURCES main.cpp - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::NetworkPrivate - PUBLIC_LIBRARIES - Qt::Network Qt::Test ) diff --git a/tests/manual/textrendering/nativetext/CMakeLists.txt b/tests/manual/textrendering/nativetext/CMakeLists.txt index c7d50f2a6f..c03a8ed288 100644 --- a/tests/manual/textrendering/nativetext/CMakeLists.txt +++ b/tests/manual/textrendering/nativetext/CMakeLists.txt @@ -7,11 +7,10 @@ add_qt_manual_test(nativetext SOURCES main.cpp - LIBRARIES - Qt::CorePrivate - Qt::GuiPrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/triangulator/CMakeLists.txt b/tests/manual/triangulator/CMakeLists.txt index 8c6e8eb021..f3ebfb28a9 100644 --- a/tests/manual/triangulator/CMakeLists.txt +++ b/tests/manual/triangulator/CMakeLists.txt @@ -9,10 +9,9 @@ add_qt_manual_test(triangulator SOURCES main.cpp triviswidget.cpp triviswidget.h - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate Qt::Widgets ) diff --git a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt index c9e100714a..f6b1a2f7eb 100644 --- a/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt +++ b/tests/manual/widgets/itemviews/qtreewidget/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_manual_test(qtreewidget GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt index 046153464b..b1f8353a4f 100644 --- a/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt +++ b/tests/manual/widgets/kernel/sizeonhide/CMakeLists.txt @@ -8,9 +8,8 @@ add_qt_manual_test(sizeonhide GUI SOURCES main.cpp - LIBRARIES - Qt::CorePrivate PUBLIC_LIBRARIES + Qt::CorePrivate Qt::Gui Qt::Widgets ) diff --git a/tests/manual/xcb_gl_integration/CMakeLists.txt b/tests/manual/xcb_gl_integration/CMakeLists.txt index ac532a7c61..e92e47fb8a 100644 --- a/tests/manual/xcb_gl_integration/CMakeLists.txt +++ b/tests/manual/xcb_gl_integration/CMakeLists.txt @@ -10,10 +10,9 @@ add_qt_manual_test(xcb_gl_integration main.cpp INCLUDE_DIRECTORIES . - LIBRARIES - Qt::GuiPrivate PUBLIC_LIBRARIES Qt::Gui + Qt::GuiPrivate ) #### Keys ignored in scope 1:.:.:xcb_gl_integration.pro:: -- cgit v1.2.3