From 7a5c004763d9c8b23bcca5f0d7461fd00b7dce7e Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Wed, 1 Dec 2010 13:54:10 +0100 Subject: [PATCH] Maemo: Change installation prefix for non-Fremantle systems. - /usr/local -> /usr - Technically, this changes the default installation path for all non-Fremantle UNIX systems. --- doc/examples/batteryindicator/deployment.pri | 2 +- share/qtcreator/templates/shared/deployment.pri | 2 +- src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp | 2 +- src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/examples/batteryindicator/deployment.pri b/doc/examples/batteryindicator/deployment.pri index 7b7f7280fa..853feec5f3 100644 --- a/doc/examples/batteryindicator/deployment.pri +++ b/doc/examples/batteryindicator/deployment.pri @@ -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... diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index f57225e3db..c2dd39e60a 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -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... diff --git a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp index 4bffcc400e..8f2ca726f4 100644 --- a/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp +++ b/src/plugins/qt4projectmanager/qt-maemo/maemodeployablelistmodel.cpp @@ -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 diff --git a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp index e38ea77b6b..3454b3fb56 100644 --- a/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp +++ b/src/plugins/qt4projectmanager/wizards/mobilelibraryparameters.cpp @@ -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"; -- 2.11.0