summaryrefslogtreecommitdiffstats
path: root/config.tests
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2016-11-01 10:27:41 +0100
committerLiang Qi <liang.qi@qt.io>2016-11-02 09:24:11 +0100
commitd7e4980132057aa10e54137114bf65e06c455030 (patch)
tree9d6ae36efa0cf84a612bfec6cf3dd2ea7f7e3446 /config.tests
parent44c402b4bfba44480382244b8409fb3cf34d7ac1 (diff)
parenta732576a66ff2bbd9c0b41cd5f3505a4d2fbf043 (diff)
Merge remote-tracking branch 'origin/5.8' into dev
Blacklist tst_QMenuBar::taskQTBUG46812_doNotLeaveMenubarHighlighted() on macOS. Conflicts: mkspecs/features/mac/default_post.prf mkspecs/features/mac/sdk.prf mkspecs/features/uikit/default_post.prf mkspecs/features/uikit/sdk.prf src/angle/src/libEGL/libEGL.pro src/platformsupport/fontdatabases/fontdatabases.pro src/platformsupport/platformsupport.pro src/plugins/platforms/cocoa/qnswindowdelegate.mm src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp src/plugins/platforms/ios/ios.pro src/plugins/platforms/ios/kernel.pro tests/auto/widgets/widgets/qmenubar/BLACKLIST tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp Task-number: QTBUG-56853 Change-Id: If58785210feee3550892fc7768cce90e75a2416c
Diffstat (limited to 'config.tests')
-rw-r--r--config.tests/.qmake.conf7
-rw-r--r--config.tests/win/msvc_version.cpp1
2 files changed, 2 insertions, 6 deletions
diff --git a/config.tests/.qmake.conf b/config.tests/.qmake.conf
index 71e6817656..e8f6f09e9d 100644
--- a/config.tests/.qmake.conf
+++ b/config.tests/.qmake.conf
@@ -1,6 +1 @@
-mingw {
- TMPPATH = $$(INCLUDE)
- QMAKE_INCDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
- TMPPATH = $$(LIB)
- QMAKE_LIBDIR_POST += $$split(TMPPATH, $$QMAKE_DIRLIST_SEP)
-}
+# This file exists only to detach the tests from the surroundings.
diff --git a/config.tests/win/msvc_version.cpp b/config.tests/win/msvc_version.cpp
new file mode 100644
index 0000000000..3d7232e8e2
--- /dev/null
+++ b/config.tests/win/msvc_version.cpp
@@ -0,0 +1 @@
+_MSC_FULL_VER