Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
dialogs	Replace win32-g++ with mingw scope	2014-01-17 12:08:24 +01:00
effects	QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-28 02:02:14 +01:00
graphicsview	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
itemviews	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
kernel	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
styles	Test password mask delay and characters on Mac.	2013-07-11 10:56:49 +02:00
util	QCompleter::setFilterMode() add property filterMode.	2013-09-20 23:45:06 +02:00
widgets	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
widgets.pro	Moved tests into integrationtests/ and widgets/	2011-10-20 19:45:41 +02:00