diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-21 12:41:46 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-08-24 09:11:07 +0000 |
| commit | 7ea6b21b6d9480f6ed5975d75b2d83273856944a (patch) | |
| tree | b9d3cde21a6131b0feaf2df4cac036f6102f123f /src/app | |
| parent | 08f12ed4310629a4085c2f6f40316ee164e70add (diff) | |
| download | qt-creator-7ea6b21b6d9480f6ed5975d75b2d83273856944a.tar.gz | |
Unbreak user-installed plugin loading on non-Linux
There is no "data" subdirectory on Windows and OS X.
Broke in 1d5091e48f6df341dbd4436843c25afe25cbf4ce
Change-Id: I1c5e5b60847028c9f3d734eeb6995e99013162b1
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/main.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 3e9a523823..bb10f99790 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -218,8 +218,10 @@ static inline QStringList getPluginPaths() // "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later // "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux // "~/Library/Application Support/QtProject/Qt Creator" on Mac - pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) - + QLatin1String("/data"); + pluginPath = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); +#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC) + pluginPath += QLatin1String("/data"); +#endif pluginPath += QLatin1Char('/') + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR) + QLatin1Char('/'); |