From 13c99ee2f5c965c2c8ff7b56dade9ddc85dbf954 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 5 Jul 2012 15:00:02 +0200 Subject: [PATCH] windows hosts of course also need exclusion from mkspecs_pre Change-Id: I90de625b1b521977a4dc1cd499eb6ece02d837f9 Reviewed-by: Joerg Bornemann --- qtbase.pro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase.pro b/qtbase.pro index dc5dbf7503..0a13119b74 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -95,8 +95,8 @@ mkspecs.files -= $$PWD/mkspecs/modules # When shadow building, the default mkspecs only exist in the build tree. mkspecs.files += $$OUT_PWD/mkspecs/default-host $$OUT_PWD/mkspecs/default } -!equals(QMAKE_HOST.os, Linux) { - # MacOS' (and maybe others') cp command is too daft to honor -f when copying symlinks. +!equals(QMAKE_HOST.os, Linux):!equals(QMAKE_HOST.os, Windows) { + # MacOS' (and maybe other Unixes') cp command is too daft to honor -f when copying symlinks. mkspecs_pre.commands = rm -f $$[QT_HOST_DATA]/mkspecs/default-host $$[QT_HOST_DATA]/mkspecs/default QMAKE_EXTRA_TARGETS += mkspecs_pre mkspecs.depends += mkspecs_pre