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
..
moc	Don't use obsolete qVariantValue, qVariantCanConvert, etc.	2012-05-02 08:30:59 +02:00
qdbuscpp2xml	Bootstrap qdbuscpp2xml.	2012-03-18 14:14:42 +01:00
qdbusxml2cpp	Add unit testing for the qdbusxml2cpp tool	2012-04-21 01:18:56 +02:00
qmake	Fix some compiler warnings in tests.	2012-03-27 16:35:39 +02:00
rcc	New qHash algorithm for uchar/ushort arrays (QString, QByteArray, etc.)	2012-04-09 10:16:09 +02:00
uic	Use "qt-project.org" instead of "trolltech" in the resource system	2012-03-28 07:50:06 +02:00
tools.pro	Add unit testing for the qdbusxml2cpp tool	2012-04-21 01:18:56 +02:00