From 278152fffd57a14fd5e7eb17064d9a1a17b7d72c Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 8 Jan 2014 14:12:17 +0100 Subject: Replace win32-g++ with mingw scope Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira --- config.tests/unix/iconv/iconv.pro | 2 +- config.tests/unix/odbc/odbc.pro | 2 +- config.tests/x11/opengl/opengl.pro | 2 +- mkspecs/features/create_cmake.prf | 2 +- mkspecs/features/ctest_testcase_common.prf | 2 +- mkspecs/features/qml_plugin.prf | 2 +- mkspecs/features/qt_module.prf | 4 ++-- mkspecs/features/qt_plugin.prf | 2 +- mkspecs/features/win32/windows.prf | 2 +- qmake/qmake.pri | 2 +- src/3rdparty/zlib_dependency.pri | 2 +- src/angle/src/compiler/translator_common.pro | 2 +- src/angle/src/compiler/translator_hlsl.pro | 2 +- src/angle/src/libEGL/libEGL.pro | 2 +- src/angle/src/libGLESv2/libGLESv2.pro | 2 +- src/corelib/corelib.pro | 2 +- src/gui/image/qpnghandler.pri | 2 +- src/plugins/platforms/windows/accessible/accessible.pri | 4 ++-- src/plugins/platforms/windows/windows.pri | 2 +- src/sql/drivers/psql/qsql_psql.pri | 2 +- src/sql/drivers/tds/qsql_tds.pri | 2 +- src/tools/bootstrap/bootstrap.pro | 2 +- src/winmain/winmain.pro | 2 +- tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro | 2 +- tests/auto/network/kernel/qhostinfo/qhostinfo.pro | 2 +- .../auto/network/socket/qtcpserver/crashingServer/crashingServer.pro | 2 +- tests/auto/sql/kernel/qsql/qsql.pro | 2 +- tests/auto/sql/kernel/qsqldriver/qsqldriver.pro | 2 +- tests/auto/sql/kernel/qsqlresult/qsqlresult.pro | 2 +- .../sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro | 2 +- tests/auto/widgets/dialogs/dialogs.pro | 2 +- tools/configure/configure.pro | 2 +- 32 files changed, 34 insertions(+), 34 deletions(-) diff --git a/config.tests/unix/iconv/iconv.pro b/config.tests/unix/iconv/iconv.pro index 1ef6aa7207..65a67f16d3 100644 --- a/config.tests/unix/iconv/iconv.pro +++ b/config.tests/unix/iconv/iconv.pro @@ -1,3 +1,3 @@ SOURCES = iconv.cpp CONFIG -= qt dylib -mac|win32-g++*|qnx:LIBS += -liconv +mac|mingw|qnx:LIBS += -liconv diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro index 418a0e0d54..70f3b668da 100644 --- a/config.tests/unix/odbc/odbc.pro +++ b/config.tests/unix/odbc/odbc.pro @@ -1,4 +1,4 @@ SOURCES = odbc.cpp CONFIG -= qt dylib -win32-g++*:LIBS += -lodbc32 +mingw:LIBS += -lodbc32 else:LIBS += -lodbc diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro index 5c3a1c50cb..d6814f1bd5 100644 --- a/config.tests/x11/opengl/opengl.pro +++ b/config.tests/x11/opengl/opengl.pro @@ -7,5 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) { } CONFIG -= qt -win32-g++*:LIBS += -lopengl32 +mingw:LIBS += -lopengl32 else:LIBS += -lGL diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf index 19b26460a0..82e2812f3b 100644 --- a/mkspecs/features/create_cmake.prf +++ b/mkspecs/features/create_cmake.prf @@ -195,7 +195,7 @@ mac { CMAKE_LIB_FILE_LOCATION_DEBUG = $${CMAKE_QT_STEM}d.dll CMAKE_LIB_FILE_LOCATION_RELEASE = $${CMAKE_QT_STEM}.dll - win32-g++ { + mingw { CMAKE_WINMAIN_FILE_LOCATION_DEBUG = libqtmain$${QT_LIBINFIX}d.a CMAKE_WINMAIN_FILE_LOCATION_RELEASE = libqtmain$${QT_LIBINFIX}.a diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index a9461eb4ae..a2b7e8e72b 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -51,7 +51,7 @@ load(cmake_functions) CMAKE_BUILD_TYPE = Debug CONFIG(release, debug|release):CMAKE_BUILD_TYPE = Release -win32-g++*:isEmpty(CROSS_COMPILE):CMAKE_GENERATOR = -G \"MinGW Makefiles\" +mingw:isEmpty(CROSS_COMPILE):CMAKE_GENERATOR = -G \"MinGW Makefiles\" win32:equals(QT_ARCH, x86_64) { win32-msvc2010:CMAKE_GENERATOR = -G \"Visual Studio 10 Win64\" win32-msvc2012:CMAKE_GENERATOR = -G \"Visual Studio 11 Win64\" diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index af941058db..f3739572c7 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -101,7 +101,7 @@ load(qt_common) load(qml_module) -unix|win32-g++* { +unix|mingw { !isEmpty(_QMAKE_SUPER_CACHE_): \ lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib else: \ diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index ff40e16e79..c83133075b 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -163,7 +163,7 @@ else: \ lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace -unix|win32-g++* { +unix|mingw { CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace @@ -178,7 +178,7 @@ unix { QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace } -unix|win32-g++* { +unix|mingw { QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$section(VERSION, ., 0, 0)) for(i, MODULE_DEPENDS): \ diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf index c9fe22688b..f710bbff43 100644 --- a/mkspecs/features/qt_plugin.prf +++ b/mkspecs/features/qt_plugin.prf @@ -55,7 +55,7 @@ load(qt_common) wince*:LIBS += $$QMAKE_LIBS_GUI QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF -unix|win32-g++* { +unix|mingw { !isEmpty(_QMAKE_SUPER_CACHE_): \ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf index d0b59e05e0..82e0ebe1b5 100644 --- a/mkspecs/features/win32/windows.prf +++ b/mkspecs/features/win32/windows.prf @@ -1,7 +1,7 @@ CONFIG -= console contains(TEMPLATE, ".*app"){ QMAKE_LFLAGS += $$QMAKE_LFLAGS_WINDOWS $$QMAKE_LFLAGS_EXE - win32-g++:DEFINES += QT_NEEDS_QMAIN + mingw:DEFINES += QT_NEEDS_QMAIN qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) { isEqual(entryLib, -lqtmain): { diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 6052dadb2e..acc9975843 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -150,7 +150,7 @@ bootstrap { #Qt code SOURCES += qfilesystemengine_win.cpp qfsfileengine_win.cpp qfilesystemiterator_win.cpp qsettings_win.cpp \ qsystemlibrary.cpp qlocale_win.cpp registry.cpp win32-msvc*:LIBS += ole32.lib advapi32.lib - win32-g++*:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 + mingw:LIBS += -lole32 -luuid -ladvapi32 -lkernel32 } qnx { diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 029bb9e637..0bcb9f9e5e 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,6 +1,6 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { - if(unix|win32-g++*):LIBS_PRIVATE += -lz + if(unix|mingw):LIBS_PRIVATE += -lz else { isEmpty(ZLIB_LIBS): LIBS += zdll.lib else: LIBS += $$ZLIB_LIBS diff --git a/src/angle/src/compiler/translator_common.pro b/src/angle/src/compiler/translator_common.pro index 5581c9dc58..c8f86d6b10 100644 --- a/src/angle/src/compiler/translator_common.pro +++ b/src/angle/src/compiler/translator_common.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_common) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += \ $$ANGLE_DIR/src \ diff --git a/src/angle/src/compiler/translator_hlsl.pro b/src/angle/src/compiler/translator_hlsl.pro index 1c31cad297..f19d33a530 100644 --- a/src/angle/src/compiler/translator_hlsl.pro +++ b/src/angle/src/compiler/translator_hlsl.pro @@ -5,7 +5,7 @@ TARGET = $$qtLibraryTarget(translator_hlsl) include(../config.pri) # Mingw 4.7 chokes on implicit move semantics, so disable C++11 here -win32-g++*: CONFIG -= c++11 +mingw: CONFIG -= c++11 INCLUDEPATH += $$ANGLE_DIR/src \ $$ANGLE_DIR/include diff --git a/src/angle/src/libEGL/libEGL.pro b/src/angle/src/libEGL/libEGL.pro index b5854189f9..f51bc8ee83 100644 --- a/src/angle/src/libEGL/libEGL.pro +++ b/src/angle/src/libEGL/libEGL.pro @@ -27,7 +27,7 @@ SOURCES += \ !static { DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}.def - win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def + mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libEGL/$${TARGET}_mingw32.def } load(qt_installs) diff --git a/src/angle/src/libGLESv2/libGLESv2.pro b/src/angle/src/libGLESv2/libGLESv2.pro index 5b3a49ed56..75853e219e 100644 --- a/src/angle/src/libGLESv2/libGLESv2.pro +++ b/src/angle/src/libGLESv2/libGLESv2.pro @@ -158,7 +158,7 @@ angle_d3d11 { !static { DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}.def - win32-g++*:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def + mingw:equals(QT_ARCH, i386): DEF_FILE = $$ANGLE_DIR/src/libGLESv2/$${TARGET}_mingw32.def } float_converter.target = float_converter diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index b513149e7c..406e0fd396 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -12,7 +12,7 @@ win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x67000000 irix-cc*:QMAKE_CXXFLAGS += -no_prelink -ptused # otherwise mingw headers do not declare common functions like putenv -win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x +mingw:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x QMAKE_DOCS = $$PWD/doc/qtcore.qdocconf diff --git a/src/gui/image/qpnghandler.pri b/src/gui/image/qpnghandler.pri index bedf23ff12..aca7e2c568 100644 --- a/src/gui/image/qpnghandler.pri +++ b/src/gui/image/qpnghandler.pri @@ -2,7 +2,7 @@ INCLUDEPATH *= $$PWD HEADERS += $$PWD/qpnghandler_p.h SOURCES += $$PWD/qpnghandler.cpp contains(QT_CONFIG, system-png) { - if(unix|win32-g++*): LIBS_PRIVATE += -lpng + if(unix|mingw): LIBS_PRIVATE += -lpng else:win32: LIBS += libpng.lib } else { diff --git a/src/plugins/platforms/windows/accessible/accessible.pri b/src/plugins/platforms/windows/accessible/accessible.pri index 08a37a4733..e26c6614e2 100644 --- a/src/plugins/platforms/windows/accessible/accessible.pri +++ b/src/plugins/platforms/windows/accessible/accessible.pri @@ -8,10 +8,10 @@ HEADERS += \ $$PWD/qwindowsaccessibility.h \ $$PWD/comutils.h -!win32-g++*: { +!mingw: { SOURCES += $$PWD/iaccessible2.cpp HEADERS += $$PWD/iaccessible2.h include(../../../../3rdparty/iaccessible2/iaccessible2.pri) } -win32-g++*: LIBS *= -luuid \ No newline at end of file +mingw: LIBS *= -luuid \ No newline at end of file diff --git a/src/plugins/platforms/windows/windows.pri b/src/plugins/platforms/windows/windows.pri index 22b8ef0175..c10d00c2ad 100644 --- a/src/plugins/platforms/windows/windows.pri +++ b/src/plugins/platforms/windows/windows.pri @@ -4,7 +4,7 @@ LIBS *= -lole32 contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles2):LIBS *= -lopengl32 -win32-g++*: LIBS *= -luuid +mingw: LIBS *= -luuid # For the dialog helpers: !wince*:LIBS *= -lshlwapi -lshell32 !wince*:LIBS *= -ladvapi32 diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri index d0ded5e625..867be3edb8 100644 --- a/src/sql/drivers/psql/qsql_psql.pri +++ b/src/sql/drivers/psql/qsql_psql.pri @@ -1,7 +1,7 @@ HEADERS += $$PWD/qsql_psql_p.h SOURCES += $$PWD/qsql_psql.cpp -unix|win32-g++* { +unix|mingw { LIBS += $$QT_LFLAGS_PSQL !contains(LIBS, .*pq.*):LIBS += -lpq QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri index 67d037aa6b..8c528c154d 100644 --- a/src/sql/drivers/tds/qsql_tds.pri +++ b/src/sql/drivers/tds/qsql_tds.pri @@ -1,7 +1,7 @@ HEADERS += $$PWD/qsql_tds_p.h SOURCES += $$PWD/qsql_tds.cpp -unix|win32-g++*: { +unix|mingw: { LIBS += $$QT_LFLAGS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS diff --git a/src/tools/bootstrap/bootstrap.pro b/src/tools/bootstrap/bootstrap.pro index 8eb8401543..bef23f9e58 100644 --- a/src/tools/bootstrap/bootstrap.pro +++ b/src/tools/bootstrap/bootstrap.pro @@ -5,7 +5,7 @@ QT = CONFIG += internal_module force_bootstrap # otherwise mingw headers do not declare common functions like putenv -win32-g++*:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x +mingw:QMAKE_CXXFLAGS_CXX11 = -std=gnu++0x MODULE_DEFINES = \ QT_BOOTSTRAPPED \ diff --git a/src/winmain/winmain.pro b/src/winmain/winmain.pro index 1aca8996ad..998200cb1e 100644 --- a/src/winmain/winmain.pro +++ b/src/winmain/winmain.pro @@ -14,7 +14,7 @@ win32-msvc*:QMAKE_CFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CXXFLAGS_DEBUG -= -Zi win32-msvc*:QMAKE_CFLAGS_DEBUG *= -Z7 win32-msvc*:QMAKE_CXXFLAGS_DEBUG *= -Z7 -win32-g++*: DEFINES += QT_NEEDS_QMAIN +mingw: DEFINES += QT_NEEDS_QMAIN winrt { SOURCES = qtmain_winrt.cpp diff --git a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro index 48fd2d0b69..8f77e46f74 100644 --- a/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro +++ b/tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro @@ -2,6 +2,6 @@ SOURCES = main.cpp CONFIG -= qt app_bundle CONFIG += console -win32:!win32-g++*:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS- +win32:!mingw:!equals(TEMPLATE_PREFIX, "vc"):QMAKE_CXXFLAGS += /GS- DESTDIR = ./ DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro index c21e73ccee..b7554b54d5 100644 --- a/tests/auto/network/kernel/qhostinfo/qhostinfo.pro +++ b/tests/auto/network/kernel/qhostinfo/qhostinfo.pro @@ -12,7 +12,7 @@ wince*: { } # needed for getaddrinfo with official MinGW -win32-g++*:DEFINES += _WIN32_WINNT=0x0501 +mingw:DEFINES += _WIN32_WINNT=0x0501 linux-*:CONFIG+=insignificant_test # QTBUG-23837 - test is unstable DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro index 3f3e5ba3d4..23b36ddade 100644 --- a/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro +++ b/tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro @@ -5,5 +5,5 @@ DESTDIR = ./ # This means the auto test works on some machines for MinGW. No dialog stalls # the application. -win32-g++*:CONFIG += console +mingw:CONFIG += console DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/sql/kernel/qsql/qsql.pro b/tests/auto/sql/kernel/qsql/qsql.pro index 20cee413b2..6bef8d4601 100644 --- a/tests/auto/sql/kernel/qsql/qsql.pro +++ b/tests/auto/sql/kernel/qsql/qsql.pro @@ -8,5 +8,5 @@ QT = core-private sql-private testlib wince*: { DEPLOYMENT_PLUGIN += qsqlite } -win32-g++*: LIBS += -lws2_32 +mingw: LIBS += -lws2_32 diff --git a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro index abdc157c7f..13674f7c9e 100644 --- a/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro +++ b/tests/auto/sql/kernel/qsqldriver/qsqldriver.pro @@ -11,7 +11,7 @@ wince*: { DEPLOYMENT += plugFiles LIBS += -lws2 } else { - win32-g++* { + mingw { LIBS += -lws2_32 } else:win32 { LIBS += ws2_32.lib diff --git a/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro b/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro index 114327effb..2e4c3f998d 100644 --- a/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro +++ b/tests/auto/sql/kernel/qsqlresult/qsqlresult.pro @@ -6,5 +6,5 @@ QT = core core-private sql sql-private testlib SOURCES += tst_qsqlresult.cpp HEADERS += testsqldriver.h -win32-g++*: LIBS += -lws2_32 +mingw: LIBS += -lws2_32 diff --git a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro index 0d7318a5c9..8d20eaa3c8 100644 --- a/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro +++ b/tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro @@ -10,7 +10,7 @@ wince*: { DEPLOYMENT += plugFiles LIBS += -lws2 } else { - win32-g++* { + mingw { LIBS += -lws2_32 } else:win32 { LIBS += ws2_32.lib diff --git a/tests/auto/widgets/dialogs/dialogs.pro b/tests/auto/widgets/dialogs/dialogs.pro index c5f2c409dd..c6667824d9 100644 --- a/tests/auto/widgets/dialogs/dialogs.pro +++ b/tests/auto/widgets/dialogs/dialogs.pro @@ -17,4 +17,4 @@ SUBDIRS=\ qsidebar \ mac:qinputdialog.CONFIG += no_check_target # QTBUG-25496 -win32-g++*: SUBDIRS -= qfilesystemmodel # QTBUG-29403 +mingw: SUBDIRS -= qfilesystemmodel # QTBUG-29403 diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 215a137adf..b73a93431d 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -7,7 +7,7 @@ DEFINES = UNICODE QT_NO_CODECS QT_NO_TEXTCODEC QT_NO_UNICODETABLES QT_LITE_COMP DEFINES += QT_BOOTSTRAPPED QT_BUILD_CONFIGURE win32 : LIBS += -lole32 -ladvapi32 -win32-g++* : LIBS += -luuid +mingw : LIBS += -luuid win32-msvc* { QMAKE_CFLAGS_RELEASE -= -MD -- cgit v1.2.3