diff --git a/examples/activeqt/activeqt.pro b/examples/activeqt/activeqt.pro index 09b58e6f9c7df199cc88493028cda4dc68149c0e..2a8d0c3f13f1fc3fa59d5646dd1c0e4a0d750fb7 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 f10cd289cd917ac0ddb9641a63cea76ea9a423a5..0d661a5ffaab4d62ee9ef5304fd2fbaa9a1776aa 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 a963c427a4214e3832ff6969b13ba331b4f37a5a..5c3645de2122d7ac3f19c2029168c1516d0ad73e 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