diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2012-11-28 19:54:34 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2012-11-29 10:45:58 +0100 |
| commit | 297afe3b01462e8fcb462879d23a9b82e9db372f (patch) | |
| tree | a9b079ee7bcee951c0bc92b96c07a6ae8d05b1d6 /src | |
| parent | 50c3e774bb4d2e790fb44250d6a6a853d9516858 (diff) | |
Copy plugins to correct user directory under Unix.
Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/main.cpp | 6 | ||||
| -rw-r--r-- | src/qtcreatorplugin.pri | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 95c1a1e532..169e34d1cd 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -209,9 +209,9 @@ static inline QStringList getPluginPaths() #endif // 3) <localappdata>/plugins/<ideversion> // where <localappdata> is e.g. - // <drive>:\Users\<username>\AppData\Local\QtProject\qtcreator on Windows Vista and later - // $XDG_DATA_HOME or ~/.local/share/data/QtProject/qtcreator on Linux - // ~/Library/Application Support/QtProject/Qt Creator on Mac + // "%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 = QDesktopServices::storageLocation(QDesktopServices::DataLocation); pluginPath += QLatin1Char('/') + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR) diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index c760433b5a..8d605582dc 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -23,6 +23,7 @@ isEmpty(USE_USER_DESTDIR) { DESTDIRAPPNAME = "qtcreator" DESTDIRBASE = "$$(XDG_DATA_HOME)" isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data" + else:DESTDIRBASE = "$$DESTDIRBASE/data" } DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER" } |