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
..
animation	Don't use obsolete qVariantValue, qVariantCanConvert, etc.	2012-05-02 08:30:59 +02:00
codecs	Wrap all Latin 1 strings with QString::fromLatin1 or QLatin1Strings	2012-04-27 22:52:01 +02:00
global	Allow qDebug output to be configured by qSetMessagePattern()	2012-04-24 17:12:46 +02:00
io	Merge remote-tracking branch 'origin/api_changes'	2012-05-03 12:26:09 +02:00
itemmodels	Don't use obsolete qVariantValue, qVariantCanConvert, etc.	2012-05-02 08:30:59 +02:00
json	Don't crash when comparing values containing empty arrays/objects	2012-04-11 16:09:06 +02:00
kernel	Merge remote-tracking branch 'origin/api_changes'	2012-05-03 12:26:09 +02:00
mimetypes	Make comment() work in the C locale too.	2012-03-22 13:29:50 +01:00
plugin	Remove insignification from QPluginLoader and QFactoryLoader tests.	2012-04-17 16:28:46 +02:00
statemachine	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
thread	Add a remainingTime() method to the public interface of the QTimer class	2012-04-03 15:10:05 +02:00
tools	Merge remote-tracking branch 'origin/api_changes'	2012-05-03 12:26:09 +02:00
xml	Convert these files to ASCII or UTF-8	2012-04-27 22:52:01 +02:00
corelib.pro	Import QMimeType / QMimeDatabase into QtCore.	2012-02-18 22:19:43 +01:00