Lars Knoll 1e49914fee Merge remote-tracking branch 'origin/api_changes' ... Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qlogging.cpp src/gui/kernel/qguiapplication.h src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow.h tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e		2012-05-03 12:26:09 +02:00
..
stream	QRegularExpression: QMetaType and QVariant support	2012-03-14 10:53:24 +01:00
.gitignore	Moving relevant tests to corelib/kernel	2011-09-01 12:42:14 +02:00
qvariant.pro	tst_QVariant passes on Mac OS X	2012-02-15 08:59:29 +01:00
qvariant.qrc	Cleanup mess in public type ids.	2012-01-25 21:08:08 +01:00
tst_qvariant.cpp	Merge remote-tracking branch 'origin/api_changes'	2012-05-03 12:26:09 +02:00