diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /configure | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 34 |
1 files changed, 22 insertions, 12 deletions
@@ -1122,14 +1122,14 @@ if [ "$Edition" = "OpenSource" ]; then while true; do if [ "$CFG_ANDROID_STYLE_ASSETS" = "no" ] || [ "$XPLATFORM_ANDROID" = "no" ]; then echo "You are licensed to use this software under the terms of" - echo "the GNU Lesser General Public License (LGPL) versions 3." + echo "the GNU Lesser General Public License (LGPL) version 3." echo "You are also licensed to use this software under the terms of" - echo "the GNU General Public License (GPL) versions 2." + echo "the GNU General Public License (GPL) version 2." affix="either" showGPL2="yes" else echo "You are licensed to use this software under the terms of" - echo "the GNU Lesser General Public License (LGPL) versions 3." + echo "the GNU Lesser General Public License (LGPL) version 3." showGPL2="no" affix="the" fi @@ -1823,15 +1823,9 @@ fi # Build qmake # create a qt.conf for the Qt build tree itself #------------------------------------------------------------------------------- -QTCONFFILE="$outpath/bin/qt.conf" -cat > "$QTCONFFILE" <<EOF -[EffectivePaths] -Prefix=.. -EOF -if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then - cat >> "$QTCONFFILE" <<EOF -[Paths] -Prefix=$QT_EXT_PREFIX +printInstallPaths() +{ + cat <<EOF Documentation=$QT_REL_INSTALL_DOCS Headers=$QT_REL_INSTALL_HEADERS Libraries=$QT_REL_INSTALL_LIBS @@ -1845,6 +1839,22 @@ Data=$QT_REL_INSTALL_DATA Translations=$QT_REL_INSTALL_TRANSLATIONS Examples=$QT_REL_INSTALL_EXAMPLES Tests=$QT_REL_INSTALL_TESTS +EOF +} + +QTCONFFILE="$outpath/bin/qt.conf" +cat > "$QTCONFFILE" <<EOF +[EffectivePaths] +Prefix=.. +EOF +if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then + cat >> "$QTCONFFILE" <<EOF +[DevicePaths] +Prefix=$QT_INSTALL_PREFIX +`printInstallPaths` +[Paths] +Prefix=$QT_EXT_PREFIX +`printInstallPaths` HostPrefix=$QT_HOST_PREFIX HostBinaries=$QT_REL_HOST_BINS HostLibraries=$QT_REL_HOST_LIBS |