AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75c0ffaf6d
qt5base-lts/examples/widgets
History
Qt Forward Merge Bot 75c0ffaf6d Merge remote-tracking branch 'origin/5.15' into dev 
Conflicts:
	examples/network/bearermonitor/CMakeLists.txt
	examples/network/CMakeLists.txt
	src/corelib/tools/qlinkedlist.h
	src/sql/kernel/qsqldriver_p.h
	src/sql/kernel/qsqlresult_p.h
	src/widgets/kernel/qwidget.cpp
	src/widgets/kernel/qwidget_p.h
	tests/auto/network/socket/platformsocketengine/tst_platformsocketengine.cpp
	tests/auto/network/socket/qtcpsocket/tst_qtcpsocket.cpp
	tests/auto/tools/moc/allmocs_baseline_in.json

Change-Id: I21a3c34570ae79ea9d30107fae71759d7eac17d9
2020-02-26 18:39:21 +01:00
..
animation Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" 2020-02-11 10:19:42 +01:00
desktop QComboBox: remove currentIndexChanged(const QString&) 2020-02-19 11:32:40 +00:00
dialogs Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
doc Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
draganddrop Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
effects Regenerate examples 2020-02-04 18:50:39 +00:00
gallery Add a widget gallery example 2020-01-09 13:52:25 +01:00
gestures Regenerate examples 2020-02-04 18:50:39 +00:00
graphicsview Move QOpenGLWidget from QtOpenGL to its own module 2020-02-18 09:22:51 +01:00
itemviews QComboBox: remove currentIndexChanged(const QString&) 2020-02-19 11:32:40 +00:00
layouts QComboBox: remove currentIndexChanged(const QString&) 2020-02-19 11:32:40 +00:00
mac Regenerate examples 2020-02-04 18:50:39 +00:00
mainwindows Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
painting Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev" 2020-02-11 10:19:42 +01:00
qnx/foreignwindows Basic foreign window support for QNX 2019-05-01 13:49:18 +00:00
richtext Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
scroller Regenerate examples 2020-02-04 18:50:39 +00:00
statemachine Regenerate examples 2020-02-04 18:50:39 +00:00
tools QComboBox: remove currentIndexChanged(const QString&) 2020-02-19 11:32:40 +00:00
touch Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
tutorials Merge remote-tracking branch 'origin/5.15' into dev 2020-02-13 18:31:40 +01:00
widgets Merge remote-tracking branch 'origin/5.15' into dev 2020-02-26 18:39:21 +01:00
windowcontainer Post-merge fixes 2020-01-30 20:45:08 +00:00
CMakeLists.txt CMake: Add widgets examples 2019-03-26 15:25:39 +00:00
widgets.pro Add a widget gallery example 2020-01-09 13:52:25 +01:00