diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2014-01-17 14:28:07 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-21 11:11:41 +0100 |
| commit | 76bdce73b53dd505efa9d6a5bd114465c961517d (patch) | |
| tree | 27194f81cc320040f6f666d1d2996abb660d9a29 | |
| parent | b29f51357b4d18f33f5d522994aeff149737b358 (diff) | |
Replace win32-g++ with mingw scope
Commit 773dd01 in qtbase introduced a general mingw platform scope, which
is cleaner and more flexible than matching the spec name.
(see 278152fff for a similar commit in qtbase).
Change-Id: I36449cfa199db8bd25ffb0f7b384346cd74897d8
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| -rw-r--r-- | examples/activeqt/activeqt.pro | 2 | ||||
| -rw-r--r-- | src/activeqt/axshared.prx | 2 | ||||
| -rw-r--r-- | tools/testcon/testcon.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 09b58e6..2a8d0c3 100644 --- a/examples/activeqt/activeqt.pro +++ b/examples/activeqt/activeqt.pro @@ -11,4 +11,4 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):SUBDIRS += opengl # For now only the contain examples with mingw, for the others you need # an IDL compiler -win32-g++*|wince*:SUBDIRS = webbrowser +mingw|wince*:SUBDIRS = webbrowser diff --git a/src/activeqt/axshared.prx b/src/activeqt/axshared.prx index f10cd28..0d661a5 100644 --- a/src/activeqt/axshared.prx +++ b/src/activeqt/axshared.prx @@ -9,7 +9,7 @@ QT += gui-private LIBS_PRIVATE += -lole32 -loleaut32 !wince*: LIBS_PRIVATE += -luser32 -lgdi32 -ladvapi32 -win32-g++*: LIBS_PRIVATE += -luuid +mingw: LIBS_PRIVATE += -luuid HEADERS = \ shared/qaxtypefunctions.h \ diff --git a/tools/testcon/testcon.pro b/tools/testcon/testcon.pro index a963c42..5c3645d 100644 --- a/tools/testcon/testcon.pro +++ b/tools/testcon/testcon.pro @@ -8,7 +8,7 @@ HEADERS = docuwindow.h mainwindow.h invokemethod.h changeproperties.h ambientpr FORMS = mainwindow.ui invokemethod.ui changeproperties.ui ambientproperties.ui controlinfo.ui RC_FILE = testcon.rc -!win32-g++*:QMAKE_POST_LINK = midl $$shell_quote($$shell_path($$PWD/testcon.idl)) && move testcon.tlb $(TARGETDIR) +!mingw:QMAKE_POST_LINK = midl $$shell_quote($$shell_path($$PWD/testcon.idl)) && move testcon.tlb $(TARGETDIR) target.path = $$[QT_INSTALL_BINS] INSTALLS += target |