qt5base-lts/tools/configure
Sergio Ahumada 3ef6cf060e Merge branch 'stable' into dev
Conflicts:
	qmake/generators/mac/pbuilder_pbx.cpp
	src/corelib/json/qjsonwriter.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm

Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
2013-07-11 16:42:01 +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 branch 'stable' into dev 2013-07-11 16:42:01 +02:00
configureapp.h complain about bad arguments to -make/-nomake 2013-06-19 20:01:45 +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 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