diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
| commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
| tree | cf7281872045ebd57c68e10064ff0f400084aa13 /mkspecs/common | |
| parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
| parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/clang-mac.conf | 2 | ||||
| -rw-r--r-- | mkspecs/common/msvc-version.conf | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/common/clang-mac.conf b/mkspecs/common/clang-mac.conf index 274fd73d00..cbae2e6262 100644 --- a/mkspecs/common/clang-mac.conf +++ b/mkspecs/common/clang-mac.conf @@ -9,3 +9,5 @@ QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvm.clang.1_0 QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_LFLAGS += -stdlib=libc++ QMAKE_AR_LTCG = libtool -static -o + +QMAKE_CFLAGS_APPLICATION_EXTENSION = -fapplication-extension diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 945767ce8c..29f96b7abf 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -47,7 +47,7 @@ greaterThan(QMAKE_MSC_VER, 1799) { MSVC_VER = 12.0 COMPAT_MKSPEC = win32-msvc2013 QMAKE_CFLAGS += -FS - QMAKE_CXXFLAGS += -FS + QMAKE_CXXFLAGS += -FS -Zc:rvalueCast -Zc:inline QMAKE_CFLAGS_F16C = -arch:AVX @@ -80,6 +80,7 @@ greaterThan(QMAKE_MSC_VER, 1909) { # Visual Studio 2017 (15.0) / Visual C++ 19.10 and up MSVC_VER = 15.0 COMPAT_MKSPEC = win32-msvc2017 + QMAKE_CXXFLAGS += -Zc:referenceBinding } greaterThan(QMAKE_MSC_VER, 1910) { |