summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-12 09:37:03 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2010-05-12 09:39:29 (GMT)
commitd3c54f401d1b8aeab4a911b4be9bcbdd99056e1f (patch)
treee0a2066a0244f48b29d74618a4de560767af5cf5
parent991e54881ea827eaab74078dfbded48e45d0b689 (diff)
downloadQt-d3c54f401d1b8aeab4a911b4be9bcbdd99056e1f.zip
Qt-d3c54f401d1b8aeab4a911b4be9bcbdd99056e1f.tar.gz
Qt-d3c54f401d1b8aeab4a911b4be9bcbdd99056e1f.tar.bz2
fix install of default mkspec from shadow build under windows
Patch-by: Lincoln Ramsay Reviewed-by: joerg Task-number: QTBUG-10619
-rw-r--r--projects.pro4
1 files changed, 4 insertions, 0 deletions
diff --git a/projects.pro b/projects.pro
index d405a5b..c9e77cb 100644
--- a/projects.pro
+++ b/projects.pro
@@ -154,6 +154,10 @@ unix {
DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g
mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default
}
+win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) {
+ # When shadow building on Windows, the default mkspec only exists in the build tree.
+ mkspecs.files += $$QT_BUILD_TREE/mkspecs/default
+}
INSTALLS += mkspecs
false:macx { #mac install location