Commit things that went missing from 2a4a56b2

Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

share/qtcreator/templates/wizards/qtcreatorplugin/myplugin.pro

@@ -27,9 +27,9 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
 ## uncomment to build plugin into user config directory
 ## <localappdata>/plugins/<ideversion>
 ##    where <localappdata> is e.g.
-##    <drive>:\Users\<username>\AppData\Local\Nokia\QtCreator on Windows Vista and later
-##    $XDG_DATA_HOME/Nokia/QtCreator or ~/.local/share/Nokia/QtCreator on Linux
-##    ~/Library/Application Support/Nokia/QtCreator on Mac
+##    "%LOCALAPPDATA%\Nokia\qtcreator" on Windows Vista and later
+##    "$XDG_DATA_HOME/Nokia/qtcreator" or "~/.local/share/Nokia/qtcreator" on Linux
+##    "~/Library/Application Support/Nokia/Qt Creator" on Mac
 %DestDir%USE_USER_DESTDIR = yes
 
 PROVIDER = %VendorName%

src/app/main.cpp

@@ -167,27 +167,27 @@ static inline QStringList getPluginPaths(QSettings *settings)
     QString pluginPath = rootDirPath;
     pluginPath += QLatin1Char('/');
     pluginPath += QLatin1String(IDE_LIBRARY_BASENAME);
-    pluginPath += QLatin1Char('/');
-    pluginPath += QLatin1String("qtcreator");
-    pluginPath += QLatin1Char('/');
-    pluginPath += QLatin1String("plugins");
+    pluginPath += QLatin1String("/qtcreator/plugins");
     rc.push_back(pluginPath);
 #else
     // 2) "PlugIns" (OS X)
     QString pluginPath = rootDirPath;
-    pluginPath += QLatin1Char('/');
-    pluginPath += QLatin1String("PlugIns");
+    pluginPath += QLatin1String("/PlugIns");
     rc.push_back(pluginPath);
 #endif
     // 3) <localappdata>/plugins/<ideversion>
     //    where <localappdata> is e.g.
-    //    <drive>:\Users\<username>\AppData\Local\Nokia\QtCreator on Windows Vista and later
-    //    $XDG_DATA_HOME or ~/.local/share/Nokia/QtCreator on Linux
-    //    ~/Library/Application Support/Nokia/QtCreator on Mac
+    //    <drive>:\Users\<username>\AppData\Local\Nokia\qtcreator on Windows Vista and later
+    //    $XDG_DATA_HOME or ~/.local/share/Nokia/qtcreator on Linux
+    //    ~/Library/Application Support/Nokia/Qt Creator on Mac
     pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
-    pluginPath += QLatin1Char('/');
-    pluginPath += QLatin1String("plugins");
-    pluginPath += QLatin1Char('/');
+    pluginPath += QLatin1String("/Nokia/");
+#if !defined(Q_OS_MAC)
+    pluginPath += QLatin1String("qtcreator");
+#else
+    pluginPath += QLatin1String("Qt Creator");
+#endif
+    pluginPath += QLatin1String("/plugins/");
     pluginPath += QLatin1String(Core::Constants::IDE_VERSION_LONG);
     rc.push_back(pluginPath);
     return rc;

src/qtcreatorplugin.pri

@@ -10,13 +10,19 @@ isEmpty(PROVIDER) {
 isEmpty(USE_USER_DESTDIR) {
     DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER
 } else {
-    win32:DESTDIRBASE = "$$(LOCALAPPDATA)"
-    else:macx: DESTDIRBASE = "$$(HOME)/Library/Application Support"
-    else:unix {
+    win32 {
+        DESTDIRAPPNAME = "qtcreator"
+        DESTDIRBASE = "$$(LOCALAPPDATA)"
+        isEmpty(DESTDIRBASE):DESTDIRBASE="$$(USERPROFILE)\Local Settings\Application Data"
+    } else:macx {
+        DESTDIRAPPNAME = "Qt Creator"
+        DESTDIRBASE = "$$(HOME)/Library/Application Support"
+    } else:unix {
+        DESTDIRAPPNAME = "qtcreator"
         DESTDIRBASE = "$$(XDG_DATA_HOME)"
         isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share"
     }
-    DESTDIR = "$$DESTDIRBASE/Nokia/QtCreator/plugins/$$QTCREATOR_VERSION/$$PROVIDER"
+    DESTDIR = "$$DESTDIRBASE/Nokia/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER"
 }
 LIBS += -L$$DESTDIR