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

Commit things that went missing from 2a4a56b2be

Browse Source 
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>
This commit is contained in:
Eike Ziller
2011-10-06 09:46:03 +02:00
parent 3d4e508d0c
commit ae3a833b8c
3 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/app/main.cpp
View File

@@ -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;