Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev ... For the conflicts in msvc_nmake.cpp the ifdefs are extended since we need to support windows phone in the target branch while it is not there in the current stable branch (as of Qt 5.2). Conflicts: configure qmake/generators/win32/msvc_nmake.cpp src/3rdparty/angle/src/libEGL/Surface.cpp src/angle/src/common/common.pri src/corelib/global/qglobal.h src/corelib/io/qstandardpaths.cpp src/plugins/platforms/qnx/qqnxintegration.cpp src/plugins/platforms/qnx/qqnxscreeneventhandler.h src/plugins/platforms/xcb/qglxintegration.h src/widgets/kernel/win.pri tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp tools/configure/configureapp.cpp Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812		2013-11-26 22:35:48 +01:00
..
data	Account for QPolygonF type when loading/saving the QVariant	2013-10-15 08:14:48 +02:00
stream	Split the QGuiVariant test from the Core one.	2012-07-25 00:48:33 +02:00
black2.png	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00
black.png	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00
qguivariant.qrc	Account for QPolygonF type when loading/saving the QVariant	2013-10-15 08:14:48 +02:00
test.pro	Merge remote-tracking branch 'origin/stable' into dev	2013-10-24 12:48:42 +02:00
tst_qguivariant.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-11-26 22:35:48 +01:00
tst_qguivariant.qrc	Compare QIcon QVariants by their cache key	2013-10-09 13:15:54 +02:00