AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34b14a8472
qt5base-lts/tests/auto/corelib
History
Frederik Gladhorn 34b14a8472 Merge remote-tracking branch 'origin/5.4' into 5.5 
Conflicts:
	examples/xml/htmlinfo/simpleexample.html
	examples/xml/rsslisting/rsslisting.cpp
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/3rdparty/harfbuzz-ng/src/hb-private.hh
	src/corelib/global/qlogging.cpp
	src/corelib/io/qstorageinfo_unix.cpp
	src/corelib/thread/qwaitcondition_unix.cpp
	src/gui/kernel/qguiapplication.cpp
	src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
	src/testlib/doc/src/qt-webpages.qdoc
	tests/auto/other/qaccessibility/tst_qaccessibility.cpp

Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
2015-02-24 21:02:08 +01:00
..
animation Update copyright headers 2015-02-11 06:49:51 +00:00
codecs Update copyright headers 2015-02-11 06:49:51 +00:00
global Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
io QDateTime: drop quotes in QDebug output 2015-02-21 16:58:39 +00:00
itemmodels Update copyright headers 2015-02-11 06:49:51 +00:00
json Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
kernel Fix QDebug cumulating operator<< with many Q_ENUM 2015-02-17 06:17:59 +00:00
mimetypes Update copyright headers 2015-02-11 06:49:51 +00:00
plugin Update copyright headers 2015-02-11 06:49:51 +00:00
statemachine QtCore: assorted migrations to QString::asprintf 2015-02-12 19:40:04 +00:00
thread Update copyright headers 2015-02-11 06:49:51 +00:00
tools Merge remote-tracking branch 'origin/5.4' into 5.5 2015-02-24 21:02:08 +01:00
xml Update copyright headers 2015-02-11 06:49:51 +00:00
corelib.pro iOS: Enable building of basic tests 2014-01-22 12:35:17 +01:00