diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-28 10:19:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-07-30 08:51:45 +0200 |
| commit | b7e91572aacfbba55c50a786caedafac1a1f139c (patch) | |
| tree | 4563188735ec854b43650c563d9e85ce07140bbd /examples/activeqt | |
| parent | 96192215e2099c7679d431656383e45653e44ee8 (diff) | |
Disable server examples for MinGW
It is missing the midl tool. The .pro file was incorrectly ported;
its last line clear the variable.
Pick-to: 6.2
Fixes: QTBUG-95406
Change-Id: I157b5c032e506b9481f1af1ed8153506b40cd79d
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'examples/activeqt')
| -rw-r--r-- | examples/activeqt/CMakeLists.txt | 26 |
1 files 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() |