AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
22c1a46a03
qt5base-lts/src/widgets
History
Liang Qi e3ed2281c0 Merge remote-tracking branch 'origin/5.11' into dev 
Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
2018-07-02 11:23:45 +02:00
..
accessible Accessible: use range-based for instead of foreach 2018-04-18 15:32:26 +00:00
dialogs Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
doc Doc: Add doc to Graphics View Flow Layout example 2018-03-13 12:07:55 +00:00
effects Merge remote-tracking branch 'origin/5.10' into dev 2017-10-24 13:40:55 +02:00
graphicsview Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
itemviews Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
kernel Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
statemachine Make sure we can build with -no-feature-draganddrop 2018-05-29 18:31:35 +00:00
styles QCommonStyle: properly elide last visible line 2018-06-25 18:58:07 +00:00
util Merge remote-tracking branch 'origin/5.11' into dev 2018-06-07 19:10:53 +02:00
widgets Merge remote-tracking branch 'origin/5.11' into dev 2018-07-02 11:23:45 +02:00
configure.json Merge remote-tracking branch 'origin/5.9' into 5.10 2017-10-04 13:41:04 +02:00
configure.pri Modularize configure.json/.pri 2016-09-15 08:23:53 +00:00
Qt5WidgetsConfigExtras.cmake.in CMake: Include the definition of the Qt5::AccessibleFactory target. 2014-04-16 15:21:50 +02:00
Qt5WidgetsMacros.cmake CMake: Set SKIP_AUTOMOC/AUTOUIC where needed 2017-11-22 13:51:30 +00:00
QtWidgets.dynlist Update dynlist file for QtWidgets 2013-03-18 17:11:03 +01:00
qtwidgets.tracepoints Tracepoints: add tracing for QEvents 2018-06-28 20:40:33 +00:00
widgets.pro Tracepoints: add tracing for QEvents 2018-06-28 20:40:33 +00:00