1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace win32-g++ with mingw scope

Browse Source 
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 <thiago.macieira@intel.com>
This commit is contained in:
Kai Koehne 2014-01-08 14:12:17 +01:00 committed by The Qt Project
parent e59b28e08e
commit 278152fffd
32 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.tests/unix/iconv/iconv.pro
View File

@ -1,3 +1,3 @@
SOURCES = iconv.cpp
CONFIG -= qt dylib
mac|win32-g++*|qnx:LIBS += -liconv
mac|mingw|qnx:LIBS += -liconv

2
config.tests/unix/odbc/odbc.pro
View File

@ -1,4 +1,4 @@
SOURCES = odbc.cpp
CONFIG -= qt dylib
win32-g++*:LIBS += -lodbc32
mingw:LIBS += -lodbc32
else:LIBS += -lodbc

2
config.tests/x11/opengl/opengl.pro
View File

@ -7,5 +7,5 @@ for(p, QMAKE_LIBDIR_OPENGL) {
}
CONFIG -= qt
win32-g++*:LIBS += -lopengl32
mingw:LIBS += -lopengl32
else:LIBS += -lGL

2
mkspecs/features/create_cmake.prf
View File

@ -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

2
mkspecs/features/ctest_testcase_common.prf
View File

@ -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\"

2
mkspecs/features/qml_plugin.prf
View File

@ -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: \

4
mkspecs/features/qt_module.prf
View File

@ -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): \

2
mkspecs/features/qt_plugin.prf
View File

@ -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: \

2
mkspecs/features/win32/windows.prf
View File

@ -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): {

2
qmake/qmake.pri
View File

@ -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 {

2
src/3rdparty/zlib_dependency.pri vendored
View File

@ -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

2
src/angle/src/compiler/translator_common.pro
View File

@ -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 \

2
src/angle/src/compiler/translator_hlsl.pro
View File

@ -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

2
src/angle/src/libEGL/libEGL.pro
View File

@ -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)

2
src/angle/src/libGLESv2/libGLESv2.pro
View File

@ -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

2
src/corelib/corelib.pro
View File

@ -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

2
src/gui/image/qpnghandler.pri
View File

@ -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 {

4
src/plugins/platforms/windows/accessible/accessible.pri
View File

@ -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
mingw: LIBS *= -luuid

2
src/plugins/platforms/windows/windows.pri
View File

@ -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

2
src/sql/drivers/psql/qsql_psql.pri
View File

@ -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

2
src/sql/drivers/tds/qsql_tds.pri
View File

@ -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

2
src/tools/bootstrap/bootstrap.pro
View File

@ -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 \

2
src/winmain/winmain.pro
View File

@ -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

2
tests/auto/corelib/io/qprocess/testProcessEOF/testProcessEOF.pro
View File

@ -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

2
tests/auto/network/kernel/qhostinfo/qhostinfo.pro
View File

@ -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

2
tests/auto/network/socket/qtcpserver/crashingServer/crashingServer.pro
View File

@ -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

2
tests/auto/sql/kernel/qsql/qsql.pro
View File

@ -8,5 +8,5 @@ QT = core-private sql-private testlib
wince*: {
DEPLOYMENT_PLUGIN += qsqlite
}
win32-g++*: LIBS += -lws2_32
mingw: LIBS += -lws2_32

2
tests/auto/sql/kernel/qsqldriver/qsqldriver.pro
View File

@ -11,7 +11,7 @@ wince*: {
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
win32-g++* {
mingw {
LIBS += -lws2_32
} else:win32 {
LIBS += ws2_32.lib

2
tests/auto/sql/kernel/qsqlresult/qsqlresult.pro
View File

@ -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

2
tests/auto/sql/models/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
View File

@ -10,7 +10,7 @@ wince*: {
DEPLOYMENT += plugFiles
LIBS += -lws2
} else {
win32-g++* {
mingw {
LIBS += -lws2_32
} else:win32 {
LIBS += ws2_32.lib

2
tests/auto/widgets/dialogs/dialogs.pro
View File

@ -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

2
tools/configure/configure.pro
View File

@ -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