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>
This commit is contained in:
parent
58ab3a79a0
commit
4c3a35adec
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user