whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/qmake/generators
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
..
mac Merge remote-tracking branch 'origin/5.8' into dev 2016-10-13 09:49:38 +02:00
unix Merge remote-tracking branch 'origin/5.8' into dev 2016-09-15 19:47:57 +02:00
win32 Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
makefile.cpp fix argument order in recursive qmake invocations 2016-08-25 11:55:32 +00:00
makefile.h qmake: Mark MakefileGenerator::Compiler as Q_MOVABLE_TYPE 2016-08-15 22:16:59 +00:00
makefiledeps.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
makefiledeps.h qmake: replace a uint:1 with a bool 2016-08-15 22:16:09 +00:00
metamakefile.cpp Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-29 17:55:20 +02:00
metamakefile.h Updated license headers 2016-01-21 18:55:18 +00:00
projectgenerator.cpp qmake project generator: enable deprecation warnings 2016-10-26 10:44:56 +00:00
projectgenerator.h Updated license headers 2016-01-21 18:55:18 +00:00
xmloutput.cpp Merge remote-tracking branch 'origin/5.6' into dev 2016-02-11 08:25:04 +01:00
xmloutput.h Updated license headers 2016-01-21 18:55:18 +00:00