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
..
ioutils.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
ioutils.h	Updated license headers	2016-01-21 18:55:18 +00:00
proitems.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
proitems.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeevaluator_p.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.6' into dev	2016-01-26 16:27:28 +01:00
qmakeevaluator.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeglobals.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeglobals.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeparser.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmakeparser.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakevfs.cpp	Updated license headers	2016-01-21 18:55:18 +00:00
qmakevfs.h	Updated license headers	2016-01-21 18:55:18 +00:00