From 0084272c5cab6e03999890956f238c2b62a3d818 Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Mon, 15 Apr 2013 17:11:07 +0200 Subject: Don't use the CMake MinGW if cross-compiling. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way, the default generator is used when cross compiling for mingw. Change-Id: Ie536f1bca35ea38aec1232cdd95fc063c4f23e70 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly Reviewed-by: Peter Kümmel --- mkspecs/features/ctest_testcase.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/ctest_testcase.prf') diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index c88fc961cf..3045a21672 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -37,7 +37,7 @@ isEmpty(CMAKE_VERSION) { CMAKE_BUILD_TYPE = Debug CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release - win32-g++*:CMAKE_GENERATOR = -G \"MinGW Makefiles\" + win32-g++*:isEmpty(CROSS_COMPILE):CMAKE_GENERATOR = -G \"MinGW Makefiles\" win32:equals(QT_ARCH, x86_64) { win32-msvc2010:CMAKE_GENERATOR = -G \"Visual Studio 10 Win64\" win32-msvc2012:CMAKE_GENERATOR = -G \"Visual Studio 11 Win64\" -- cgit v1.2.3