diff options
19 files changed, 25 insertions, 30 deletions
diff --git a/qtcreator.pri b/qtcreator.pri index 5eded1d596..bfcb392163 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -164,7 +164,7 @@ unix { UI_DIR = $${OUT_PWD}/.uic } -win32-msvc* { +msvc { #Don't warn about sprintf, fopen etc being 'unsafe' DEFINES += _CRT_SECURE_NO_WARNINGS QMAKE_CXXFLAGS_WARN_ON *= -w44996 diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri index b3a26e4e84..1d2162c31f 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -34,7 +34,7 @@ win32 { BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \ BOTAN_HAS_MUTEX_WIN32 - win32-msvc* { + msvc { QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS diff --git a/src/libs/qtcreatorcdbext/cdb_detect.pri b/src/libs/qtcreatorcdbext/cdb_detect.pri index 1e134255a8..286d9f20c3 100644 --- a/src/libs/qtcreatorcdbext/cdb_detect.pri +++ b/src/libs/qtcreatorcdbext/cdb_detect.pri @@ -2,7 +2,7 @@ # in case MS VS compilers are used. CDB_PATH="" -win32-msvc*|winrt { +msvc { CDB_PATH="$$(CDB_PATH)" isEmpty(CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk" !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk" diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index bc9f76d109..72d979f95e 100644 --- a/src/plugins/coreplugin/coreplugin.pro +++ b/src/plugins/coreplugin/coreplugin.pro @@ -11,7 +11,7 @@ isEmpty(QTC_SHOW_BUILD_DATE): QTC_SHOW_BUILD_DATE = $$(QTC_SHOW_BUILD_DATE) !isEmpty(QTC_SHOW_BUILD_DATE): DEFINES += QTC_SHOW_BUILD_DATE include(../../qtcreatorplugin.pri) -win32-msvc*:QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 +msvc: QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 SOURCES += corejsextensions.cpp \ mainwindow.cpp \ shellcommand.cpp \ diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index f98a85cde8..d13531fa86 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -1,5 +1,5 @@ DEFINES += CPPTOOLS_LIBRARY -win32-msvc*:DEFINES += _SCL_SECURE_NO_WARNINGS +msvc: DEFINES += _SCL_SECURE_NO_WARNINGS include(../../qtcreatorplugin.pri) HEADERS += \ diff --git a/src/plugins/debugger/shared/shared.pri b/src/plugins/debugger/shared/shared.pri index d465345522..074e22cd17 100644 --- a/src/plugins/debugger/shared/shared.pri +++ b/src/plugins/debugger/shared/shared.pri @@ -10,10 +10,8 @@ HEADERS += $$PWD/backtrace.h \ $$PWD/peutils.h \ shared/symbolpathsdialog.h -win32-msvc* { -# For the Privilege manipulation functions in sharedlibraryinjector.cpp. - LIBS += -ladvapi32 -} +# For the Privilege manipulation functions in sharedlibraryinjector.cpp. +win32: LIBS += -ladvapi32 FORMS += \ shared/symbolpathsdialog.ui diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri index 37f16a8002..55333e9569 100644 --- a/src/shared/clang/clang_installation.pri +++ b/src/shared/clang/clang_installation.pri @@ -53,7 +53,7 @@ defineReplace(findClangLibInLibDir) { defineReplace(findClangOnWindows) { FILE_EXTS = a dll - win32-msvc*: FILE_EXTS = lib dll + msvc: FILE_EXTS = lib dll for (suffix, $$list(lib bin)) { for (libname, $$list(clang libclang)) { for (ext, FILE_EXTS) { diff --git a/src/shared/registryaccess/registryaccess.pri b/src/shared/registryaccess/registryaccess.pri index 0a344d6a37..16a61067bb 100644 --- a/src/shared/registryaccess/registryaccess.pri +++ b/src/shared/registryaccess/registryaccess.pri @@ -5,6 +5,4 @@ HEADERS += $$PWD/registryaccess.h LIBS *= -lpsapi # PS API and registry functions -msvc { - LIBS *= -ladvapi32 -} +win32: LIBS *= -ladvapi32 diff --git a/src/tools/wininterrupt/wininterrupt.pro b/src/tools/wininterrupt/wininterrupt.pro index b7fd91db44..3ac6fc32ba 100644 --- a/src/tools/wininterrupt/wininterrupt.pro +++ b/src/tools/wininterrupt/wininterrupt.pro @@ -7,7 +7,7 @@ include(../../qtcreatortool.pri) # global state of the CRT, reconsider if other DLLs are required! # TODO: No effect, currently? -win32-msvc* { +msvc { QMAKE_CXXFLAGS_RELEASE -= -MD QMAKE_CXXFLAGS_DEBUG -= -MDd QMAKE_CXXFLAGS_RELEASE += -MT diff --git a/tests/auto/debugger/dumpers.pro b/tests/auto/debugger/dumpers.pro index 3a44baea6d..2ef8278d26 100644 --- a/tests/auto/debugger/dumpers.pro +++ b/tests/auto/debugger/dumpers.pro @@ -4,7 +4,7 @@ QTC_LIB_DEPENDS += utils include(../qttest.pri) -win32-msvc* { +msvc { LIBS *= -L$$IDE_PLUGIN_PATH DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\" diff --git a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro index aae4b9a45a..7e2902b0d1 100644 --- a/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro +++ b/tests/auto/valgrind/memcheck/testapps/leak2/leak2.pro @@ -3,7 +3,7 @@ TARGET = leak2 CONFIG += debug -win32-msvc*:QMAKE_CXXFLAGS += -w44996 +msvc: QMAKE_CXXFLAGS += -w44996 QT += core macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro index 6eebcbb04a..82a2ae5c89 100644 --- a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro +++ b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro @@ -5,8 +5,7 @@ CONFIG += debug QT += core -macx:CONFIG -= app_bundle - -win32-msvc*:QMAKE_CXXFLAGS += -w44996 +osx: CONFIG -= app_bundle +msvc: QMAKE_CXXFLAGS += -w44996 SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro index dcc03cf182..2614ae24a5 100644 --- a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro +++ b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro @@ -3,7 +3,7 @@ TARGET = overlap CONFIG += debug console CONFIG -= qt -!win32-msvc*:QMAKE_CXXFLAGS = -O0 -fno-builtin +!msvc: QMAKE_CXXFLAGS = -O0 -fno-builtin macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro index 026a9fdcdb..fdb2aadceb 100644 --- a/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro +++ b/tests/auto/valgrind/memcheck/testapps/syscall/syscall.pro @@ -2,8 +2,8 @@ TEMPLATE = app TARGET = syscall CONFIG += debug -win32-msvc*:QMAKE_CXXFLAGS += -w44700 -else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized +msvc: QMAKE_CXXFLAGS += -w44700 +else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized QT += core diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro index 4ccd99a541..499c5b55b4 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro @@ -3,8 +3,8 @@ TARGET = uninit1 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w44700 -else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized +msvc: QMAKE_CXXFLAGS += -w44700 +else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro index 26c1ce41fb..a1818617d9 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro @@ -3,8 +3,8 @@ TARGET = uninit2 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w44700 -else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized +msvc: QMAKE_CXXFLAGS += -w44700 +else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro index 2d7ff256c1..23e9be1804 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro @@ -3,8 +3,8 @@ TARGET = uninit3 CONFIG += debug console CONFIG -= qt -win32-msvc*:QMAKE_CXXFLAGS += -w44700 -else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized +msvc: QMAKE_CXXFLAGS += -w44700 +else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro index f7b492ef79..3995f45f08 100644 --- a/tests/manual/debugger/simple/simple_test_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -64,7 +64,7 @@ exists(/usr/local/include/eigen3/Eigen/Core) { INCLUDEPATH += /usr/local/include/eigen3 } -win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS +msvc: DEFINES += _CRT_SECURE_NO_WARNINGS # Use for semi-automated testing #DEFINES += USE_AUTORUN=1 diff --git a/tests/unit/unittest/unittest.pro b/tests/unit/unittest/unittest.pro index 922354975f..55e35621ed 100644 --- a/tests/unit/unittest/unittest.pro +++ b/tests/unit/unittest/unittest.pro @@ -20,7 +20,7 @@ DEFINES += \ UNIT_TESTS \ DONT_CHECK_MESSAGE_COUNTER \ TESTDATA_DIR=\"R\\\"xxx($$PWD/data)xxx\\\"\" -win32-msvc*:QMAKE_CXXFLAGS_WARN_ON -= -w34100 # 'unreferenced formal parameter' in MATCHER_* functions +msvc: QMAKE_CXXFLAGS_WARN_ON -= -w34100 # 'unreferenced formal parameter' in MATCHER_* functions win32:DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echo)xxx\\\"\" unix: DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echoserver/echo)xxx\\\"\" |