diff options
| author | Rafael Roquetto <rafael.roquetto.qnx@kdab.com> | 2012-07-13 15:33:30 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-13 17:29:57 (GMT) |
| commit | fd4558ce23868ca03307152008277c13cf658792 (patch) | |
| tree | 3e29c81398015dafa8ed4e1f593b7f7a57471184 | |
| parent | baeb42184402454da3e337bbfa2f4d5c7346435f (diff) | |
| download | Qt-fd4558ce23868ca03307152008277c13cf658792.zip Qt-fd4558ce23868ca03307152008277c13cf658792.tar.gz Qt-fd4558ce23868ca03307152008277c13cf658792.tar.bz2 | |
Fix 'make install' when cross-compiling on Windows
When cross-compiling on a Unix-like environment in a Windows host
we let the default mkspecs be copied to the target directory, instead
of being symlinked.
On Windows, there is an extra-line on the install_mkspecs Makefile target
which also copies (rather than linking) the default mkspecs to
$QT_INSTALL_DIR/mkspecs/default. So in the end this patch removes a duplicate
which was not working, causing the install_mkspecs target to fail.
Change-Id: I44be3a55c11cd7916b4b9ea6a0db1f8d97d28353
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | projects.pro | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/projects.pro b/projects.pro index 0b498f8..5f39a7b 100644 --- a/projects.pro +++ b/projects.pro @@ -155,7 +155,11 @@ mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/modules unix { DEFAULT_QMAKESPEC = $$QMAKESPEC DEFAULT_QMAKESPEC ~= s,^.*mkspecs/,,g - mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default + + # When cross-compiling on a Unix-like environment in a Windows host + # we let the default mkspecs be copied to the target directory, instead + # of being symlinked. + !contains(QMAKE_HOST.os, Windows): mkspecs.commands += $(DEL_FILE) $(INSTALL_ROOT)$$mkspecs.path/default; $(SYMLINK) $$DEFAULT_QMAKESPEC $(INSTALL_ROOT)$$mkspecs.path/default mkspecs.files -= $$QT_SOURCE_TREE/mkspecs/default } win32:!equals(QT_BUILD_TREE, $$QT_SOURCE_TREE) { |