diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-02-28 20:57:38 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-01 23:18:23 +0100 |
| commit | 012f799254eedc610e2e33842e62d2a184b14fcc (patch) | |
| tree | 2499beab7bce07a3ad7e275dd4f1f3c3ca594d4a /qtbase.pro | |
| parent | c0e9041b6dc2cc46334df2dffe640f1ead1e0898 (diff) | |
revamp -sysroot and -hostprefix handling
instead of being a variable added to the makespec (via qconfig.pri),
QT_SYSROOT is now a property.
the QT_INSTALL_... properties are now automatically prefixed with the
sysroot; the raw values are available as QT_RAW_INSTALL_... - this is
expected to cause the least migration effort for existing projects.
-hostprefix and the new -hostbindir & -hostdatadir now feed the new
QT_HOST_... properties.
adapted the qmake feature files and the qtbase build system accordingly.
Change-Id: Iaa9b65bc10d9fe9c4988d620c70a8ce72177f8d4
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Diffstat (limited to 'qtbase.pro')
| -rw-r--r-- | qtbase.pro | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/qtbase.pro b/qtbase.pro index 5fc9cb3888..01a5aa33dc 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -98,7 +98,7 @@ CONFIG -= qt ### installations #### #qmake -qmake.path=$$[QT_INSTALL_BINS] +qmake.path = $$[QT_HOST_BINS] win32 { qmake.files=$$QT_BUILD_TREE/bin/qmake.exe } else { @@ -107,18 +107,18 @@ win32 { INSTALLS += qmake #syncqt -syncqt.path=$$[QT_INSTALL_BINS] +syncqt.path = $$[QT_HOST_BINS] syncqt.files=$$QT_BUILD_TREE/bin/syncqt win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat INSTALLS += syncqt #qtmodule-configtests -configtests.path=$$[QT_INSTALL_BINS] +configtests.path = $$[QT_HOST_BINS] configtests.files=$$QT_BUILD_TREE/bin/qtmodule-configtests INSTALLS += configtests #mkspecs -mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs +mkspecs.path = $$[QT_HOST_DATA]/mkspecs mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$QT_BUILD_TREE/mkspecs/qmodule.pri $$files($$QT_SOURCE_TREE/mkspecs/*) mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules unix { |