aboutsummaryrefslogtreecommitdiffstats
path: root/static.pro
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-04-18 13:28:27 +0200
committerChristian Kandeler <christian.kandeler@digia.com>2013-04-18 15:33:55 +0200
commit29bb66d2fdc863fd5e9b0896fbd862c5b999d541 (patch)
tree023f43c766fe3baf11e279d9757ba60e68da09b5 /static.pro
parentfcc031e4f1cc899c478f369371aa2290a08405f8 (diff)
Fix in-source builds of projects incorporating qbs as a subproject.
If qbs is part of a larger project, we may need to copy files around even for an in-source build. Change-Id: I9e1cb70a2f7a1ae51539a2724512d9fb5f35094a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'static.pro')
-rw-r--r--static.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/static.pro b/static.pro
index ea1988df5..e7b81c1cb 100644
--- a/static.pro
+++ b/static.pro
@@ -65,7 +65,7 @@ FILES += $$DATA_FILES
OTHER_FILES += $$FILES
-!isEqual(PWD, $$OUT_PWD) {
+!isEqual(PWD, $$OUT_PWD)|!isEmpty(QBS_RESOURCES_BUILD_DIR) {
copy2build.input = FILES
!isEmpty(QBS_RESOURCES_BUILD_DIR): \
copy2build.output = $${QBS_RESOURCES_BUILD_DIR}/${QMAKE_FUNC_FILE_IN_stripSrcDir}