Commit abeac621 authored by David Schulz's avatar David Schulz

Fix building creator with the intel compiler.

Replacing all occurrences of win32-msvc* with msvc.

Task-number: QTCREATORBUG-16118
Change-Id: I46bd54628bffb04c24bca587fd9dd7684e888f1a
Reviewed-by: Eike Ziller's avatarEike Ziller <eike.ziller@qt.io>
Reviewed-by: default avatarOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
parent 7b7b1823
...@@ -164,7 +164,7 @@ unix { ...@@ -164,7 +164,7 @@ unix {
UI_DIR = $${OUT_PWD}/.uic UI_DIR = $${OUT_PWD}/.uic
} }
win32-msvc* { msvc {
#Don't warn about sprintf, fopen etc being 'unsafe' #Don't warn about sprintf, fopen etc being 'unsafe'
DEFINES += _CRT_SECURE_NO_WARNINGS DEFINES += _CRT_SECURE_NO_WARNINGS
QMAKE_CXXFLAGS_WARN_ON *= -w44996 QMAKE_CXXFLAGS_WARN_ON *= -w44996
......
...@@ -34,7 +34,7 @@ win32 { ...@@ -34,7 +34,7 @@ win32 {
BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \ BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
BOTAN_HAS_MUTEX_WIN32 BOTAN_HAS_MUTEX_WIN32
win32-msvc* { msvc {
QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs QMAKE_CXXFLAGS_EXCEPTIONS_ON = -EHs
QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# in case MS VS compilers are used. # in case MS VS compilers are used.
CDB_PATH="" CDB_PATH=""
win32-msvc*|winrt { msvc {
CDB_PATH="$$(CDB_PATH)" CDB_PATH="$$(CDB_PATH)"
isEmpty(CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk" isEmpty(CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows/sdk"
!exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk" !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Debugging Tools For Windows (x86)/sdk"
......
...@@ -11,7 +11,7 @@ isEmpty(QTC_SHOW_BUILD_DATE): QTC_SHOW_BUILD_DATE = $$(QTC_SHOW_BUILD_DATE) ...@@ -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 !isEmpty(QTC_SHOW_BUILD_DATE): DEFINES += QTC_SHOW_BUILD_DATE
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
win32-msvc*:QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 msvc: QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
SOURCES += corejsextensions.cpp \ SOURCES += corejsextensions.cpp \
mainwindow.cpp \ mainwindow.cpp \
shellcommand.cpp \ shellcommand.cpp \
......
DEFINES += CPPTOOLS_LIBRARY DEFINES += CPPTOOLS_LIBRARY
win32-msvc*:DEFINES += _SCL_SECURE_NO_WARNINGS msvc: DEFINES += _SCL_SECURE_NO_WARNINGS
include(../../qtcreatorplugin.pri) include(../../qtcreatorplugin.pri)
HEADERS += \ HEADERS += \
......
...@@ -10,10 +10,8 @@ HEADERS += $$PWD/backtrace.h \ ...@@ -10,10 +10,8 @@ HEADERS += $$PWD/backtrace.h \
$$PWD/peutils.h \ $$PWD/peutils.h \
shared/symbolpathsdialog.h shared/symbolpathsdialog.h
win32-msvc* { # For the Privilege manipulation functions in sharedlibraryinjector.cpp.
# For the Privilege manipulation functions in sharedlibraryinjector.cpp. win32: LIBS += -ladvapi32
LIBS += -ladvapi32
}
FORMS += \ FORMS += \
shared/symbolpathsdialog.ui shared/symbolpathsdialog.ui
...@@ -53,7 +53,7 @@ defineReplace(findClangLibInLibDir) { ...@@ -53,7 +53,7 @@ defineReplace(findClangLibInLibDir) {
defineReplace(findClangOnWindows) { defineReplace(findClangOnWindows) {
FILE_EXTS = a dll FILE_EXTS = a dll
win32-msvc*: FILE_EXTS = lib dll msvc: FILE_EXTS = lib dll
for (suffix, $$list(lib bin)) { for (suffix, $$list(lib bin)) {
for (libname, $$list(clang libclang)) { for (libname, $$list(clang libclang)) {
for (ext, FILE_EXTS) { for (ext, FILE_EXTS) {
......
...@@ -5,6 +5,4 @@ HEADERS += $$PWD/registryaccess.h ...@@ -5,6 +5,4 @@ HEADERS += $$PWD/registryaccess.h
LIBS *= -lpsapi LIBS *= -lpsapi
# PS API and registry functions # PS API and registry functions
msvc { win32: LIBS *= -ladvapi32
LIBS *= -ladvapi32
}
...@@ -7,7 +7,7 @@ include(../../qtcreatortool.pri) ...@@ -7,7 +7,7 @@ include(../../qtcreatortool.pri)
# global state of the CRT, reconsider if other DLLs are required! # global state of the CRT, reconsider if other DLLs are required!
# TODO: No effect, currently? # TODO: No effect, currently?
win32-msvc* { msvc {
QMAKE_CXXFLAGS_RELEASE -= -MD QMAKE_CXXFLAGS_RELEASE -= -MD
QMAKE_CXXFLAGS_DEBUG -= -MDd QMAKE_CXXFLAGS_DEBUG -= -MDd
QMAKE_CXXFLAGS_RELEASE += -MT QMAKE_CXXFLAGS_RELEASE += -MT
......
...@@ -4,7 +4,7 @@ QTC_LIB_DEPENDS += utils ...@@ -4,7 +4,7 @@ QTC_LIB_DEPENDS += utils
include(../qttest.pri) include(../qttest.pri)
win32-msvc* { msvc {
LIBS *= -L$$IDE_PLUGIN_PATH LIBS *= -L$$IDE_PLUGIN_PATH
DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\" DEFINES += Q_PLUGIN_PATH=\"\\\"$$IDE_PLUGIN_PATH\\\"\"
......
...@@ -3,7 +3,7 @@ TARGET = leak2 ...@@ -3,7 +3,7 @@ TARGET = leak2
CONFIG += debug CONFIG += debug
win32-msvc*:QMAKE_CXXFLAGS += -w44996 msvc: QMAKE_CXXFLAGS += -w44996
QT += core QT += core
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
......
...@@ -5,8 +5,7 @@ CONFIG += debug ...@@ -5,8 +5,7 @@ CONFIG += debug
QT += core QT += core
macx:CONFIG -= app_bundle osx: CONFIG -= app_bundle
msvc: QMAKE_CXXFLAGS += -w44996
win32-msvc*:QMAKE_CXXFLAGS += -w44996
SOURCES += main.cpp SOURCES += main.cpp
...@@ -3,7 +3,7 @@ TARGET = overlap ...@@ -3,7 +3,7 @@ TARGET = overlap
CONFIG += debug console CONFIG += debug console
CONFIG -= qt CONFIG -= qt
!win32-msvc*:QMAKE_CXXFLAGS = -O0 -fno-builtin !msvc: QMAKE_CXXFLAGS = -O0 -fno-builtin
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
......
...@@ -2,8 +2,8 @@ TEMPLATE = app ...@@ -2,8 +2,8 @@ TEMPLATE = app
TARGET = syscall TARGET = syscall
CONFIG += debug CONFIG += debug
win32-msvc*:QMAKE_CXXFLAGS += -w44700 msvc: QMAKE_CXXFLAGS += -w44700
else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized
QT += core QT += core
......
...@@ -3,8 +3,8 @@ TARGET = uninit1 ...@@ -3,8 +3,8 @@ TARGET = uninit1
CONFIG += debug console CONFIG += debug console
CONFIG -= qt CONFIG -= qt
win32-msvc*:QMAKE_CXXFLAGS += -w44700 msvc: QMAKE_CXXFLAGS += -w44700
else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
......
...@@ -3,8 +3,8 @@ TARGET = uninit2 ...@@ -3,8 +3,8 @@ TARGET = uninit2
CONFIG += debug console CONFIG += debug console
CONFIG -= qt CONFIG -= qt
win32-msvc*:QMAKE_CXXFLAGS += -w44700 msvc: QMAKE_CXXFLAGS += -w44700
else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
......
...@@ -3,8 +3,8 @@ TARGET = uninit3 ...@@ -3,8 +3,8 @@ TARGET = uninit3
CONFIG += debug console CONFIG += debug console
CONFIG -= qt CONFIG -= qt
win32-msvc*:QMAKE_CXXFLAGS += -w44700 msvc: QMAKE_CXXFLAGS += -w44700
else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized else: QMAKE_CXXFLAGS = -O0 -Wno-uninitialized
macx:CONFIG -= app_bundle macx:CONFIG -= app_bundle
......
...@@ -64,7 +64,7 @@ exists(/usr/local/include/eigen3/Eigen/Core) { ...@@ -64,7 +64,7 @@ exists(/usr/local/include/eigen3/Eigen/Core) {
INCLUDEPATH += /usr/local/include/eigen3 INCLUDEPATH += /usr/local/include/eigen3
} }
win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS msvc: DEFINES += _CRT_SECURE_NO_WARNINGS
# Use for semi-automated testing # Use for semi-automated testing
#DEFINES += USE_AUTORUN=1 #DEFINES += USE_AUTORUN=1
......
...@@ -20,7 +20,7 @@ DEFINES += \ ...@@ -20,7 +20,7 @@ DEFINES += \
UNIT_TESTS \ UNIT_TESTS \
DONT_CHECK_MESSAGE_COUNTER \ DONT_CHECK_MESSAGE_COUNTER \
TESTDATA_DIR=\"R\\\"xxx($$PWD/data)xxx\\\"\" 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\\\"\" win32:DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echo)xxx\\\"\"
unix: DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echoserver/echo)xxx\\\"\" unix: DEFINES += ECHOSERVER=\"R\\\"xxx($$OUT_PWD/../echoserver/echo)xxx\\\"\"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment