whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/widgets
History
Liang Qi af0d0b9c06 Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
	src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
	src/plugins/platforms/ios/qiosintegration.h
	src/widgets/widgets/qcombobox.cpp
	tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
	tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp

Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
 		2016-10-27 10:23:39 +02:00
..
accessible Use QStringLiteral more judiciously 2016-07-08 06:43:02 +00:00
dialogs Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
effects Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
graphicsview Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
itemviews Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-17 11:02:54 +02:00
kernel Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
statemachine Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
styles Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
util Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-13 01:05:02 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-27 10:23:39 +02:00
Qt5WidgetsConfigExtras.cmake.in
…
Qt5WidgetsMacros.cmake
…
QtWidgets.dynlist
…
widgets.pro consistently put {qt,qml}_{module,plugin} at the end of project files 2016-03-07 14:09:49 +00:00