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
..
fingerpaint.pro	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
main.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mainwindow.cpp	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
mainwindow.h	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00
scribblearea.cpp	fingerpaint example: be sensitive to pressure only when supported	2014-08-18 15:38:21 +02:00
scribblearea.h	Examples: Add Q_DECL_OVERRIDE to overridden functions	2014-07-15 08:44:44 +02:00