AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
f322e2aa08
qt5base-lts/tests/auto/corelib/io/qfileinfo
History
Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
2015-08-06 10:54:01 +02:00
..
resources Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
.gitignore Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
qfileinfo.pro Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qfileinfo.qrc Moving relevant tests to corelib/io 2011-08-31 10:08:38 +02:00
testdata.qrc Use qrc for test data in QFileInfo test on all platforms 2015-02-18 12:09:16 +00:00
tst_qfileinfo.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00