diff options
| -rw-r--r-- | src/particles/particles.pro | 2 | ||||
| -rw-r--r-- | src/qml/qml.pro | 4 | ||||
| -rw-r--r-- | src/quick/quick.pro | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/particles/particles.pro b/src/particles/particles.pro index ab1c854253..6a3fb1bdc4 100644 --- a/src/particles/particles.pro +++ b/src/particles/particles.pro @@ -6,7 +6,7 @@ CONFIG += internal_module QT = core-private gui-private qml-private quick-private DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES -win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS +msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 exists("qqml_enable_gcov") { diff --git a/src/qml/qml.pro b/src/qml/qml.pro index a76a87b153..db59140f06 100644 --- a/src/qml/qml.pro +++ b/src/qml/qml.pro @@ -7,7 +7,7 @@ qtConfig(qml-network): \ DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES msvc:equals(QT_ARCH, i386): QMAKE_LFLAGS += /BASE:0x66000000 -win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS +msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS win32:!winrt:LIBS += -lshell32 solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 @@ -47,7 +47,7 @@ exists("qqml_enable_gcov") { } # QTBUG-55238, disable new optimizer for MSVC 2015/Update 3. -release:win32-msvc*:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ +release:msvc:equals(QT_CL_MAJOR_VERSION, 19):equals(QT_CL_MINOR_VERSION, 00): \ greaterThan(QT_CL_PATCH_VERSION, 24212):QMAKE_CXXFLAGS += -d2SSAOptimizer- QMAKE_DOCS = $$PWD/doc/qtqml.qdocconf diff --git a/src/quick/quick.pro b/src/quick/quick.pro index e9a8b84b2a..0f5f5abca3 100644 --- a/src/quick/quick.pro +++ b/src/quick/quick.pro @@ -5,7 +5,7 @@ qtConfig(qml-network): \ QT_PRIVATE += network DEFINES += QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES -win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS +msvc:DEFINES *= _CRT_SECURE_NO_WARNINGS solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2 win32:!winrt: LIBS += -luser32 |