AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
d1fabb49a3
qt5base-lts/examples/widgets
History
Frederik Gladhorn c5a3e5edd9 Merge remote-tracking branch 'origin/5.3' into 5.4 
The isAlwaysAskOption was removed in 3862171315
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qcollator_macx.cpp
	src/corelib/tools/qstring.cpp
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow_p.h
	src/gui/text/qtextengine.cpp
	src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp
	src/plugins/platforms/xcb/qglxintegration.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	src/testlib/qtestlog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	src/widgets/kernel/qwindowcontainer.cpp
	tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
	tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp

Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
2014-09-23 11:23:36 +02:00
..
animation Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
desktop Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
dialogs Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
doc Merge remote-tracking branch 'origin/stable' into 5.3 2014-06-14 18:11:52 +02:00
draganddrop Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
effects Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
gestures Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
graphicsview Make QOpenGLWidget public 2014-08-01 17:13:59 +02:00
itemviews Add the StorageView example 2014-08-14 08:20:45 +02:00
layouts Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
mac fix qmaccocoaviewcontainer example 2014-06-05 17:11:58 +02:00
mainwindows Fix cancel operation for example "Application" 2014-09-17 12:03:14 +02:00
painting Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-23 11:23:36 +02:00
richtext Changed font-family to Times New Roman 2014-09-19 07:48:28 +02:00
scroller Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
statemachine Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
tools Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
tutorials Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
windowcontainer Examples: Add Q_DECL_OVERRIDE to overridden functions 2014-07-15 08:44:44 +02:00
widgets.pro purge vestiges of opengl es 1 support 2014-04-04 19:32:21 +02:00