diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2014-05-07 22:53:38 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2014-05-08 15:29:11 +0200 |
| commit | 6aad96d89b5cd4f8b7e06b72cf911054c5d89037 (patch) | |
| tree | beefc75034dd64590ede3cc20d88e25219cdb7e7 /src/qtcreatorplugin.pri | |
| parent | aa52cfa0e6745d517b11c85a013a35f9712257f5 (diff) | |
Nuke plugins PROVIDER settings
Place all plugins in lib/qtcreator/plugins
Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/qtcreatorplugin.pri')
| -rw-r--r-- | src/qtcreatorplugin.pri | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index b90b9b9b83..0fe283d2e8 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -48,14 +48,8 @@ dependencyList = $$join(dependencyList, $$escape_expand(\\n)) # use gui precompiled header for plugins by default isEmpty(PRECOMPILED_HEADER):PRECOMPILED_HEADER = $$PWD/shared/qtcreator_gui_pch.h -isEmpty(PROVIDER) { - PROVIDER = QtProject -} else { - LIBS += -L$$IDE_PLUGIN_PATH/QtProject -} - isEmpty(USE_USER_DESTDIR) { - DESTDIR = $$IDE_PLUGIN_PATH/$$PROVIDER + DESTDIR = $$IDE_PLUGIN_PATH } else { win32 { DESTDIRAPPNAME = "qtcreator" @@ -70,7 +64,7 @@ isEmpty(USE_USER_DESTDIR) { 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" } LIBS += -L$$DESTDIR @@ -130,13 +124,12 @@ greaterThan(QT_MAJOR_VERSION, 4) { } macx { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ + 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 QMAKE_RPATHDIR += \$\$ORIGIN QMAKE_RPATHDIR += \$\$ORIGIN/.. - QMAKE_RPATHDIR += \$\$ORIGIN/../.. IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' QMAKE_RPATHDIR = @@ -149,9 +142,9 @@ CONFIG += plugin plugin_with_soname linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF !macx { - target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER + target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins pluginspec.files += $${TARGET}.pluginspec - pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER + pluginspec.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins INSTALLS += target pluginspec } |