diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-23 12:37:05 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-02 06:18:48 +0000 |
| commit | e9ba9609f1c3797baf8a54ba7213b56dcbe7e1ec (patch) | |
| tree | 1b86cfd20bae11c3961fc1c7b4770dc430ef398d /configure | |
| parent | c167308c5d8d1660ca517c94ce977a8eb440a99a (diff) | |
Determine the set of modules to skip in qmake
Change-Id: I421f50e5944962eae41700180ee49a916a2a023d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 14 |
1 files changed, 0 insertions, 14 deletions
@@ -483,7 +483,6 @@ QT_ALL_BUILD_PARTS=" libs tools examples tests " QT_DEFAULT_BUILD_PARTS="libs tools examples" CFG_BUILD_PARTS="" CFG_NOBUILD_PARTS="" -CFG_SKIP_MODULES="" CFG_ANDROID_STYLE_ASSETS=yes XPLATFORM= # This seems to be the QMAKESPEC, like "linux-g++" @@ -742,14 +741,6 @@ while [ "$#" -gt 0 ]; do CFG_BUILD_PARTS="$CFG_BUILD_PARTS $VAL" fi ;; - skip) - VAL=qt${VAL#qt} - if ! [ -d $relpath/../$VAL ]; then - echo "Attempting to skip non-existent module $VAL." >&2 - exit 1 - fi - CFG_SKIP_MODULES="$CFG_SKIP_MODULES $VAL" - ;; sdk) if [ "$BUILD_ON_MAC" = "yes" ]; then DeviceVar set !host_build:QMAKE_MAC_SDK "$VAL" @@ -1369,10 +1360,6 @@ fi if [ "$XPLATFORM_IOS" = "yes" ] || [ "$XPLATFORM_TVOS" = "yes" ]; then CFG_NOBUILD_PARTS="$CFG_NOBUILD_PARTS examples" - CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtdoc qtmacextras qtserialport qtwebkit qtwebkit-examples" - if [ "$XPLATFORM_TVOS" = "yes" ]; then - CFG_SKIP_MODULES="$CFG_SKIP_MODULES qtscript" - fi fi @@ -1969,7 +1956,6 @@ cat > "$outpath/config.tests/configure.cfg" <<EOF # Feature defaults set by configure command line config.input.qt_build_parts = $CFG_BUILD_PARTS config.input.extra_features = $CFG_FEATURES -config.input.skip_modules = $CFG_SKIP_MODULES config.input.qt_edition = $Edition config.input.qt_licheck = $Licheck config.input.qt_release_date = $ReleaseDate |