Liang Qi 90c425642d Merge remote-tracking branch 'origin/5.7' into 5.8 ... Conflicts: mkspecs/common/linux-android.conf src/gui/opengl/qopengl.h src/network/socket/qnativesocketengine_winrt.cpp src/network/socket/qnativesocketengine_winrt_p.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/api/qeglfsintegration.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp sync.profile Change-Id: If70aaf2c49df91157b864cf0d7d9513546c9bec4		2016-11-16 12:35:36 +01:00
..
doc	qmake: add "undecorated" mode to $$prompt()	2016-11-15 22:44:18 +00:00
generators	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
library	Merge remote-tracking branch 'origin/5.7' into 5.8	2016-11-16 12:35:36 +01:00
Makefile.unix	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
Makefile.win32	build qmake.exe directly in bin/	2016-11-15 22:44:31 +00:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	moc: get the system #defines from the compiler itself	2016-07-20 02:54:03 +00:00
meta.cpp	qmake: eradicate Q_FOREACH loops [needing qAsConst()]	2016-01-28 20:25:18 +00:00
meta.h	Updated license headers	2016-01-21 18:55:18 +00:00
option.cpp	ensure that QMAKE_QMAKE always ends in .exe on windows	2016-11-15 22:43:56 +00:00
option.h	bump qmake version	2016-11-15 22:43:51 +00:00
project.cpp	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
project.h	Merge remote-tracking branch 'origin/5.7' into dev	2016-07-19 20:14:40 +02:00
property.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-11-15 09:58:16 +01:00
property.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake-aux.pro	configure: Separate host and build platform.	2015-10-30 13:14:51 +00:00
qmake.pri	Clean up building of bootstrap lib and tools	2016-10-11 06:04:54 +00:00
qmake.pro	qmake/tools: port the last remaining Q_FOREACH loops and add QT_NO_FOREACH	2016-05-11 16:55:32 +00:00
qmake_pch.h	Updated license headers	2016-01-21 18:55:18 +00:00