Oswald Buddenhagen 143c4d3e13 Merge remote-tracking branch 'origin/master' into api_changes ... Conflicts: configure src/widgets/styles/qwindowsxpstyle.cpp tests/auto/gui/kernel/qwindow/qwindow.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I624b6d26abce9874c610c04954c1c45bc074bef3		2012-04-10 15:31:45 +02:00
..
configure_pch.h	QHash security fix (1/2): add global QHash seed	2012-04-03 19:12:13 +02:00
configure.pro	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
configureapp.cpp	Merge remote-tracking branch 'origin/master' into api_changes	2012-04-10 15:31:45 +02:00
configureapp.h	Sync configure with Unix version (-make/-nomake)	2012-03-27 03:36:30 +02: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	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02:00
Makefile.win32	Remove -DQT_NO_STL from the bootstrapped builds	2012-04-07 05:19:56 +02: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