From 4c3a35adec28a46b45edf3b5349741d76950cbaa Mon Sep 17 00:00:00 2001 From: kb Date: Tue, 15 May 2012 06:50:41 +0200 Subject: Do not limit mingw mkspec to "win32-g++" only. The Qt configure script and various qmake project files interpret mkspecs with a win32-g++ prefix as needing special mingw treatment. This patch corrects one instance of the too-specific "win32-g++" qmake platform scope and broadens it to "win32-g++*" -- bringing it in line with the rest of the Qt project files -- thus re-enabling custom mkspecs for crosscompilation. Change-Id: I8c5107053ce9e0c499002b1990b492bda0eec52b Reviewed-by: Friedemann Kleint --- src/plugins/platforms/windows/windows.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 7b27a942bc..0b474ce24e 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -12,7 +12,7 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/platforms LIBS *= -lole32 !wince*:LIBS *= -lgdi32 -luser32 -lwinspool -limm32 -lwinmm -loleaut32 contains(QT_CONFIG, opengl):LIBS *= -lopengl32 -win32-g++: LIBS *= -luuid +win32-g++*: LIBS *= -luuid # For the dialog helpers: !wince*:LIBS *= -lshlwapi -lshell32 !wince*:LIBS *= -ladvapi32 -- cgit v1.2.3