AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d7e4980132
qt5base-lts/tests/auto/widgets/kernel
History
Liang Qi d7e4980132 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
2016-11-02 09:24:11 +01:00
..
qaction Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qactiongroup Updated license headers 2016-01-21 18:55:18 +00:00
qapplication Merge remote-tracking branch 'origin/5.8' into dev 2016-11-02 09:24:11 +01:00
qboxlayout Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
qdesktopwidget Updated license headers 2016-01-21 18:55:18 +00:00
qformlayout Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qgridlayout Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
qlayout QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00
qshortcut Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
qsizepolicy Updated license headers 2016-01-21 18:55:18 +00:00
qstackedlayout Updated license headers 2016-01-21 18:55:18 +00:00
qtooltip Updated license headers 2016-01-21 18:55:18 +00:00
qwidget Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
qwidget_window Add support for Apple watchOS 2016-08-19 21:05:55 +00:00
qwidgetaction Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetmetatype Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetsvariant Updated license headers 2016-01-21 18:55:18 +00:00
qwindowcontainer macOS: Don't build auto-tests as application bundles unless explicitly requested 2016-10-23 10:39:56 +00:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00