Commit 7a5c0047 authored by Christian Kandeler's avatar Christian Kandeler
Browse files

Maemo: Change installation prefix for non-Fremantle systems.

- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.
parent 1477165e
......@@ -41,7 +41,7 @@ symbian {
installPrefix = /opt/usr
desktopfile.path = /usr/share/applications/hildon
} else {
installPrefix = /usr/local
installPrefix = /usr
desktopfile.path = /usr/share/applications
!isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data...
......
......@@ -43,7 +43,7 @@ symbian {
installPrefix = /opt/usr
desktopfile.path = /usr/share/applications/hildon
} else {
installPrefix = /usr/local
installPrefix = /usr
desktopfile.path = /usr/share/applications
!isEqual(PWD,$$OUT_PWD) {
copyCommand = @echo Copying application data...
......
......@@ -359,7 +359,7 @@ QString MaemoDeployableListModel::installPrefix() const
const MaemoToolChain *const tc = maemoToolchain();
QTC_ASSERT(tc, return QString());
return QLatin1String(tc->version() == MaemoToolChain::Maemo5
? "/opt/usr" : "/usr/local");
? "/opt/usr" : "/usr");
}
} // namespace Qt4ProjectManager
......
......@@ -112,7 +112,7 @@ void MobileLibraryParameters::writeMaemoProFile(QTextStream &str) const
" maemo5 {\n"
" target.path = /opt/usr/lib\n"
" } else {\n"
" target.path = /usr/local/lib\n"
" target.path = /usr/lib\n"
" }\n"
" INSTALLS += target\n"
"}\n";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment