diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-03 18:24:02 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-09-25 10:14:51 +0200 |
| commit | 745cb4b7ecac7efaab2096de700664b67752ff63 (patch) | |
| tree | 2378134d18512375279c36e6b6af3e6be9beddf1 /lib | |
| parent | 4e4580d4c267dbb995ede106caa3347d556ad88c (diff) | |
Introduce $$QTC_PREFIX
'make install' now installs to $(INSTALL_ROOT)$$QTC_PREFIX/...
This is used for giving the contents of the 7zips an additional prefix.
(previously done by doing an additional copying step in bindistHelper).
QTC_PREFIX can also be used to give Qt Creator a different install path
at qmake time, and defaults to /usr/local on Linux.
On Windows and Mac there is no default for QTC_PREFIX.
Usage: qmake -r QTC_PREFIX=/qtcreator-2.6.0 && make &&
INSTALL_ROOT=/tmp/creator-dist make install
Change-Id: Id30781e14bfdde52531800f22b22e39f0459e806
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/qtcreator/qtcomponents/qtcomponents.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/qtcreator/qtcomponents/qtcomponents.pro b/lib/qtcreator/qtcomponents/qtcomponents.pro index 5cf2d9adb9..33268cf3cb 100644 --- a/lib/qtcreator/qtcomponents/qtcomponents.pro +++ b/lib/qtcreator/qtcomponents/qtcomponents.pro @@ -52,6 +52,6 @@ DATA_FILE_PATTERNS = \ !macx { qmlfiles.files = $$PWD/*.qml $$PWD/qmldir $$PWD/images $$PWD/custom - qmlfiles.path = /$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents + qmlfiles.path = $$QTC_PREFIX/$${IDE_LIBRARY_BASENAME}/qtcreator/qtcomponents INSTALLS += qmlfiles } |