AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
0f315adf91
qt5base-lts/examples/widgets
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
..
animation Doc: complete Easing Curve Example 2017-12-18 14:07:51 +00:00
desktop Use dependencies instead of CONFIG+=ordered 2017-12-02 11:09:15 +00:00
dialogs Doc: remove Config Dialog Example 2017-12-27 14:41:18 +00:00
doc Merge remote-tracking branch 'origin/5.10' into dev 2018-01-02 09:58:44 +01:00
draganddrop Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
effects Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
itemviews Change almost all other uses of qrand() to QRandomGenerator 2017-11-08 09:14:03 +00:00
layouts Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
mac macOS: Make QMacNativeWidget example more usable 2017-02-12 12:29:55 +00:00
mainwindows Make the Main Window example use high-DPI toolbar icons 2017-12-19 17:57:08 +00:00
painting Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
richtext Convert features.printdialog to QT_[REQUIRE_]CONFIG 2017-05-30 17:21:26 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
tools Merge remote-tracking branch 'origin/5.10' into dev 2017-11-23 09:36:03 +01:00
tutorials Doc: move notepad example to qtbase and improve it 2017-12-18 13:39:28 +00:00
widgets Update usage of QFontMetrics::width() to new API 2017-12-08 15:06:32 +00:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro examples: fix compile without gui module 2017-05-05 06:54:15 +00:00