Kent Hansen 440f452aa3 Merge master into api_changes ... Conflicts: src/corelib/kernel/qmetatype.cpp src/gui/kernel/qplatformsurface_qpa.cpp tests/auto/corelib/tools/qtimeline/qtimeline.pro Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178		2012-03-16 10:01:29 +01:00
..
configure_pch.h	remove bizarre magic from precompiled header	2012-02-09 22:12:30 +01:00
configure.pro	Split up base class QFileDevice for open-file operations (read/write)	2012-03-06 12:09:57 +01:00
configureapp.cpp	Add Qt Widgets opt out support to build system	2012-03-15 11:40:50 +01:00
configureapp.h	Remove -arch argument and #define QT_ARCH from configures	2012-03-13 12:27:44 +01:00
environment.cpp	Remove -arch argument and #define QT_ARCH from configures	2012-03-13 12:27:44 +01:00
environment.h	Remove -arch argument and #define QT_ARCH from configures	2012-03-13 12:27:44 +01:00
main.cpp	Remove -arch argument and #define QT_ARCH from configures	2012-03-13 12:27:44 +01:00
Makefile.mingw	Split up base class QFileDevice for open-file operations (read/write)	2012-03-06 12:09:57 +01:00
Makefile.win32	Split up base class QFileDevice for open-file operations (read/write)	2012-03-06 12:09:57 +01:00
tools.cpp	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00
tools.h	Remove "All rights reserved" line from license headers.	2012-01-30 03:54:59 +01:00