AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
112342b326
qt5base-lts/tests/auto/corelib/tools/qbytearray
History
Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
2015-01-21 11:10:14 +01:00
..
.gitattributes Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
.gitignore Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
android_testdata.qrc Android: Fix QByteArray test 2015-01-06 16:44:30 +01:00
qbytearray.pro Android: Fix QByteArray test 2015-01-06 16:44:30 +01:00
rfc3252.txt Moving relevant tests to corelib/tools 2011-09-01 13:07:23 +02:00
tst_qbytearray_mac.mm Add Objective-C specific type converters to QByteArray 2014-03-08 00:21:53 +01:00
tst_qbytearray.cpp Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00