whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/widgets/qcombobox
History
Frederik Gladhorn 77da617dc8 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	doc/global/qt-cpp-defines.qdocconf
	src/3rdparty/forkfd/forkfd.c
	src/corelib/codecs/qtextcodec.cpp
	src/corelib/kernel/qmetatype.cpp
	src/corelib/tools/qset.qdoc
	src/gui/accessible/qaccessible.cpp
	src/gui/image/qpixmapcache.cpp
	src/opengl/qgl.cpp
	src/tools/qdoc/generator.cpp
	src/widgets/kernel/qwidget.cpp
	tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp

Change-Id: I4fbe1fa756a54c6843aa75f4ef70a1069ba7b085
 		2015-08-06 10:54:01 +02:00
..
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
BLACKLIST Tests: Blacklist task260974_menuItemRectangleForComboBoxPopup 2015-04-24 13:43:06 +00:00
qcombobox.pro Set the Qt API level to compatibility mode in all tests. 2012-08-01 15:37:46 +02:00
qtlogo.png Fix QComboBox icon testing 2012-10-16 10:47:41 +02:00
qtlogoinverted.png Fix QComboBox icon testing 2012-10-16 10:47:41 +02:00
tst_qcombobox.cpp Merge remote-tracking branch 'origin/5.5' into dev 2015-08-06 10:54:01 +02:00