diff options
| author | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-03 18:24:02 +0200 |
|---|---|---|
| committer | Daniel Molkentin <daniel.molkentin@nokia.com> | 2012-09-05 16:37:42 +0200 |
| commit | c29bf6f6525d435d69936576761b4a29102cd056 (patch) | |
| tree | 3458e1bb423c568fcbd7799dcac1876a89047470 /lib | |
| parent | d1b65bbf837cfd4f8b655f55633afdcfe1ebe1e8 (diff) | |
Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.
QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.
Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.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 } |