diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 12:13:34 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-12 12:13:34 (GMT) |
| commit | 7f964ea0027f749bc94582163fadd0d5d35aaccc (patch) | |
| tree | e0a2066a0244f48b29d74618a4de560767af5cf5 | |
| parent | 991e54881ea827eaab74078dfbded48e45d0b689 (diff) | |
| parent | d3c54f401d1b8aeab4a911b4be9bcbdd99056e1f (diff) | |
| download | Qt-7f964ea0027f749bc94582163fadd0d5d35aaccc.zip Qt-7f964ea0027f749bc94582163fadd0d5d35aaccc.tar.gz Qt-7f964ea0027f749bc94582163fadd0d5d35aaccc.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix install of default mkspec from shadow build under windows
| -rw-r--r-- | projects.pro | 4 |
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 |