Liang Qi d51c3ecf8e Merge remote-tracking branch 'origin/5.8' into 5.9 ... Conflicts: examples/network/network.pro mkspecs/features/mac/default_post.prf src/corelib/io/qfilesystemengine_win.cpp src/corelib/io/qprocess.cpp src/corelib/io/qprocess.h src/corelib/io/qprocess_p.h src/corelib/io/qprocess_unix.cpp src/corelib/io/qprocess_win.cpp src/corelib/thread/qmutex.cpp src/platformsupport/fontdatabases/windows/windows.pri src/plugins/platforms/eglfs/eglfsdeviceintegration.pro tests/auto/corelib/io/io.pro Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e		2017-03-13 15:55:44 +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	Merge remote-tracking branch 'origin/5.8' into dev	2017-01-25 20:06:06 +01:00
proitems.h	qmake: introduce magic bypassNesting() scope	2016-12-13 18:56:20 +00:00
qmake_global.h	Updated license headers	2016-01-21 18:55:18 +00:00
qmakebuiltins.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-03-13 15:55:44 +01:00
qmakeevaluator.cpp	Merge remote-tracking branch 'origin/5.8' into 5.9	2017-02-08 15:49:18 +01:00
qmakeevaluator.h	qmake: Check for QT_CONFIG(process) in qmakebuiltins	2017-03-06 14:16:08 +00:00
qmakeevaluator_p.h	make QMAKE_DIR_SEP magic on writing	2016-12-20 10:16:32 +00:00
qmakeglobals.cpp	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeglobals.h	add a bunch of complementary options to -after	2017-02-06 16:34:17 +00:00
qmakeparser.cpp	qmake: introduce magic bypassNesting() scope	2016-12-13 18:56:20 +00:00
qmakeparser.h	add discard_from() function	2016-08-25 11:56:07 +00:00
qmakevfs.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-10-01 22:15:55 +02:00
qmakevfs.h	Updated license headers	2016-01-21 18:55:18 +00:00