AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72f5867f14
qt5base-lts/tests/auto/widgets/kernel
History
Liang Qi 72f5867f14 Merge remote-tracking branch 'origin/5.6' into dev 
Conflicts:
	src/corelib/kernel/qcoreapplication.cpp
	src/corelib/kernel/qeventdispatcher_blackberry.cpp
	src/network/bearer/qnetworkconfiguration.cpp
	src/plugins/bearer/blackberry/qbbengine.cpp
	src/plugins/platforms/android/androidjnimain.cpp
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/plugins/platforms/qnx/qqnxbpseventfilter.cpp
	src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
	src/plugins/platforms/qnx/qqnxinputcontext_imf.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxnavigatorbps.cpp
	src/plugins/platforms/qnx/qqnxvirtualkeyboardbps.cpp
	src/plugins/platforms/qnx/qqnxwindow.cpp
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qwindowsvistastyle.cpp
	src/widgets/styles/qwindowsxpstyle.cpp
	src/widgets/widgets/qtoolbararealayout.cpp
	tests/auto/corelib/global/qflags/qflags.pro
	tests/auto/corelib/itemmodels/qitemmodel/modelstotest.cpp
	tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
	tests/auto/widgets/dialogs/qfilesystemmodel/tst_qfilesystemmodel.cpp

Change-Id: I37be88c6c185bb85404823353e027a0a6acdbce4
2015-12-02 23:33:06 +01:00
..
qaction tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qactiongroup Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qapplication tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qboxlayout Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qdesktopwidget Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qformlayout tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qgridlayout tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qlayout Tests: Fix single-character string literals. 2015-10-13 18:14:27 +00:00
qshortcut tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qsizepolicy Add check for top level widget leaks in kernel test of QtWidgets. 2015-06-16 14:14:18 +00:00
qstackedlayout Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtooltip Merge remote-tracking branch 'origin/5.5' into dev 2015-07-01 11:05:26 +02:00
qwidget Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qwidget_window Merge remote-tracking branch 'origin/5.6' into dev 2015-10-14 15:45:35 +02:00
qwidgetaction Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qwidgetmetatype Update copyright headers 2015-02-11 06:49:51 +00:00
qwidgetsvariant Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qwindowcontainer Merge remote-tracking branch 'origin/5.6' into dev 2015-09-25 14:02:04 +02:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00