Liang Qi cbe332405a Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: configure mkspecs/macx-ios-clang/features/default_pre.prf mkspecs/macx-ios-clang/features/sdk.prf mkspecs/unsupported/freebsd-g++46/qplatformdefs.h src/widgets/styles/qgtkstyle.cpp tests/auto/corelib/io/qdiriterator/qdiriterator.pro tests/auto/corelib/io/qfileinfo/qfileinfo.pro Change-Id: Ia943555d1e59234a66f7dc65bdfda838e40001b5		2016-06-10 23:27:10 +02:00
..
.gitignore
qdbusconnection.pro	Merge remote-tracking branch 'origin/5.6' into dev	2015-09-25 14:02:04 +02:00
tst_qdbusconnection.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-06-10 23:27:10 +02:00
tst_qdbusconnection.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-05-19 12:55:27 +02:00