AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2b2b9c9962
qt5base-lts/util
History
Lars Knoll 0f315adf91 Merge remote-tracking branch 'origin/5.10' into dev 
Conflicts:
	.qmake.conf
	sc/corelib/io/qfsfileengine_p.h
	src/corelib/io/qstorageinfo_unix.cpp
	src/platformsupport/eglconvenience/qeglpbuffer_p.h
	src/platformsupport/input/libinput/qlibinputkeyboard.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/plugins/platforms/cocoa/qcocoamenu.mm
	src/plugins/platforms/ios/qiosscreen.h
	src/plugins/platforms/ios/qioswindow.h
	src/plugins/platforms/ios/quiview.mm
	src/printsupport/dialogs/qpagesetupdialog_unix_p.h
	src/printsupport/dialogs/qprintpreviewdialog.cpp
	src/printsupport/widgets/qcupsjobwidget_p.h
	src/widgets/widgets/qmenu.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp

Change-Id: Iecb4883122efe97ef0ed850271e6c51bab568e9c
2018-01-02 09:58:44 +01:00
..
accessibilityinspector Updated license headers 2016-01-21 18:55:18 +00:00
aglfn Updated license headers 2016-01-21 18:55:18 +00:00
corelib/qurl-generateTLDs Updated license headers 2016-01-21 18:55:18 +00:00
edid Add We mean it warning to the EDID table 2017-09-08 07:04:30 +00:00
glgen Replace Q_DECL_FINAL with final 2017-09-22 07:30:01 +00:00
harfbuzz Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
includemocs QtCore: include mocs 2017-05-05 03:03:30 +00:00
integrity Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
lexgen Handle indirect sibling selector 2016-07-27 20:18:02 +00:00
local_database Add byte-based units to CLDR data 2017-06-13 11:28:09 +00:00
plugintest Updated license headers 2016-01-21 18:55:18 +00:00
unicode Fix a bug in the generation of the Unicode joining property data 2017-12-13 19:14:49 +00:00
xkbdatagen Updated license headers 2016-01-21 18:55:18 +00:00