AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c4e472ea10
qt5base-lts/tests/auto/widgets/kernel
History
Liang Qi 57057f76ad Merge remote-tracking branch 'origin/5.6' into 5.7 
Conflicts:
	.qmake.conf
	config.tests/unix/nis/nis.cpp
	mkspecs/unsupported/freebsd-g++/qplatformdefs.h
	src/corelib/tools/qdatetime.cpp
	src/corelib/tools/qsimd.cpp
	src/corelib/tools/qsimd_p.h
	src/network/access/access.pri
	src/network/access/qnetworkreplynsurlconnectionimpl.mm
	src/network/access/qnetworkreplynsurlconnectionimpl_p.h
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/printsupport/windows/qwindowsprintdevice.cpp
	tests/auto/corelib/kernel/qobject/tst_qobject.cpp
	tests/auto/network/access/qnetworkreply/BLACKLIST
	tests/auto/widgets/widgets/qopenglwidget/BLACKLIST

Change-Id: I4b32055bbf922392ef0264fd403405416fffee57
2016-06-06 09:04:55 +02:00
..
qaction Updated license headers 2016-01-21 18:55:18 +00:00
qactiongroup Updated license headers 2016-01-21 18:55:18 +00:00
qapplication Updated license headers 2016-01-21 18:55:18 +00:00
qboxlayout Updated license headers 2016-01-21 18:55:18 +00:00
qdesktopwidget Updated license headers 2016-01-21 18:55:18 +00:00
qformlayout Updated license headers 2016-01-21 18:55:18 +00:00
qgridlayout Updated license headers 2016-01-21 18:55:18 +00:00
qlayout Remove the traces of the discontinued android-no-sdk platform 2016-03-30 10:12:34 +00:00
qshortcut Merge "Merge remote-tracking branch 'origin/5.6' into dev" into refs/staging/dev 2016-01-26 11:27:37 +00:00
qsizepolicy Updated license headers 2016-01-21 18:55:18 +00:00
qstackedlayout Updated license headers 2016-01-21 18:55:18 +00:00
qtooltip Updated license headers 2016-01-21 18:55:18 +00:00
qwidget Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qwidget_window Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-06 09:04:55 +02:00
qwidgetaction Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetmetatype Updated license headers 2016-01-21 18:55:18 +00:00
qwidgetsvariant Updated license headers 2016-01-21 18:55:18 +00:00
qwindowcontainer Merge remote-tracking branch 'origin/5.6' into dev 2016-02-02 15:57:44 +01:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00