Frederik Gladhorn c8ca300e49 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a		2013-08-21 11:03:18 +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-08-21 11:03:18 +02:00
configureapp.h	Integrate device-option into the windows configure	2013-08-15 18:02:42 +02:00
environment.cpp	add support for Visual Studio 2013	2013-07-04 12:54:58 +02:00
environment.h	add support for Visual Studio 2013	2013-07-04 12:54:58 +02:00
main.cpp	Integrate device-option into the windows configure	2013-08-15 18:02:42 +02:00
Makefile.mingw	Don't compile qcryptographichash into configure.exe	2013-08-15 01:30:54 +02:00
Makefile.win32	Don't compile qcryptographichash into configure.exe	2013-08-15 01:30:54 +02: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