From abeac6219146133f3b025c895d7e9924d5194268 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 26 Apr 2016 11:09:44 +0200 Subject: 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 Reviewed-by: Oswald Buddenhagen --- src/libs/3rdparty/botan/botan.pri | 2 +- src/libs/qtcreatorcdbext/cdb_detect.pri | 2 +- src/plugins/coreplugin/coreplugin.pro | 2 +- src/plugins/cpptools/cpptools.pro | 2 +- src/plugins/debugger/shared/shared.pri | 6 ++---- src/shared/clang/clang_installation.pri | 2 +- src/shared/registryaccess/registryaccess.pri | 4 +--- src/tools/wininterrupt/wininterrupt.pro | 2 +- 8 files changed, 9 insertions(+), 13 deletions(-) (limited to 'src') 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 -- cgit v1.2.1