whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/plugin
History
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
..
qfactoryloader Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
qlibrary Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
qplugin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
qpluginloader Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
quuid Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
plugin.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00