qt6-bb10/tools/configure
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
2015-10-23 14:45:03 +02:00
..
Makefile.mingw Move the official Qt version from qglobal.h to .qmake.conf 2015-10-14 20:12:57 +00:00
Makefile.win32 msvc2015: Align compiler flags with rest of Qt build 2015-10-20 14:10:11 +00:00
configure.pro Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
configure_pch.h Update copyright headers 2015-02-11 06:49:51 +00:00
configureapp.cpp Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
configureapp.h Merge remote-tracking branch 'origin/5.6' into dev 2015-10-14 15:45:35 +02:00
environment.cpp remove $INCLUDE/$LIB hack for mingw 2015-05-12 09:10:18 +00:00
environment.h Add mingw GCC Version to qconfig.pri 2015-03-25 11:13:19 +00:00
main.cpp Update copyright headers 2015-02-11 06:49:51 +00:00
tools.cpp Run license checker in qmake 2015-05-27 10:23:10 +00:00
tools.h Update copyright headers 2015-02-11 06:49:51 +00:00