diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-08-09 13:34:04 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-15 18:02:42 +0200 |
commit | a6eb28d3f68bec2d4b049da3d0b62808c6525895 (patch) | |
tree | 991b930df5d351289f73e577feb0354490568a08 /tools/configure/configureapp.h | |
parent | 3e283402e1a01a28cf72cdfced972251cd11547a (diff) |
add configure -extprefix option
this adds the possibility to put the actual qt installation outside the
sysroot it is configured for. this makes it possible to install an
x-built qt without "polluting" the sysroot, which makes it possible to
have read-only sysroots, and multiple qt builds for one sysroot.
-prefix is the location within the sysroot as seen by the target itself,
and gets "burned" into QLibraryInfo in QtCore.
-extprefix is the location in the host file system and gets "burned"
into QLibraryInfo in qmake. if it is not specified, it defaults to the
sysrootified prefix, which is the previous behavior.
Task-number: QTBUG-26680
Change-Id: Ia43833c4e27733159afeb8c8b9b2d981378d0cd1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tools/configure/configureapp.h')
-rw-r--r-- | tools/configure/configureapp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 33fc22b27a..314b2be861 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -158,6 +158,8 @@ private: int descIndent; int outputWidth; + void substPrefix(QString *path); + QString formatPath(const QString &path); QString formatPaths(const QStringList &paths); |