feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).

Browse Source 
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>
This commit is contained in:
Daniel Molkentin
2012-09-03 18:24:02 +02:00
parent d1b65bbf83
commit c29bf6f652
21 changed files with 46 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/coreplugin/coreplugin.pro
View File

@@ -237,7 +237,7 @@ else:unix {
for(imagesize, IMAGE_SIZE_LIST) {
eval(image$${imagesize}.files = images/logo/$${imagesize}/qtcreator.png)
eval(image$${imagesize}.path = /share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
eval(image$${imagesize}.path = $$QTC_PREFIX/share/icons/hicolor/$${imagesize}x$${imagesize}/apps)
INSTALLS += image$${imagesize}
}
}