Liang Qi beb65dcd79 Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/gui/painting/painting.pri src/plugins/platforms/xcb/qxcbconnection.cpp tests/auto/corelib/thread/qthreadstorage/qthreadstorage.pro tests/auto/corelib/tools/qlocale/test/test.pro tests/auto/gui/kernel/qwindow/tst_qwindow.cpp tools/configure/environment.cpp Change-Id: I9c40f458b89b2c206de2d2c24e90b5f679c93495		2015-12-18 08:37:31 +01:00
..
configure_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
configure.pro	Merge remote-tracking branch 'origin/5.5' into dev	2015-06-03 10:23:56 +02:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
configureapp.h	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-14 15:45:35 +02:00
environment.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01: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
Makefile.mingw	Mingw: Build configure.exe with C++11 support	2015-11-16 19:07:51 +00:00
Makefile.win32	Remove support for MSVC earlier than 2012	2015-10-27 23:26:52 +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