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
..
image	QPixelFormat: don't inherit it	2014-08-09 09:05:24 +02:00
itemmodels	tests: Remove superfluous gui additions to QT	2014-02-28 17:59:29 +01:00
kernel	Add an option to share between TLWs	2014-09-10 13:36:27 +02:00
math3d	Add viewport transform to QMatrix4x4	2014-05-16 09:53:58 +02:00
painting	Fix default implementations of raster ops	2014-09-20 10:54:02 +02:00
qopengl	Add support for glMapBufferRange in the wrappers and resolvers	2014-08-08 07:29:53 +02:00
text	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-09-23 11:23:36 +02:00
util	Bugfix QDesktopServices on Windows	2013-07-11 10:56:49 +02:00
gui.pro	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00