AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
72f5867f14
qt5base-lts/tests/auto/corelib/global
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
..
q_func_info Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qflags Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qgetputenv Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qglobal Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qglobalstatic Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qhooks Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qlogging Merge remote-tracking branch 'origin/5.6' into dev 2015-12-02 23:33:06 +01:00
qnumeric Add {add,sub,mul}_overflow for signed integers. 2015-11-20 11:08:05 +00:00
qrand Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
qtendian Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
global.pro Add a more reliable replacement for qt_add/removeObject(). 2014-04-15 17:50:20 +02:00