summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-11-26 17:02:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-04 17:18:17 +0100
commitb825a87d54b7ecdd8478216efaf4de7cb514ad64 (patch)
tree1541fb9e0a9226ee51c8ddfc1fcbbc094c52f219
parentde816219eebf0b42df4bcd9089ae4691e9ca3095 (diff)
don't install modules-inst dir
for in-source builds, we end up attempting to install the modules-inst dir in case we re-run qmake after some modules have been built. Change-Id: I50d4d394bfd6f48b9a5f5faa584919710a03dea9 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--qtbase.pro2
1 files changed, 1 insertions, 1 deletions
diff --git a/qtbase.pro b/qtbase.pro
index 8da34c5023..7576db73a2 100644
--- a/qtbase.pro
+++ b/qtbase.pro
@@ -181,7 +181,7 @@ mkspecs.path = $$[QT_HOST_DATA]/mkspecs
mkspecs.files = \
$$OUT_PWD/mkspecs/qconfig.pri $$OUT_PWD/mkspecs/qmodule.pri $$OUT_PWD/mkspecs/qdevice.pri \
$$files($$PWD/mkspecs/*)
-mkspecs.files -= $$PWD/mkspecs/modules
+mkspecs.files -= $$PWD/mkspecs/modules $$PWD/mkspecs/modules-inst
INSTALLS += mkspecs
global_docs.files = $$PWD/doc/global