diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2018-11-21 18:55:55 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@qt.io> | 2018-11-22 07:17:42 +0000 |
| commit | 6b3365b2ea3b445cae2cf657392176bff19a0fe4 (patch) | |
| tree | 474379a62928257e817ba04c8a0fee7dfc180b9c /src/qml/qml.pro | |
| parent | 63ada5fa00ba37e0fbfcd7b70dcbd99580dd7c4f (diff) | |
Use msvc qmake scope where appropriate
Use 'msvc' instead of 'win32-mscv*'.
Change-Id: Ic592d9b5e63529aaae0b780b00e0fce5999926a0
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/qml/qml.pro')
| -rw-r--r-- | src/qml/qml.pro | 4 |
1 files changed, 2 insertions, 2 deletions
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 |