whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/dialogs
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
..
qcolordialog Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qdialog Merge remote-tracking branch 'origin/5.6' into dev 2015-11-04 20:18:14 +01:00
qerrormessage Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qfiledialog Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qfiledialog2 tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qfilesystemmodel Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qfontdialog Merge remote-tracking branch 'origin/5.6' into dev 2015-11-18 09:01:51 +01:00
qinputdialog tests/auto/widgets: Remove some placeholder formatting. 2015-10-19 12:39:16 +00:00
qmessagebox Merge remote-tracking branch 'origin/5.6' into dev 2015-11-18 09:01:51 +01:00
qprogressdialog Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qsidebar Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qwizard Remove remaining support for Blackberry 2015-11-21 15:38:39 +00:00
dialogs.pro Replace win32-g++ with mingw scope 2014-01-17 12:08:24 +01:00