diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-12-21 18:13:23 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-13 16:19:43 +0000 |
| commit | ca6f11dcf207aa51ce32c9813ad1ab3790bb31ee (patch) | |
| tree | 918adb4e3f70efe66f850189f6570bb3cb789c6d | |
| parent | c8ae9bf58df8593bd8ecb902e2167768457e5484 (diff) | |
write all properties to qt.conf when -external-hostbindir is used
the presence of a [Paths] section causes QLibraryInfo to derive all
property values according to the Qt default directory layout,
disregarding the compiled-in paths from configure. consequently, we need
to write them all to qt.conf as well.
Change-Id: I3558e9aef1fce956812ea91e216f53bf7934c285
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
| -rwxr-xr-x | configure | 17 |
1 files changed, 17 insertions, 0 deletions
@@ -4190,6 +4190,23 @@ if [ -n "$CFG_HOST_QT_TOOLS_PATH" ]; then cat >> "$QTCONFFILE" <<EOF [Paths] Prefix=$QT_EXT_PREFIX +Documentation=$QT_REL_INSTALL_DOCS +Headers=$QT_REL_INSTALL_HEADERS +Libraries=$QT_REL_INSTALL_LIBS +LibraryExecutables=$QT_REL_INSTALL_LIBEXECS +Binaries=$QT_REL_INSTALL_BINS +Plugins=$QT_REL_INSTALL_PLUGINS +Imports=$QT_REL_INSTALL_IMPORTS +Qml2Imports=$QT_REL_INSTALL_QML +ArchData=$QT_REL_INSTALL_ARCHDATA +Data=$QT_REL_INSTALL_DATA +Translations=$QT_REL_INSTALL_TRANSLATIONS +Examples=$QT_REL_INSTALL_EXAMPLES +Tests=$QT_REL_INSTALL_TESTS +HostPrefix=$QT_HOST_PREFIX +HostBinaries=$QT_REL_HOST_BINS +HostLibraries=$QT_REL_HOST_LIBS +HostData=$QT_REL_HOST_DATA TargetSpec=$XPLATFORM HostSpec=$PLATFORM EOF |