Commit 297afe3b authored by Marcel Krems's avatar Marcel Krems Committed by Eike Ziller
Browse files

Copy plugins to correct user directory under Unix.



Change-Id: I587154926a5e4bce62984445d7a00547c0b51673
Reviewed-by: default avatarEike Ziller <eike.ziller@digia.com>
parent 50c3e774
...@@ -32,7 +32,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/Users/example/qtcreator-build ...@@ -32,7 +32,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/Users/example/qtcreator-build
## <localappdata>/plugins/<ideversion> ## <localappdata>/plugins/<ideversion>
## where <localappdata> is e.g. ## where <localappdata> is e.g.
## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later ## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
## "$XDG_DATA_HOME/QtProject/qtcreator" or "~/.local/share/QtProject/qtcreator" on Linux ## "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux
## "~/Library/Application Support/QtProject/Qt Creator" on Mac ## "~/Library/Application Support/QtProject/Qt Creator" on Mac
# USE_USER_DESTDIR = yes # USE_USER_DESTDIR = yes
#! [4] #! [4]
......
...@@ -25,7 +25,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild% ...@@ -25,7 +25,7 @@ isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=%QtCreatorBuild%
## <localappdata>/plugins/<ideversion> ## <localappdata>/plugins/<ideversion>
## where <localappdata> is e.g. ## where <localappdata> is e.g.
## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later ## "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
## "$XDG_DATA_HOME/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux ## "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux
## "~/Library/Application Support/QtProject/Qt Creator" on Mac ## "~/Library/Application Support/QtProject/Qt Creator" on Mac
%DestDir%USE_USER_DESTDIR = yes %DestDir%USE_USER_DESTDIR = yes
......
...@@ -209,9 +209,9 @@ static inline QStringList getPluginPaths() ...@@ -209,9 +209,9 @@ static inline QStringList getPluginPaths()
#endif #endif
// 3) <localappdata>/plugins/<ideversion> // 3) <localappdata>/plugins/<ideversion>
// where <localappdata> is e.g. // where <localappdata> is e.g.
// <drive>:\Users\<username>\AppData\Local\QtProject\qtcreator on Windows Vista and later // "%LOCALAPPDATA%\QtProject\qtcreator" on Windows Vista and later
// $XDG_DATA_HOME or ~/.local/share/data/QtProject/qtcreator on Linux // "$XDG_DATA_HOME/data/QtProject/qtcreator" or "~/.local/share/data/QtProject/qtcreator" on Linux
// ~/Library/Application Support/QtProject/Qt Creator on Mac // "~/Library/Application Support/QtProject/Qt Creator" on Mac
pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); pluginPath = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
pluginPath += QLatin1Char('/') pluginPath += QLatin1Char('/')
+ QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR) + QLatin1String(Core::Constants::IDE_SETTINGSVARIANT_STR)
......
...@@ -23,6 +23,7 @@ isEmpty(USE_USER_DESTDIR) { ...@@ -23,6 +23,7 @@ isEmpty(USE_USER_DESTDIR) {
DESTDIRAPPNAME = "qtcreator" DESTDIRAPPNAME = "qtcreator"
DESTDIRBASE = "$$(XDG_DATA_HOME)" DESTDIRBASE = "$$(XDG_DATA_HOME)"
isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data" isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share/data"
else:DESTDIRBASE = "$$DESTDIRBASE/data"
} }
DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER" DESTDIR = "$$DESTDIRBASE/QtProject/$$DESTDIRAPPNAME/plugins/$$QTCREATOR_VERSION/$$PROVIDER"
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment