diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /mkspecs | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/msvc-version.conf | 6 | ||||
| -rw-r--r-- | mkspecs/features/default_pre.prf | 2 | ||||
| -rw-r--r-- | mkspecs/features/mac/default_post.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 3 |
4 files changed, 13 insertions, 3 deletions
diff --git a/mkspecs/common/msvc-version.conf b/mkspecs/common/msvc-version.conf index 3fb55c9d81..5805383a04 100644 --- a/mkspecs/common/msvc-version.conf +++ b/mkspecs/common/msvc-version.conf @@ -110,6 +110,12 @@ greaterThan(QMAKE_MSC_VER, 1909) { QMAKE_CXXFLAGS_CXX14 = -std:c++14 QMAKE_CXXFLAGS_CXX1Z = -std:c++17 } + + # MSVC 2017 15.8+ fixed std::aligned_storage but compilation fails without + # this flag since the fix breaks binary compatibility. + greaterThan(QMAKE_MSC_VER, 1914) { + DEFINES += _ENABLE_EXTENDED_ALIGNED_STORAGE + } } greaterThan(QMAKE_MSC_VER, 1910) { diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf index 1f2f1ff2de..1c24bf071a 100644 --- a/mkspecs/features/default_pre.prf +++ b/mkspecs/features/default_pre.prf @@ -11,7 +11,7 @@ CONFIG = \ testcase_targets import_plugins import_qpa_plugin \ $$CONFIG -!build_pass:!isEmpty(QT_LICHECK) { +!build_pass:!isEmpty(QT_LICHECK):!QTDIR_build { # # call license checker (but cache result for one day) # diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 21d487f1f9..c6eb7c5a2c 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -215,5 +215,8 @@ xcode_product_bundle_identifier_setting.name = PRODUCT_BUNDLE_IDENTIFIER xcode_product_bundle_identifier_setting.value = $$QMAKE_TARGET_BUNDLE_PREFIX isEmpty(xcode_product_bundle_identifier_setting.value): \ xcode_product_bundle_identifier_setting.value = "com.yourcompany" -xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.${PRODUCT_NAME:rfc1034identifier}" +xcode_product_bundle_target = $$QMAKE_BUNDLE +isEmpty(xcode_product_bundle_target): \ + xcode_product_bundle_target = ${PRODUCT_NAME:rfc1034identifier} +xcode_product_bundle_identifier_setting.value = "$${xcode_product_bundle_identifier_setting.value}.$${xcode_product_bundle_target}" QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index b19bb1cf75..36b016bc7e 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1016,7 +1016,8 @@ defineTest(qtConfTest_compile) { QMAKE_MAKE = "$$QMAKE_MAKE clean && $$QMAKE_MAKE" mkpath($$test_out_dir)|error() - write_file($$test_base_out_dir/.qmake.cache)|error() + cont = "CONFIG += QTDIR_build" + write_file($$test_base_out_dir/.qmake.cache, cont)|error() $${1}.literal_args += $$qtConfAllLibraryArgs($$eval($${1}.resolved_uses)) |