From 47428dfa55435e9b040243a0783f0f25a49c8e76 Mon Sep 17 00:00:00 2001 From: Leander Beernaert Date: Tue, 12 Nov 2019 14:01:48 +0100 Subject: Convert all of tests/manual Fixes: QTBUG-78164 Change-Id: I28b59bf84533fc33fafafd1511b5337d36af0e2b Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor --- tests/manual/CMakeLists.txt | 161 +++++++++++++++++++------------------------- 1 file changed, 69 insertions(+), 92 deletions(-) (limited to 'tests/manual/CMakeLists.txt') diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 60ade82759..31547f6df7 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -1,98 +1,75 @@ -# Generated from tests/manual/manual.pro. +# Generated from manual.pro. -# special case begin -# Ignore this folder for now as we need to wait for changes in dev to make -# it back into wip/cmake regarding duplicate target names -return() -# special case end - -add_subdirectory("bearerex") -add_subdirectory("filetest") -add_subdirectory("embeddedintoforeignwindow") -add_subdirectory("foreignwindows") -add_subdirectory("gestures") -add_subdirectory("highdpi") -add_subdirectory("inputmethodhints") -add_subdirectory("keypadnavigation") -add_subdirectory("lance") -add_subdirectory("network_remote_stresstest") -add_subdirectory("network_stresstest") -add_subdirectory("qcursor") -add_subdirectory("qdesktopservices") -add_subdirectory("qdesktopwidget") -add_subdirectory("qgraphicsitem") -add_subdirectory("qgraphicsitemgroup") -add_subdirectory("qgraphicslayout/flicker") -add_subdirectory("qhttpnetworkconnection") -add_subdirectory("qimagereader") -add_subdirectory("qlayout") -add_subdirectory("qlocale") -add_subdirectory("qmimedatabase") -add_subdirectory("qnetworkaccessmanager/qget") -add_subdirectory("qnetworkconfigurationmanager") -add_subdirectory("qnetworkconfiguration") -add_subdirectory("qnetworkreply") -add_subdirectory("qstorageinfo") -add_subdirectory("qscreen") -add_subdirectory("qssloptions") -add_subdirectory("qsslsocket") -add_subdirectory("qsysinfo") -add_subdirectory("qtabletevent") -add_subdirectory("qtexteditlist") -add_subdirectory("qtbug-8933") -add_subdirectory("qtbug-52641") -add_subdirectory("qtouchevent") -add_subdirectory("touch") -add_subdirectory("qwidget_zorder") -add_subdirectory("repaint") -add_subdirectory("socketengine") -add_subdirectory("textrendering") -add_subdirectory("widgets") -add_subdirectory("windowflags") -add_subdirectory("windowgeometry") -add_subdirectory("windowmodality") -add_subdirectory("widgetgrab") -add_subdirectory("xembed-raster") -add_subdirectory("xembed-widgets") -add_subdirectory("shortcuts") -add_subdirectory("dialogs") -add_subdirectory("windowtransparency") -add_subdirectory("unc") -add_subdirectory("qtabbar") - -if(NOT ${QT_FEATURE_openssl}) - ### remove_subdirectory("qssloptions") +add_subdirectory(bearerex) +add_subdirectory(filetest) +add_subdirectory(embeddedintoforeignwindow) +add_subdirectory(foreignwindows) +add_subdirectory(gestures) +add_subdirectory(highdpi) +add_subdirectory(inputmethodhints) +add_subdirectory(keypadnavigation) +add_subdirectory(lance) +add_subdirectory(qcursor) +add_subdirectory(qdesktopservices) +add_subdirectory(qdesktopwidget) +add_subdirectory(qgraphicsitem) +add_subdirectory(qgraphicsitemgroup) +add_subdirectory(qgraphicslayout/flicker) +add_subdirectory(qhttpnetworkconnection) +add_subdirectory(qimagereader) +add_subdirectory(qlayout) +add_subdirectory(qlocale) +add_subdirectory(qmimedatabase) +add_subdirectory(qnetconmonitor) +add_subdirectory(qnetworkaccessmanager/qget) +add_subdirectory(qnetworkconfigurationmanager) +add_subdirectory(qnetworkconfiguration) +#special case begin +if (QT_FEATURE_openssl AND UNIX) + add_subdirectory(qnetworkreply) endif() - -if(${QT_FEATURE_opengl}) - add_subdirectory("qopengltextureblitter") - - if(${QT_FEATURE_egl}) - add_subdirectory("qopenglcontext") - endif() +#special case end +add_subdirectory(qstorageinfo) +add_subdirectory(qscreen) +add_subdirectory(qsslsocket) +add_subdirectory(qsysinfo) +add_subdirectory(qtabletevent) +add_subdirectory(qtexteditlist) +add_subdirectory(qtexttableborders) +add_subdirectory(qtbug-8933) +add_subdirectory(qtbug-52641) +add_subdirectory(qtouchevent) +add_subdirectory(touch) +add_subdirectory(qwidget_zorder) +add_subdirectory(repaint) +add_subdirectory(socketengine) +add_subdirectory(textrendering) +add_subdirectory(widgets) +add_subdirectory(windowflags) +add_subdirectory(windowgeometry) +add_subdirectory(windowmodality) +add_subdirectory(widgetgrab) +add_subdirectory(xembed-raster) +add_subdirectory(xembed-widgets) +add_subdirectory(shortcuts) +add_subdirectory(dialogs) +add_subdirectory(windowtransparency) +add_subdirectory(unc) +add_subdirectory(qtabbar) +add_subdirectory(rhi) +if(UNIX) + add_subdirectory(network_remote_stresstest) + add_subdirectory(network_stresstest) endif() - -if(WIN32) - ### remove_subdirectory("network_remote_stresstest") - ### remove_subdirectory("network_stresstest") +if(QT_FEATURE_openssl) + add_subdirectory(qssloptions) endif() - -if(lessThan(QT_MAJOR_VERSION, 5)) - ### remove_subdirectory("bearerex") - ### remove_subdirectory("lance") - ### remove_subdirectory("qnetworkaccessmanager/qget") - ### remove_subdirectory("qmimedatabase") - ### remove_subdirectory("qnetworkreply") - ### remove_subdirectory("qpainfo") - ### remove_subdirectory("qscreen") - ### remove_subdirectory("socketengine") - ### remove_subdirectory("xembed-raster") - ### remove_subdirectory("xembed-widgets") - ### remove_subdirectory("windowtransparency") - ### remove_subdirectory("embeddedintoforeignwindow") - ### remove_subdirectory("foreignwindows") +if(QT_FEATURE_opengl) + add_subdirectory(qopengltextureblitter) endif() - -if(${QT_FEATURE_vulkan}) - add_subdirectory("qvulkaninstance") +if(QT_FEATURE_egl AND QT_FEATURE_opengl) + add_subdirectory(qopenglcontext) +endif() +if(QT_FEATURE_vulkan) + add_subdirectory(qvulkaninstance) endif() -- cgit v1.2.3