diff --git a/src/libs/3rdparty/botan/botan.pri b/src/libs/3rdparty/botan/botan.pri index 3c656766290..3ff57ded1ba 100644 --- a/src/libs/3rdparty/botan/botan.pri +++ b/src/libs/3rdparty/botan/botan.pri @@ -36,7 +36,7 @@ win32 { win32-msvc* { QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250 - DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S + DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S _SCL_SECURE_NO_WARNINGS } else { QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index d02a19eaee3..2b1949927ef 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -72,7 +72,9 @@ QtcLibrary { } else { result.push("BOTAN_DLL=") if (qbs.toolchain.contains("msvc")) - result.push("BOTAN_BUILD_COMPILER_IS_MSVC", "BOTAN_TARGET_OS_HAS_GMTIME_S") + result.push("BOTAN_BUILD_COMPILER_IS_MSVC", + "BOTAN_TARGET_OS_HAS_GMTIME_S", + "_SCL_SECURE_NO_WARNINGS") if (qbs.toolchain.contains("gcc") || qbs.toolchain.contains("mingw")) result.push("BOTAN_BUILD_COMPILER_IS_GCC") if (qbs.targetOS.contains("linux")) diff --git a/src/plugins/cpptools/cpptools.pro b/src/plugins/cpptools/cpptools.pro index 79ba9bdb59d..b27d4f46fed 100644 --- a/src/plugins/cpptools/cpptools.pro +++ b/src/plugins/cpptools/cpptools.pro @@ -1,6 +1,7 @@ include(../../qtcreatorplugin.pri) DEFINES += CPPTOOLS_LIBRARY +win32-msvc*:DEFINES += _SCL_SECURE_NO_WARNINGS HEADERS += completionsettingspage.h \ cppclassesfilter.h \ cppcurrentdocumentfilter.h \ diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs index f810c63f0d6..e78d40ee199 100644 --- a/src/plugins/cpptools/cpptools.qbs +++ b/src/plugins/cpptools/cpptools.qbs @@ -15,6 +15,12 @@ QtcPlugin { Depends { name: "CPlusPlus" } Depends { name: "LanguageUtils" } + cpp.defines: base + Properties { + condition: qbs.toolchain.contains("msvc") + cpp.defines: base.concat("_SCL_SECURE_NO_WARNINGS") + } + files: [ "abstracteditorsupport.cpp", "abstracteditorsupport.h",