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
..
qstringbuilder1.pro	Cleanup corelib autotests	2011-11-11 02:45:05 +01:00
stringbuilder.cpp	Merge remote-tracking branch 'origin/api_changes'	2012-05-03 12:26:09 +02:00
tst_qstringbuilder1.cpp	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00