diff options
| author | David Schulz <[email protected]> | 2016-04-26 11:09:44 +0200 |
|---|---|---|
| committer | David Schulz <[email protected]> | 2016-04-26 12:32:54 +0000 |
| commit | abeac6219146133f3b025c895d7e9924d5194268 (patch) | |
| tree | 39d7e79c84f7b4b413cf617555723da0ad8fa871 /src/plugins | |
| parent | 7b7b1823cbfbf95589bf1f8fc07253f3f5ad7477 (diff) | |
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 <[email protected]>
Reviewed-by: Oswald Buddenhagen <[email protected]>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/coreplugin/coreplugin.pro | 2 | ||||
| -rw-r--r-- | src/plugins/cpptools/cpptools.pro | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/shared/shared.pri | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro index bc9f76d109b..72d979f95e0 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 f98a85cde89..d13531fa865 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 d4653455221..074e22cd17e 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 |