From 7ea6b21b6d9480f6ed5975d75b2d83273856944a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 21 Aug 2015 12:41:46 +0200 Subject: [PATCH] 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 --- src/app/main.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index 3e9a5238232..bb10f99790a 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('/');