diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator_common.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/compiler/translator_hlsl.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/libEGL/libEGL.pro | 2 | ||||
| -rw-r--r-- | src/angle/src/libGLESv2/libGLESv2.pro | 2 | ||||
| -rw-r--r-- | src/corelib/corelib.pro | 2 | ||||
| -rw-r--r-- | src/gui/image/qpnghandler.pri | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/accessible/accessible.pri | 4 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pri | 2 | ||||
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.pri | 2 | ||||
| -rw-r--r-- | src/sql/drivers/tds/qsql_tds.pri | 2 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pro | 2 | ||||
| -rw-r--r-- | src/winmain/winmain.pro | 2 |
13 files changed, 14 insertions, 14 deletions
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 |