diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-25 16:27:35 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-25 17:38:30 +0100 |
| commit | 0816b8e476d20e00cbcffd1e71162adf93e85658 (patch) | |
| tree | 537711cbc6285e6108fb745fb98665114e27b806 /src/plugins | |
| parent | e455dcff532c6cc1482c844d3f1ffb7130f082ee (diff) | |
Do not put the plugins where the resources are.
That's not where they belong.
Also make less assumptions about the file path leading to them.
Ideally, we should also do the latter for the stuff in share/,
but then someone would have to touch the horrific qmake code in static.pro.
Task-number: QTCREATORBUG-10074
Change-Id: Ide9c4b83dcf0cd7a62b57643b79caf05662358cb
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/plugins.pri | 18 | ||||
| -rw-r--r-- | src/plugins/scanner/scannerplugin.qbs | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri index 40c6b7f8f..46b33d431 100644 --- a/src/plugins/plugins.pri +++ b/src/plugins/plugins.pri @@ -1,21 +1,21 @@ -!isEmpty(QBS_RESOURCES_BUILD_DIR) { - destdirPrefix = $${QBS_RESOURCES_BUILD_DIR} +!isEmpty(QBS_PLUGINS_BUILD_DIR) { + destdirPrefix = $${QBS_PLUGINS_BUILD_DIR} } else { greaterThan(QT_MAJOR_VERSION, 4): \ - destdirPrefix = $$shadowed($$PWD)/../.. + destdirPrefix = $$shadowed($$PWD)/../../lib else: \ - destdirPrefix = ../../../.. # Note: Will break if pri file is included from some other place + destdirPrefix = ../../../../lib # Note: Will break if pri file is included from some other place } -DESTDIR = $${destdirPrefix}/lib/qbs/plugins +DESTDIR = $${destdirPrefix}/qbs/plugins TEMPLATE = lib CONFIG += depend_includepath CONFIG += shared unix: CONFIG += plugin -!isEmpty(QBS_RESOURCES_INSTALL_DIR): \ - installPrefix = $${QBS_RESOURCES_INSTALL_DIR} +!isEmpty(QBS_PLUGINS_INSTALL_DIR): \ + installPrefix = $${QBS_PLUGINS_INSTALL_DIR} else: \ - installPrefix = $${QBS_INSTALL_PREFIX} -target.path = $${installPrefix}/lib/qbs/plugins + installPrefix = $${QBS_INSTALL_PREFIX}/lib +target.path = $${installPrefix}/qbs/plugins INSTALLS += target diff --git a/src/plugins/scanner/scannerplugin.qbs b/src/plugins/scanner/scannerplugin.qbs index ee841a4d0..975c510cc 100644 --- a/src/plugins/scanner/scannerplugin.qbs +++ b/src/plugins/scanner/scannerplugin.qbs @@ -7,6 +7,6 @@ DynamicLibrary { Group { fileTagsFilter: ["dynamiclibrary"] qbs.install: true - qbs.installDir: project.resourcesInstallDir + "/lib/qbs/plugins" + qbs.installDir: project.pluginsInstallDir + "/qbs/plugins" } } |