Merge remote-tracking branch 'origin/5.9' into dev

Conflicts: src/plugins/platforms/xcb/qxcbconnection.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp src/plugins/styles/mac/qmacstyle_mac.mm src/widgets/widgets/qdockarealayout.cpp src/widgets/widgets/qmainwindow.cpp src/widgets/widgets/qmainwindowlayout.cpp src/widgets/widgets/qmainwindowlayout_p.h tests/auto/corelib/tools/qlocale/tst_qlocale.cpp tests/auto/other/macnativeevents/BLACKLIST tests/auto/widgets/widgets/qmenu/BLACKLIST Change-Id: Ic8e724b80a65e7b1af25511b0e674d209265e567
boris-fx · Aug 2, 2017 · ee07b91 · ee07b91
2 parents 4bfff6a + a96656a
commit ee07b91
Show file tree

Hide file tree

Showing 399 changed files with 2,440 additions and 6,509 deletions.
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro
@@ -1,4 +1,2 @@
 TARGET = arch
 SOURCES = arch.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
diff --git a/....tests/common/atomicfptr/icc2016_mac.diff → config.tests/atomicfptr/icc2016_mac.diff b/....tests/common/atomicfptr/icc2016_mac.diff → config.tests/atomicfptr/icc2016_mac.diff
diff --git a/config.tests/common/atomicfptr/qnx66.txt → config.tests/atomicfptr/qnx66.txt b/config.tests/common/atomicfptr/qnx66.txt → config.tests/atomicfptr/qnx66.txt
diff --git a/config.tests/common/avx512/avx512.cpp → config.tests/avx512/avx512.cpp b/config.tests/common/avx512/avx512.cpp → config.tests/avx512/avx512.cpp
diff --git a/config.tests/common/avx512/avx512.pro → config.tests/avx512/avx512.pro b/config.tests/common/avx512/avx512.pro → config.tests/avx512/avx512.pro
@@ -1,6 +1,4 @@
 SOURCES = avx512.cpp
-CONFIG -= qt dylib release debug_and_release
-CONFIG += debug console
 
 !defined(AVX512, "var"): error("You must set the AVX512 variable!")
 

diff --git a/config.tests/common/alloca/alloca.cpp b/config.tests/common/alloca/alloca.cpp
diff --git a/config.tests/common/alloca/alloca.pro b/config.tests/common/alloca/alloca.pro
diff --git a/config.tests/common/atomic64/atomic64.cpp b/config.tests/common/atomic64/atomic64.cpp
diff --git a/config.tests/common/atomic64/atomic64.pro b/config.tests/common/atomic64/atomic64.pro
diff --git a/config.tests/common/atomicfptr/atomicfptr.cpp b/config.tests/common/atomicfptr/atomicfptr.cpp
diff --git a/config.tests/common/atomicfptr/atomicfptr.pro b/config.tests/common/atomicfptr/atomicfptr.pro
diff --git a/config.tests/common/avx/avx.cpp b/config.tests/common/avx/avx.cpp
diff --git a/config.tests/common/avx/avx.pro b/config.tests/common/avx/avx.pro
diff --git a/config.tests/common/avx2/avx2.cpp b/config.tests/common/avx2/avx2.cpp
diff --git a/config.tests/common/avx2/avx2.pro b/config.tests/common/avx2/avx2.pro
diff --git a/config.tests/common/c++14/c++14.cpp b/config.tests/common/c++14/c++14.cpp
diff --git a/config.tests/common/c++14/c++14.pro b/config.tests/common/c++14/c++14.pro