Liang Qi a15c3d086d Merge remote-tracking branch 'origin/5.6' into dev ... Conflicts: src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/dbus/qdbusconnection_p.h src/dbus/qdbusintegrator.cpp src/dbus/qdbusintegrator_p.h tests/auto/corelib/io/qdir/qdir.pro tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp Change-Id: I3d3fd07aed015c74b1f545f1327aa73d5f365fcc		2016-01-26 16:27:28 +01:00
..
doc	Merge remote-tracking branch 'origin/5.6' into dev	2015-12-18 08:37:31 +01:00
generators	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
library	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
cachekeys.h	Updated license headers	2016-01-21 18:55:18 +00:00
main.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01: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	Updated license headers	2016-01-21 18:55:18 +00:00
meta.h	Updated license headers	2016-01-21 18:55:18 +00:00
option.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
option.h	Updated license headers	2016-01-21 18:55:18 +00:00
project.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
project.h	Updated license headers	2016-01-21 18:55:18 +00:00
property.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
property.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake_pch.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	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