From 208adb4c3be98bdd2d34ecb7e85a45051440d0fd Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 28 Jul 2021 10:19:14 +0200 Subject: Disable server examples for MinGW It is missing the midl tool. The .pro file was incorrectly ported; its last line clear the variable. Fixes: QTBUG-95406 Change-Id: I157b5c032e506b9481f1af1ed8153506b40cd79d Reviewed-by: Alexey Edelev Reviewed-by: Oliver Wolff (cherry picked from commit b7e91572aacfbba55c50a786caedafac1a1f139c) Reviewed-by: Qt Cherry-pick Bot --- examples/activeqt/CMakeLists.txt | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/examples/activeqt/CMakeLists.txt b/examples/activeqt/CMakeLists.txt index c71db69..62c0318 100644 --- a/examples/activeqt/CMakeLists.txt +++ b/examples/activeqt/CMakeLists.txt @@ -1,17 +1,19 @@ # Generated from activeqt.pro. -add_subdirectory(comapp) -add_subdirectory(hierarchy) -add_subdirectory(menus) -add_subdirectory(multiple) -add_subdirectory(simple) -add_subdirectory(wrapper) +if(MSVC) + add_subdirectory(comapp) + add_subdirectory(hierarchy) + add_subdirectory(menus) + add_subdirectory(multiple) + add_subdirectory(simple) + add_subdirectory(wrapper) + if(TARGET Qt6::OpenGLWidgets AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2) # special case + add_subdirectory(opengl) + endif() + if(TARGET Qt::QuickControls2) + add_subdirectory(simpleqml) + endif() +endif() if(MINGW OR QT_BUILD_SHARED_LIBS) add_subdirectory(mediaplayer) endif() -if(TARGET Qt6::OpenGLWidgets AND QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2) # special case - add_subdirectory(opengl) -endif() -if(TARGET Qt::QuickControls2) - add_subdirectory(simpleqml) -endif() -- cgit v1.2.3