diff options
| author | Eike Ziller <eike.ziller@nokia.com> | 2011-08-29 16:27:26 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@nokia.com> | 2011-10-05 18:32:10 +0200 |
| commit | 2a4a56b2beec7a3c0be94302146461d2f730315d (patch) | |
| tree | 1c40b80c79d31869619678fc6260dfd5bf503e29 /src/qtcreatorplugin.pri | |
| parent | c6a9de7252bf4f2a7592153caaabe13ebad8c4eb (diff) | |
Load plugins from user config directory too.
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.
Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index 01a7c63b6b..9a6bb8eb19 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -7,7 +7,17 @@ isEmpty(PROVIDER) { PROVIDER = Nokia } -DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER +isEmpty(USE_USER_DESTDIR) { + DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER +} else { + win32:DESTDIRBASE = "$$(LOCALAPPDATA)" + else:macx: DESTDIRBASE = "$$(HOME)/Library/Application Support" + else:unix { + DESTDIRBASE = "$$(XDG_DATA_HOME)" + isEmpty(DESTDIRBASE):DESTDIRBASE = "$$(HOME)/.local/share" + } + DESTDIR = "$$DESTDIRBASE/Nokia/QtCreator/plugins/$$QTCREATOR_VERSION/$$PROVIDER" +} LIBS += -L$$DESTDIR # copy the plugin spec @@ -44,7 +54,7 @@ macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ } else { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ } } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR |