diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-10 11:51:23 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-09-11 00:40:46 +0200 |
commit | 069fc33e8a0a092fe0283b5073262fab14f82646 (patch) | |
tree | 57a87708702d649ffc12ba6e0ec36b2631103bbb | |
parent | 6ae7a02104631a2234c475575ae15ca79bef14f9 (diff) |
Remove the -no-compile-examples configure switch
If '-make examples -no-compile-examples' was specified, sources of Qt's
examples would be installed, but the examples would not be built.
This switch has always been a source for confusion and is only
interesting for distributors, who can just package the examples
directory tree.
Change-Id: I0291d70e4951d98b553a4abf217db49d05316d3a
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r-- | .prev_qt_cmdline.cmake | 1 | ||||
-rw-r--r-- | cmake/configure-cmake-mapping.md | 1 | ||||
-rw-r--r-- | config_help.txt | 2 | ||||
-rw-r--r-- | configure.cmake | 5 | ||||
-rw-r--r-- | configure.json | 6 | ||||
-rw-r--r-- | mkspecs/features/qt_example_installs.prf | 13 | ||||
-rw-r--r-- | qt_cmdline.cmake | 1 | ||||
-rwxr-xr-x | util/cmake/configurejson2cmake.py | 1 |
8 files changed, 1 insertions, 29 deletions
diff --git a/.prev_qt_cmdline.cmake b/.prev_qt_cmdline.cmake index f8e40b38ad..ce0f087983 100644 --- a/.prev_qt_cmdline.cmake +++ b/.prev_qt_cmdline.cmake @@ -43,7 +43,6 @@ qt_commandline_option(avx512 TYPE boolean NAME avx512f) qt_commandline_option(c++std TYPE cxxstd) qt_commandline_option(ccache TYPE boolean NAME ccache) qt_commandline_option(commercial TYPE void) -qt_commandline_option(compile-examples TYPE boolean NAME compile_examples) qt_commandline_option(confirm-license TYPE void) qt_commandline_option(coverage TYPE coverage) qt_commandline_option(dbus TYPE optionalString VALUES no yes linked runtime) diff --git a/cmake/configure-cmake-mapping.md b/cmake/configure-cmake-mapping.md index 3116aa0be0..ba4dcb2dc0 100644 --- a/cmake/configure-cmake-mapping.md +++ b/cmake/configure-cmake-mapping.md @@ -100,7 +100,6 @@ The effort of this is tracked in QTBUG-85373 and QTBUG-85349. | | -DBUILD_EXAMPLES=ON | | | -nomake <part> | -DBUILD_TESTING=OFF | A way to turn off tools explicitly is missing. | | | -DBUILD_EXAMPLES=OFF | | -| -compile-examples | | | | -no-gui | | | | -no-widgets | -DFEATURE_widgets=OFF | | | -no-dbus | -DFEATURE_dbus=OFF | | diff --git a/config_help.txt b/config_help.txt index e981eba411..2cb34865bf 100644 --- a/config_help.txt +++ b/config_help.txt @@ -223,8 +223,6 @@ Component selection: [libs and examples, also tools if not cross-building, also tests if -developer-build] -nomake <part> ....... Exclude <part> from the list of parts to be built. - -compile-examples .... When unset, install only the sources of examples - [no on WebAssembly, otherwise yes] -gui ................. Build the Qt GUI module and dependencies [yes] -widgets ............. Build the Qt Widgets module and dependencies [yes] -no-dbus ............. Do not build the Qt D-Bus module diff --git a/configure.cmake b/configure.cmake index e6302b5816..754f0c324c 100644 --- a/configure.cmake +++ b/configure.cmake @@ -889,11 +889,6 @@ qt_feature("libudev" PRIVATE LABEL "udev" CONDITION Libudev_FOUND ) -qt_feature("compile_examples" - LABEL "Compile examples" - AUTODETECT NOT WASM -) -qt_feature_config("compile_examples" QMAKE_PRIVATE_CONFIG) qt_feature("ccache" LABEL "Using ccache" AUTODETECT 1 diff --git a/configure.json b/configure.json index a00a22c6da..6f62600090 100644 --- a/configure.json +++ b/configure.json @@ -64,7 +64,6 @@ "c++std": "cxxstd", "ccache": { "type": "boolean", "name": "ccache" }, "commercial": "void", - "compile-examples": { "type": "boolean", "name": "compile_examples" }, "confirm-license": "void", "coverage": "coverage", "dbus": { "type": "optionalString", "values": [ "no", "yes", "linked", "runtime" ] }, @@ -1364,11 +1363,6 @@ "condition": "libs.libudev", "output": [ "privateFeature" ] }, - "compile_examples": { - "label": "Compile examples", - "autoDetect": "!config.wasm", - "output": [ "privateConfig" ] - }, "incredibuild_xge": { "label": "IncrediBuild", "emitIf": "var.QMAKE_HOST.os == 'Windows'", diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf index 15b373ba40..a71966b12c 100644 --- a/mkspecs/features/qt_example_installs.prf +++ b/mkspecs/features/qt_example_installs.prf @@ -135,15 +135,4 @@ equals(TEMPLATE, app)|equals(TEMPLATE, lib) { } } -!equals(TEMPLATE, subdirs):!compile_examples { - TEMPLATE = aux - CONFIG -= have_target qt staticlib dll - SOURCES = - OBJECTIVE_SOURCES = - INSTALLS -= target - QMAKE_SUBSTITUTES = - QMAKE_EXTRA_COMPILERS = - COPIES = -} else { - CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable -} +CONFIG += relative_qt_rpath # Examples built as part of Qt should be relocatable diff --git a/qt_cmdline.cmake b/qt_cmdline.cmake index 57f63bded7..711dc599c6 100644 --- a/qt_cmdline.cmake +++ b/qt_cmdline.cmake @@ -43,7 +43,6 @@ qt_commandline_option(avx512 TYPE boolean NAME avx512f) qt_commandline_option(c++std TYPE cxxstd) qt_commandline_option(ccache TYPE boolean NAME ccache) qt_commandline_option(commercial TYPE void) -qt_commandline_option(compile-examples TYPE boolean NAME compile_examples) qt_commandline_option(confirm-license TYPE void) qt_commandline_option(coverage TYPE coverage) qt_commandline_option(dbus TYPE optionalString VALUES no yes linked runtime) diff --git a/util/cmake/configurejson2cmake.py b/util/cmake/configurejson2cmake.py index 2dfd8e16a0..cccfabb9e8 100755 --- a/util/cmake/configurejson2cmake.py +++ b/util/cmake/configurejson2cmake.py @@ -422,7 +422,6 @@ def parseInput(ctx, sinput, data, cm_fh): "c++std", "ccache", "commercial", - "compile-examples", "confirm-license", "dbus", "dbus-runtime", |