aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2015-04-30 04:05:54 -0700
committerJake Petroules <jake.petroules@petroules.com>2015-05-04 10:40:13 +0000
commit15a64cec8b3ca7111fa631861fce8227a9a3dda8 (patch)
tree11d5a145af1ec1fdcf3332e25d961394bd7053bc /src/plugins
parent9f92fe72a83bc619dcf333e1782843c4ba00916c (diff)
qmake: fix DESTDIR of qbs plugin shared libraries.
Change-Id: Ib8941b0d9232155545792215803556be5a5d4d17 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/plugins.pri6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/plugins.pri b/src/plugins/plugins.pri
index 3775c601a..70bc0e0ca 100644
--- a/src/plugins/plugins.pri
+++ b/src/plugins/plugins.pri
@@ -1,7 +1,9 @@
+include(../library_dirname.pri)
+
!isEmpty(QBS_PLUGINS_BUILD_DIR) {
destdirPrefix = $${QBS_PLUGINS_BUILD_DIR}
} else {
- destdirPrefix = $$shadowed($$PWD)/../../lib
+ destdirPrefix = $$shadowed($$PWD)/../../$${QBS_LIBRARY_DIRNAME}
}
DESTDIR = $${destdirPrefix}/qbs/plugins
TEMPLATE = lib
@@ -10,8 +12,6 @@ CONFIG += depend_includepath
CONFIG += shared
unix: CONFIG += plugin
-include(../library_dirname.pri)
-
!isEmpty(QBS_PLUGINS_INSTALL_DIR): \
installPrefix = $${QBS_PLUGINS_INSTALL_DIR}
else: \