diff options
author | kb <k.blammo@gmail.com> | 2012-05-15 06:50:41 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-15 14:34:23 +0200 |
commit | 4c3a35adec28a46b45edf3b5349741d76950cbaa (patch) | |
tree | a5497f4c785daff557f555e56f8c0749242278b7 /src | |
parent | 58ab3a79a0b8a719b62485e8958d30ed8891d830 (diff) |
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 <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 |
1 files changed, 1 insertions, 1 deletions
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 |