Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62		2013-05-23 21:27:07 +02:00
..
image	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
itemmodels	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
kernel	Rename Numpad to Num, ensure Numpad is translated in all cases on Mac.	2013-05-10 09:10:45 +02:00
math3d	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
painting	Make QColor understand #AARRGGBB	2013-04-26 09:59:04 +02:00
qopengl	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
text	Make QColor understand #AARRGGBB	2013-04-26 09:59:04 +02:00
util	QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0	2013-03-27 03:54:42 +01:00
gui.pro	Move QStandardItem/QStandardItemModel to QtGui	2012-06-29 22:42:19 +02:00