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

Maemo: Change installation prefix for non-Fremantle systems.

Browse Source 
- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
This commit is contained in:
Christian Kandeler
2010-12-01 13:54:10 +01:00
parent 1477165e1c
commit 7a5c004763
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/examples/batteryindicator/deployment.pri
View File

@@ -41,7 +41,7 @@ symbian {
installPrefix = /opt/usr installPrefix = /opt/usr
desktopfile.path = /usr/share/applications/hildon desktopfile.path = /usr/share/applications/hildon
} else { } else {
installPrefix = /usr/local installPrefix = /usr
desktopfile.path = /usr/share/applications desktopfile.path = /usr/share/applications
!isEqual(PWD,$$OUT_PWD) { !isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data... copyCommand = @echo Copying application data...

2
share/qtcreator/templates/shared/deployment.pri
View File

@@ -43,7 +43,7 @@ symbian {
installPrefix = /opt/usr installPrefix = /opt/usr
desktopfile.path = /usr/share/applications/hildon desktopfile.path = /usr/share/applications/hildon
} else { } else {
installPrefix = /usr/local installPrefix = /usr
desktopfile.path = /usr/share/applications desktopfile.path = /usr/share/applications
!isEqual(PWD,$$OUT_PWD) { !isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data... copyCommand = @echo Copying application data...

2
src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp
View File

@@ -359,7 +359,7 @@ QString MaemoDeployableListModel::installPrefix() const
const MaemoToolChain *const tc = maemoToolchain(); const MaemoToolChain *const tc = maemoToolchain();
QTC_ASSERT(tc, return QString()); QTC_ASSERT(tc, return QString());
return QLatin1String(tc->version() == MaemoToolChain::Maemo5 return QLatin1String(tc->version() == MaemoToolChain::Maemo5
? "/opt/usr" : "/usr/local"); ? "/opt/usr" : "/usr");
} }
} // namespace Qt4ProjectManager } // namespace Qt4ProjectManager

2
src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp
View File

@@ -112,7 +112,7 @@ void MobileLibraryParameters::writeMaemoProFile(QTextStream &str) const
" maemo5 {\n" " maemo5 {\n"
" target.path = /opt/usr/lib\n" " target.path = /opt/usr/lib\n"
" } else {\n" " } else {\n"
" target.path = /usr/local/lib\n" " target.path = /usr/lib\n"
" }\n" " }\n"
" INSTALLS += target\n" " INSTALLS += target\n"
"}\n"; "}\n";