Maemo: Change installation prefix for non-Fremantle systems.

- /usr/local -> /usr
- Technically, this changes the default installation path for all
  non-Fremantle UNIX systems.

diff --git a/doc/examples/batteryindicator/deployment.pri b/doc/examples/batteryindicator/deployment.pri
index 7b7f728..853feec 100644 (file)
--- 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 f57225e..c2dd39e 100644 (file)
--- 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 4bffcc4..8f2ca72 100644 (file)
--- 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 e38ea77..3454b3f 100644 (file)
--- 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";