Frederik Gladhorn 5c23199d4e Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a		2013-08-14 09:06:31 +02:00
..
signalbug	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
test	Set the Qt API level to compatibility mode in all tests.	2012-08-01 15:37:46 +02:00
.gitignore	QObject-test: Reorganize subprocess.	2011-12-14 07:07:09 +01:00
qobject.pro	Fixed tst_qobject signalbug silently not compiled in -fast builds.	2012-02-23 09:06:44 +01:00
tst_qobject.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-08-14 09:06:31 +02:00