AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2204e9a7c4
qt5base-lts/config.tests/common
History
Liang Qi 511790fd1a Merge remote-tracking branch 'origin/5.7' into dev 
Conflicts:
	config_help.txt
	configure
	mkspecs/features/uikit/sdk.prf
	src/corelib/global/qhooks.cpp
	src/corelib/io/qfilesystemwatcher.cpp
	src/corelib/io/qlockfile_unix.cpp
	src/corelib/tools/qalgorithms.h
	src/gui/kernel/qwindowsysteminterface.h
	src/gui/text/qtextdocument_p.cpp
	src/network/access/access.pri
	src/network/access/qnetworkaccessmanager.cpp
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/src.pro
	src/testlib/qtestcase.cpp
	src/widgets/kernel/qwidgetbackingstore_p.h
	src/widgets/styles/qwindowscestyle.cpp
	src/widgets/styles/qwindowsmobilestyle.cpp
	tests/auto/corelib/io/qdiriterator/qdiriterator.pro
	tests/auto/corelib/io/qfileinfo/qfileinfo.pro
	tests/auto/gui/kernel/qwindow/BLACKLIST
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp
	tools/configure/configureapp.cpp

Change-Id: Ibf7fb9c8cf263a810ade82f821345d0725c57c67
2016-06-13 12:46:46 +02:00
..
atomic64 Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
atomicfptr configure: check whether std::atomic<T> works for function pointers 2016-06-09 15:58:23 +00:00
avx Updated license headers 2016-01-15 12:25:24 +00:00
avx2 Update the Intel copyright year 2016-01-21 22:44:16 +00:00
avx512 Update the Intel copyright year 2016-01-21 22:44:16 +00:00
c++1z Update the Intel copyright year 2016-01-21 22:44:16 +00:00
c++11 Merge remote-tracking branch 'origin/5.6' into dev 2016-01-21 08:17:21 +01:00
c++14 Update the Intel copyright year 2016-01-21 22:44:16 +00:00
libproxy Updated license headers 2016-01-15 12:25:24 +00:00
sse2 Updated license headers 2016-01-15 12:25:24 +00:00
sse3 Updated license headers 2016-01-15 12:25:24 +00:00
sse4_1 Updated license headers 2016-01-15 12:25:24 +00:00
sse4_2 Updated license headers 2016-01-15 12:25:24 +00:00
ssse3 Updated license headers 2016-01-15 12:25:24 +00:00
xlocalescanprint Updated license headers 2016-01-15 12:25:24 +00:00