AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2cf63c71eb
qt5base-lts/tests/auto/corelib
History
Liang Qi 56d6e000f7 Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	mkspecs/wince80colibri-armv7-msvc2012/qmake.conf
	qmake/generators/win32/msvc_vcproj.cpp
	src/corelib/global/qnamespace.h
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qfsfileengine_win.cpp
	src/corelib/tools/tools.pri
	src/network/ssl/qsslconfiguration_p.h
	src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
	src/plugins/platforms/windows/windows.pri
	src/src.pro
	src/tools/bootstrap/bootstrap.pro
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/dialogs/qfilesystemmodel.cpp
	tests/auto/testlib/selftests/expected_cmptest.teamcity
	tests/auto/testlib/selftests/expected_cmptest.txt

Change-Id: I4d2ac78f0dcc97f008186bbbc769c6fe588ab0e5
2016-05-23 21:09:46 +02:00
..
animation QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
codecs QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
global Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
io Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
itemmodels QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
json QJsonObject: add some overloads taking QLatin1String 2016-05-10 21:18:46 +00:00
kernel Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
mimetypes Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-27 09:18:05 +02:00
plugin QtCore: Remove Windows CE. 2016-03-30 11:22:47 +00:00
statemachine Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
thread Merge remote-tracking branch 'origin/5.7' into dev 2016-04-05 14:22:45 +02:00
tools Merge remote-tracking branch 'origin/5.7' into dev 2016-05-23 21:09:46 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-03-21 09:02:57 +01:00
corelib.pro Add support for Apple tvOS 2016-05-17 16:11:23 +00:00