AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3cb4bbfc26
qt5base-lts/examples/widgets
History
Liang Qi 7950b6b283 Merge remote-tracking branch 'origin/5.9' into dev 
Conflicts:
	src/corelib/tools/qbytearray.h
	src/corelib/tools/qdatetime.h
	src/corelib/tools/qstring.h
	src/corelib/tools/qversionnumber.h
	src/plugins/platforms/android/qandroidplatformintegration.cpp
	tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp

Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
2017-04-20 12:31:27 +02:00
..
animation examples: remove some unneeded QStringRef::toString() calls 2017-04-07 14:35:04 +00:00
desktop Merge remote-tracking branch 'origin/5.8' into dev 2017-01-25 20:06:06 +01:00
dialogs Example: migrate the classwizard example to use QRegularExpression 2017-01-24 20:28:41 +00:00
doc Doc: updated QSyntaxHighlighter documentation and use QRegularExpression 2017-04-12 22:09:43 +00:00
draganddrop Merge remote-tracking branch 'origin/5.7' into dev 2016-08-16 07:58:32 +02:00
effects Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
gestures Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
graphicsview Examples: use std::atan2 for simper angle calculations 2017-02-23 16:43:35 +00:00
itemviews Merge remote-tracking branch 'origin/5.9' into dev 2017-03-28 09:28:31 +02: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 Deprecate QSignalMapper 2017-03-14 16:33:59 +00:00
painting Merge remote-tracking branch 'origin/5.8' into 5.9 2017-02-16 21:51:11 +01:00
richtext Doc: updated QSyntaxHighlighter documentation and use QRegularExpression 2017-04-12 22:09:43 +00:00
scroller Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
statemachine Examples: Remove more redundant virtual specifiers for overriders 2016-11-29 10:06:02 +00:00
tools Merge remote-tracking branch 'origin/5.8' into 5.9 2017-03-13 15:55:44 +01:00
tutorials Tutorial: migrate addressbook tutorial to use QRegularExpression 2017-01-24 07:24:13 +00:00
widgets make TabletMove hover events conditional on QWidget::tabletTracking 2017-02-23 10:42:42 +00:00
windowcontainer Examples: Replace 'Q_DECL_OVERRIDE' by 'override' 2016-06-15 09:32:30 +00:00
widgets.pro Clean up some conditions in our pro files 2016-11-14 19:22:17 +00:00