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
..
doc	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
generators	qmake: Combine two variables into an array to simplify a loop.	2015-12-17 13:47:37 +00:00
library	Merge remote-tracking branch 'origin/5.6' into dev	2015-11-04 20:18:14 +01:00
cachekeys.h	Update copyright headers	2015-02-11 06:49:51 +00:00
main.cpp	fix installing unix dll symlinks on windows hosts	2015-06-01 13:26:57 +00:00
Makefile.unix	Move the official Qt version from qglobal.h to .qmake.conf	2015-10-14 20:12:57 +00:00
Makefile.win32	Merge remote-tracking branch 'origin/5.6' into dev	2015-10-23 14:45:03 +02:00
meta.cpp	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
meta.h	make .prl processing less convoluted	2015-10-02 14:01:13 +00:00
option.cpp	QMake: Add option to set qt.conf file.	2015-10-27 13:14:00 +00:00
option.h	Distinguish between Objective-C and Objective-C++ sources	2015-10-09 15:15:17 +00:00
project.cpp	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
project.h	make fileFixify() calling convention somewhat sane	2015-04-21 12:06:20 +00:00
property.cpp	Update copyright headers	2015-02-11 06:49:51 +00:00
property.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake_pch.h	Update copyright headers	2015-02-11 06:49:51 +00:00
qmake-aux.pro	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
qmake.pri	nuke gbuild generator	2015-02-02 11:14:34 +00:00
qmake.pro	bring fake qmake project up to snuff	2013-11-04 19:50:07 +01:00