Frederik Gladhorn d3a8bc803c Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/io/qdatastream.cpp src/corelib/io/qdatastream.h src/corelib/json/qjsonwriter.cpp src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbkeyboard.cpp Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62		2013-05-23 21:27:07 +02:00
..
configure_pch.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
configure.pro	Improve path search in configure.	2012-11-05 17:17:01 +01:00
configureapp.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-05-23 21:27:07 +02:00
configureapp.h	reality adjustment: rename generateSystemVars() => prepareConfigTests()	2013-05-22 21:17:59 +02:00
environment.cpp	Fix incorrect compiler-from-mkspec selection in configure	2013-04-15 13:17:26 +02:00
environment.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
main.cpp	move detectArch() call right after autoDetection()	2013-05-22 21:18:02 +02:00
Makefile.mingw	Improve path search in configure.	2012-11-05 17:17:01 +01:00
Makefile.win32	Improve path search in configure.	2012-11-05 17:17:01 +01:00
tools.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
tools.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00