whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/src/widgets
History
Liang Qi a732576a66 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	config.tests/win/msvc_version.cpp
	configure.pri
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	src/corelib/io/qsettings_mac.cpp
	src/corelib/json/qjsondocument.cpp
	src/plugins/platforms/cocoa/qcocoawindow.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.h
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/ios.pro
	src/plugins/platforms/ios/kernel.pro
	src/plugins/platforms/ios/qiosintegration.h
	src/plugins/platforms/minimalegl/qminimaleglintegration.cpp
	tests/auto/gui/painting/qpainter/tst_qpainter.cpp
	tools/configure/environment.cpp

Change-Id: I654845e54e40f5951fb78aab349ca667e9f27843
 		2016-11-01 06:02:55 +01:00
..
accessible Use QString::fromLatin1() less to avoid string allocations 2016-09-15 15:55:57 +00:00
dialogs Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
doc Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
effects Add qtwidgetsglobal.h and qtwidgetsglobal_p.h 2016-07-14 13:46:07 +00:00
graphicsview Change confusing Q_DEAD_CODE_FROM_QT4_FOO define 2016-10-14 08:19:29 +00:00
itemviews Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
kernel Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
statemachine Fix build with statemachine feature disabled 2016-10-11 06:05:09 +00:00
styles Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
util Add a resetClean() method to the undo stack 2016-10-24 13:03:40 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into 5.8 2016-11-01 06:02:55 +01:00
Qt5WidgetsConfigExtras.cmake.in
…
Qt5WidgetsMacros.cmake Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
QtWidgets.dynlist
…
configure.json Android: Re-enable asset extraction for styling 2016-10-14 08:21:12 +00:00
configure.pri Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00
widgets.pro QtWidgets: Remove Windows CE. 2016-04-07 10:24:45 +00:00