summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Rødal <samuel.rodal@nokia.com>2011-05-20 19:45:38 +0200
committerSamuel Rødal <samuel.rodal@nokia.com>2011-05-20 19:46:19 +0200
commitd671acd5b296b83440db9836a92189c501c87ff3 (patch)
treebd9c1a000e17c70124c207666cfb3276b5518ffd
parent42f5786104f9eef9542df2c7469a03324978281d (diff)
parent4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff)
Merge remote branch 'staging/master' into refactor
Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/glxconvenience/qglxconvenience.cpp src/plugins/platforms/platforms.pro src/plugins/platforms/wayland/qwaylandwindow.cpp src/plugins/platforms/xcb/qxcbwindow.cpp src/plugins/platforms/xcb/qxcbwindow.h src/plugins/platforms/xcb/qxcbwindowsurface.cpp src/widgets/kernel/qwidget_qpa.cpp tests/auto/qvariant/tst_qvariant.cpp
-rwxr-xr-xconfigure27
-rw-r--r--configure.exebin1471488 -> 1469440 bytes
-rw-r--r--doc/src/snippets/qstring/stringbuilder.cpp7
-rw-r--r--mkspecs/features/testcase.prf4
-rw-r--r--src/corelib/tools/qbytearray.h13
-rw-r--r--src/corelib/tools/qstring.cpp10
-rw-r--r--src/corelib/tools/qstring.h8
-rw-r--r--src/corelib/tools/qstringbuilder.h4
-rw-r--r--src/gui/painting/qcolor.cpp3
-rw-r--r--src/gui/painting/qdrawhelper_neon.cpp2
-rw-r--r--src/gui/painting/qpaintengine_raster.cpp12
-rw-r--r--src/gui/painting/qpaintengineex.cpp35
-rw-r--r--src/gui/painting/qpaintengineex_p.h2
-rw-r--r--src/gui/text/qfontengine_ft.cpp2
-rw-r--r--src/network/kernel/qhostaddress.cpp31
-rw-r--r--src/network/kernel/qnetworkinterface_unix.cpp2
-rw-r--r--src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp33
-rw-r--r--src/opengl/qgl_qpa.cpp18
-rw-r--r--src/opengl/qglshaderprogram.cpp6
-rw-r--r--src/opengl/qwindowsurface_gl.cpp21
-rw-r--r--src/plugins/codecs/jp/qsjiscodec.cpp4
-rw-r--r--src/plugins/platforms/glxconvenience/glxconvenience.pri8
-rw-r--r--src/plugins/platforms/glxconvenience/qglxconvenience.cpp29
-rw-r--r--src/plugins/platforms/minimal/qminimalintegration.cpp4
-rw-r--r--src/plugins/platforms/minimal/qminimalintegration.h2
-rw-r--r--src/plugins/platforms/platforms.pro5
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp4
-rw-r--r--src/plugins/platforms/wayland/qwaylandclipboard.cpp2
-rw-r--r--src/plugins/platforms/wayland/qwaylanddisplay.cpp15
-rw-r--r--src/plugins/platforms/wayland/qwaylanddisplay.h11
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp11
-rw-r--r--src/plugins/platforms/wayland/wayland.pro2
-rw-r--r--src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h82
-rw-r--r--src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp85
-rw-r--r--src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h69
-rw-r--r--src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c36
-rw-r--r--src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri16
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.cpp11
-rw-r--r--src/plugins/platforms/xcb/qxcbwindow.h6
-rw-r--r--src/plugins/platforms/xcb/qxcbwindowsurface.cpp22
-rw-r--r--src/plugins/platforms/xlib/qxlibintegration.cpp2
-rw-r--r--src/plugins/platforms/xlib/qxlibscreen.cpp6
-rw-r--r--src/plugins/platforms/xlib/qxlibstatic.cpp4
-rw-r--r--src/plugins/platforms/xlib/qxlibstatic.h1
-rw-r--r--src/plugins/platforms/xlib/qxlibwindow.cpp38
-rw-r--r--src/plugins/platforms/xlib/qxlibwindow.h8
-rw-r--r--src/plugins/platforms/xlib/qxlibwindowsurface.cpp27
-rw-r--r--src/qbase.pri2
-rw-r--r--src/uitools/quiloader.cpp15
-rw-r--r--src/uitools/quiloader.h2
-rw-r--r--src/widgets/kernel/qwidget_qpa.cpp7
-rw-r--r--src/widgets/platforms/x11/qapplication_x11.cpp4
-rw-r--r--tests/arthur/common/common.pro2
-rw-r--r--tests/arthur/common/paintcommands.cpp148
-rw-r--r--tests/arthur/common/paintcommands.h8
-rw-r--r--tests/arthur/data/qps/sizes.qps60
-rw-r--r--tests/arthur/datagenerator/datagenerator.pro3
-rw-r--r--tests/arthur/htmlgenerator/htmlgenerator.pro3
-rw-r--r--tests/arthur/lance/lance.pro3
-rw-r--r--tests/arthur/lance/main.cpp8
-rw-r--r--tests/arthur/performancediff/performancediff.pro3
-rw-r--r--tests/arthur/shower/shower.pro3
-rw-r--r--tests/auto/collections/tst_collections.cpp58
-rw-r--r--tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp122
-rw-r--r--tests/auto/gestures/tst_gestures.cpp20
-rw-r--r--tests/auto/lancelot/scripts/sizes.qps60
-rw-r--r--tests/auto/maketestselftest/tst_maketestselftest.cpp1
-rw-r--r--tests/auto/moc/no-keywords.h3
-rw-r--r--tests/auto/modeltest/dynamictreemodel.cpp10
-rw-r--r--tests/auto/modeltest/modeltest.cpp144
-rw-r--r--tests/auto/modeltest/tst_modeltest.cpp52
-rw-r--r--tests/auto/other.pro8
-rw-r--r--tests/auto/platformsocketengine/platformsocketengine.pro2
-rw-r--r--tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp57
-rw-r--r--tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp2
-rw-r--r--tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp2
-rw-r--r--tests/auto/qaccessibility/qaccessibility.pro1
-rw-r--r--tests/auto/qaccessibility/tst_qaccessibility.cpp1289
-rw-r--r--tests/auto/qalgorithms/q3tl.h212
-rw-r--r--tests/auto/qalgorithms/tst_qalgorithms.cpp181
-rw-r--r--tests/auto/qapplication/modal/main.cpp1
-rw-r--r--tests/auto/qatomicint/tst_qatomicint.cpp3
-rw-r--r--tests/auto/qatomicpointer/tst_qatomicpointer.cpp3
-rw-r--r--tests/auto/qauthenticator/qauthenticator.pro2
-rw-r--r--tests/auto/qbuffer/tst_qbuffer.cpp3
-rw-r--r--tests/auto/qchar/tst_qchar.cpp4
-rw-r--r--tests/auto/qcolor/tst_qcolor.cpp2
-rw-r--r--tests/auto/qcolumnview/qcolumnview.pro1
-rw-r--r--tests/auto/qcombobox/qcombobox.pro1
-rw-r--r--tests/auto/qcombobox/tst_qcombobox.cpp24
-rw-r--r--tests/auto/qcompleter/tst_qcompleter.cpp16
-rw-r--r--tests/auto/qcopchannel/testSend/main.cpp6
-rw-r--r--tests/auto/qcssparser/qcssparser.pro2
-rw-r--r--tests/auto/qcssparser/tst_qcssparser.cpp2
-rw-r--r--tests/auto/qdatastream/gearflowers.svg8342
-rw-r--r--tests/auto/qdatastream/qdatastream.pro15
-rw-r--r--tests/auto/qdatastream/tests2.svg12
-rw-r--r--tests/auto/qdatastream/tst_qdatastream.cpp1384
-rw-r--r--tests/auto/qdatetimeedit/tst_qdatetimeedit.cpp13
-rw-r--r--tests/auto/qdbusmarshall/test/test.pro2
-rw-r--r--tests/auto/qdbusthreading/tst_qdbusthreading.cpp2
-rw-r--r--tests/auto/qdbustype/tst_qdbustype.cpp8
-rw-r--r--tests/auto/qdir/tst_qdir.cpp66
-rw-r--r--tests/auto/qdirmodel/tst_qdirmodel.cpp6
-rw-r--r--tests/auto/qdom/tst_qdom.cpp18
-rw-r--r--tests/auto/qfile/largefile/tst_largefile.cpp8
-rw-r--r--tests/auto/qfile/tst_qfile.cpp2
-rw-r--r--tests/auto/qfiledialog/qfiledialog.pro1
-rw-r--r--tests/auto/qfiledialog2/tst_qfiledialog2.cpp2
-rw-r--r--tests/auto/qfileinfo/qfileinfo.pro2
-rw-r--r--tests/auto/qfileinfo/tst_qfileinfo.cpp7
-rw-r--r--tests/auto/qfilesystemmodel/qfilesystemmodel.pro2
-rw-r--r--tests/auto/qfocusevent/tst_qfocusevent.cpp33
-rw-r--r--tests/auto/qfuture/tst_qfuture.cpp1
-rw-r--r--tests/auto/qgl/qgl.pro2
-rw-r--r--tests/auto/qgraphicsanchorlayout/qgraphicsanchorlayout.pro1
-rw-r--r--tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp44
-rw-r--r--tests/auto/qgraphicsanchorlayout1/qgraphicsanchorlayout1.pro1
-rw-r--r--tests/auto/qgraphicsanchorlayout1/tst_qgraphicsanchorlayout1.cpp22
-rw-r--r--tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp33
-rw-r--r--tests/auto/qgraphicsitem/qgraphicsitem.pro1
-rw-r--r--tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp5
-rw-r--r--tests/auto/qgraphicslayout/tst_qgraphicslayout.cpp8
-rw-r--r--tests/auto/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp3
-rw-r--r--tests/auto/qgraphicsobject/tst_qgraphicsobject.cpp1
-rw-r--r--tests/auto/qgraphicsscene/qgraphicsscene.pro1
-rw-r--r--tests/auto/qgraphicsscene/tst_qgraphicsscene.cpp2
-rw-r--r--tests/auto/qgraphicssceneindex/qgraphicssceneindex.pro1
-rw-r--r--tests/auto/qgraphicssceneindex/tst_qgraphicssceneindex.cpp4
-rw-r--r--tests/auto/qgraphicsview/tst_qgraphicsview.cpp8
-rw-r--r--tests/auto/qheaderview/tst_qheaderview.cpp2
-rw-r--r--tests/auto/qhostaddress/tst_qhostaddress.cpp40
-rw-r--r--tests/auto/qhostinfo/qhostinfo.pro2
-rw-r--r--tests/auto/qhostinfo/tst_qhostinfo.cpp14
-rw-r--r--tests/auto/qhttp/tst_qhttp.cpp1
-rw-r--r--tests/auto/qhttpnetworkconnection/qhttpnetworkconnection.pro2
-rw-r--r--tests/auto/qhttpnetworkconnection/tst_qhttpnetworkconnection.cpp2
-rw-r--r--tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro2
-rw-r--r--tests/auto/qhttpsocketengine/qhttpsocketengine.pro2
-rw-r--r--tests/auto/qimage/tst_qimage.cpp27
-rw-r--r--tests/auto/qinputdialog/tst_qinputdialog.cpp18
-rw-r--r--tests/auto/qiodevice/tst_qiodevice.cpp45
-rw-r--r--tests/auto/qitemmodel/modelstotest.cpp35
-rw-r--r--tests/auto/qitemmodel/tst_qitemmodel.cpp12
-rw-r--r--tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp4
-rw-r--r--tests/auto/qitemview/tst_qitemview.cpp90
-rw-r--r--tests/auto/qitemview/viewstotest.cpp1
-rw-r--r--tests/auto/qlayout/tst_qlayout.cpp28
-rw-r--r--tests/auto/qlibrary/tst_qlibrary.cpp2
-rw-r--r--tests/auto/qlineedit/tst_qlineedit.cpp76
-rw-r--r--tests/auto/qlistwidget/qlistwidget.pro1
-rw-r--r--tests/auto/qlocale/tst_qlocale.cpp4
-rw-r--r--tests/auto/qmainwindow/qmainwindow.pro2
-rw-r--r--tests/auto/qmake/testdata/subdir_via_pro_file_extra_target/simple/main.cpp42
-rw-r--r--tests/auto/qmenu/tst_qmenu.cpp49
-rw-r--r--tests/auto/qmenubar/tst_qmenubar.cpp561
-rw-r--r--tests/auto/qmessagebox/qmessagebox.pro3
-rw-r--r--tests/auto/qmessagebox/tst_qmessagebox.cpp77
-rw-r--r--tests/auto/qmetaobject/tst_qmetaobject.cpp14
-rw-r--r--tests/auto/qmetatype/tst_qmetatype.cpp43
-rw-r--r--tests/auto/qmouseevent/tst_qmouseevent.cpp60
-rw-r--r--tests/auto/qmutex/tst_qmutex.cpp46
-rw-r--r--tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp8
-rw-r--r--tests/auto/qnetworkreply/test/test.pro2
-rw-r--r--tests/auto/qnetworkreply/tst_qnetworkreply.cpp84
-rw-r--r--tests/auto/qobject/signalbug.cpp9
-rw-r--r--tests/auto/qobject/tst_qobject.cpp42
-rw-r--r--tests/auto/qobject/tst_qobject.pro3
-rw-r--r--tests/auto/qpainter/tst_qpainter.cpp37
-rw-r--r--tests/auto/qpathclipper/qpathclipper.pro1
-rw-r--r--tests/auto/qpicture/tst_qpicture.cpp4
-rw-r--r--tests/auto/qpixmap/tst_qpixmap.cpp56
-rw-r--r--tests/auto/qpixmapcache/qpixmapcache.pro1
-rw-r--r--tests/auto/qprinter/tst_qprinter.cpp25
-rw-r--r--tests/auto/qprocess/testGuiProcess/main.cpp1
-rw-r--r--tests/auto/qprocess/testProcessSpacesArgs/main.cpp2
-rw-r--r--tests/auto/qprocess/tst_qprocess.cpp2
-rw-r--r--tests/auto/qreadwritelock/tst_qreadwritelock.cpp29
-rw-r--r--tests/auto/qsettings/tst_qsettings.cpp697
-rw-r--r--tests/auto/qsharedpointer/externaltests.cpp18
-rw-r--r--tests/auto/qsharedpointer/externaltests.h13
-rw-r--r--tests/auto/qsharedpointer/tst_qsharedpointer.cpp25
-rw-r--r--tests/auto/qsidebar/qsidebar.pro1
-rw-r--r--tests/auto/qsocketnotifier/qsocketnotifier.pro2
-rw-r--r--tests/auto/qsocketnotifier/tst_qsocketnotifier.cpp4
-rw-r--r--tests/auto/qsocks5socketengine/qsocks5socketengine.pro2
-rw-r--r--tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp2
-rw-r--r--tests/auto/qsplitter/tst_qsplitter.cpp665
-rw-r--r--tests/auto/qsql/tst_qsql.cpp50
-rw-r--r--tests/auto/qsqldatabase/tst_qsqldatabase.cpp308
-rw-r--r--tests/auto/qsqlquery/tst_qsqlquery.cpp6
-rw-r--r--tests/auto/qsqlrecord/tst_qsqlrecord.cpp86
-rw-r--r--tests/auto/qsslsocket/qsslsocket.pro2
-rw-r--r--tests/auto/qsslsocket/tst_qsslsocket.cpp7
-rw-r--r--tests/auto/qsslsocket_onDemandCertificates_member/qsslsocket_onDemandCertificates_member.pro2
-rw-r--r--tests/auto/qsslsocket_onDemandCertificates_static/qsslsocket_onDemandCertificates_static.pro2
-rw-r--r--tests/auto/qstatemachine/tst_qstatemachine.cpp2
-rw-r--r--tests/auto/qstring/tst_qstring.cpp46
-rw-r--r--tests/auto/qstringbuilder1/tst_qstringbuilder1.cpp3
-rw-r--r--tests/auto/qstringbuilder2/tst_qstringbuilder2.cpp3
-rw-r--r--tests/auto/qstringbuilder3/tst_qstringbuilder3.cpp3
-rw-r--r--tests/auto/qstringbuilder4/tst_qstringbuilder4.cpp3
-rw-r--r--tests/auto/qstyle/tst_qstyle.cpp9
-rw-r--r--tests/auto/qstyleoption/tst_qstyleoption.cpp3
-rw-r--r--tests/auto/qstylesheetstyle/qstylesheetstyle.pro2
-rw-r--r--tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp6
-rw-r--r--tests/auto/qtableview/tst_qtableview.cpp4
-rw-r--r--tests/auto/qtabwidget/tst_qtabwidget.cpp20
-rw-r--r--tests/auto/qtcpsocket/stressTest/Test.cpp94
-rw-r--r--tests/auto/qtcpsocket/stressTest/Test.h42
-rw-r--r--tests/auto/qtcpsocket/stressTest/main.cpp8
-rw-r--r--tests/auto/qtcpsocket/test/test.pro1
-rw-r--r--tests/auto/qtcpsocket/tst_qtcpsocket.cpp12
-rw-r--r--tests/auto/qtessellator/dataparser.cpp8
-rw-r--r--tests/auto/qtessellator/oldtessellator.cpp19
-rw-r--r--tests/auto/qtessellator/testtessellator.cpp4
-rw-r--r--tests/auto/qtextboundaryfinder/tst_qtextboundaryfinder.cpp18
-rw-r--r--tests/auto/qtextcodec/tst_qtextcodec.cpp23
-rw-r--r--tests/auto/qtextdocumentlayout/tst_qtextdocumentlayout.cpp1
-rw-r--r--tests/auto/qtextedit/qtextedit.pro1
-rw-r--r--tests/auto/qtextedit/tst_qtextedit.cpp23
-rw-r--r--tests/auto/qtextlayout/qtextlayout.pro1
-rw-r--r--tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp11
-rw-r--r--tests/auto/qtextpiecetable/qtextpiecetable.pro1
-rw-r--r--tests/auto/qtextpiecetable/tst_qtextpiecetable.cpp2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.databin8 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.databin118 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_0.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_1.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_2.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_3.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QChar_resource_Unicode_4.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_RawUnicode_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data2
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_2.databin8 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_3.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_QString_resource_Unicode_4.databin118 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_RawUnicode_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_0.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_1.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_2.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_3.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_char_resource_Unicode_4.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_RawUnicode_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_1.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_2.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_3.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_4.databin30 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_5.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_double_resource_Unicode_6.databin36 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_RawUnicode_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_1.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_2.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_3.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_float_resource_Unicode_4.databin30 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Latin1_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Locale_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_RawUnicode_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_5.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_6.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_7.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_int_resource_Unicode_8.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Latin1_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Locale_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_RawUnicode_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_4.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_5.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_6.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_7.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_long_resource_Unicode_8.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_RawUnicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_1.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_short_resource_Unicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_uint_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ulong_resource_Unicode_4.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/big_endian/qt3_operator_shift_ushort_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_RawUnicode_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeNetworkOrder_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeReverse_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_2.databin8 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_3.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QByteArray_resource_Unicode_4.databin118 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_RawUnicode_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeNetworkOrder_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeReverse_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_0.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_1.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_2.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_3.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QChar_resource_Unicode_4.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_RawUnicode_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeNetworkOrder_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_2.databin6 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_3.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeReverse_4.databin116 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_3.data2
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_0.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_1.data0
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_2.databin8 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_3.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_QString_resource_Unicode_4.databin118 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_RawUnicode_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeNetworkOrder_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_0.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_1.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_2.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_3.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeReverse_4.databin2 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_0.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_1.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_2.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_3.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_char_resource_Unicode_4.databin4 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_RawUnicode_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeNetworkOrder_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_5.databin32 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeReverse_6.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_1.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_2.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_3.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_4.databin30 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_5.databin34 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_double_resource_Unicode_6.databin36 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_RawUnicode_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeNetworkOrder_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_1.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_2.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_3.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeReverse_4.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_1.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_2.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_3.databin28 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_float_resource_Unicode_4.databin30 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Latin1_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Locale_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_RawUnicode_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeNetworkOrder_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeReverse_8.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_UnicodeUTF8_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_5.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_6.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_7.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_int_resource_Unicode_8.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Latin1_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Locale_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_RawUnicode_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeNetworkOrder_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_5.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_6.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_7.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeReverse_8.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_5.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_6.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_7.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_UnicodeUTF8_8.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_4.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_5.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_6.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_7.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_long_resource_Unicode_8.databin26 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_RawUnicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeNetworkOrder_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_2.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeReverse_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_1.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_short_resource_Unicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_uint_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_RawUnicode_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeNetworkOrder_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeReverse_4.databin22 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ulong_resource_Unicode_4.databin24 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Latin1_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Locale_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_RawUnicode_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeNetworkOrder_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_0.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_1.databin14 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_2.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_3.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeReverse_4.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_0.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_1.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_2.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_3.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_UnicodeUTF8_4.data1
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_0.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_1.databin16 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_2.databin18 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_3.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/resources/little_endian/qt3_operator_shift_ushort_resource_Unicode_4.databin20 -> 0 bytes
-rw-r--r--tests/auto/qtextstream/tst_qtextstream.cpp1542
-rw-r--r--tests/auto/qthread/tst_qthread.cpp2
-rw-r--r--tests/auto/qthreadstorage/tst_qthreadstorage.cpp2
-rw-r--r--tests/auto/qtipc/lackey/lackey.pro1
-rw-r--r--tests/auto/qtipc/qsharedmemory/qsystemlock/qsystemlock.pro2
-rw-r--r--tests/auto/qtipc/qsharedmemory/src/qsystemlock_unix.cpp3
-rw-r--r--tests/auto/qtipc/qsharedmemory/src/qsystemlock_win.cpp3
-rw-r--r--tests/auto/qtipc/qsharedmemory/src/src.pri1
-rw-r--r--tests/auto/qtoolbar/qtoolbar.pro1
-rw-r--r--tests/auto/qtoolbutton/tst_qtoolbutton.cpp7
-rw-r--r--tests/auto/qtreeview/tst_qtreeview.cpp24
-rw-r--r--tests/auto/qurl/tst_qurl.cpp11
-rw-r--r--tests/auto/qvariant/tst_qvariant.cpp386
-rw-r--r--tests/auto/qwidget/tst_qwidget.cpp136
-rw-r--r--tests/auto/qwizard/tst_qwizard.cpp21
-rw-r--r--tests/auto/qworkspace/tst_qworkspace.cpp58
-rw-r--r--tests/auto/qxmlinputsource/tst_qxmlinputsource.cpp4
-rw-r--r--tests/auto/qxmlsimplereader/tst_qxmlsimplereader.cpp24
-rw-r--r--tests/auto/qxmlstream/qc14n.h37
-rw-r--r--tests/auto/qxmlstream/tst_qxmlstream.cpp20
-rw-r--r--tests/auto/selftests/alive/qtestalive.cpp7
-rw-r--r--tests/benchmarks/corelib/tools/qstring/main.cpp2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.cpp6
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemcontainer.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.cpp4
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractitemview.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.cpp2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/abstractviewitem.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.cpp7
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/iconitem.h7
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglist.cpp14
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/itemrecyclinglistview.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/label.cpp2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitem.cpp8
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.cpp16
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listitemcontainer.h6
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.cpp2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/listwidget.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelist.cpp8
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.cpp32
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/simplelistview.h2
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.cpp8
-rw-r--r--tests/benchmarks/gui/graphicsview/functional/GraphicsViewBenchmark/widgets/theme.h5
-rw-r--r--tests/benchmarks/gui/painting/qpainter/tst_qpainter.cpp1
-rw-r--r--tests/benchmarks/gui/painting/qtbench/benchmarktests.h30
-rw-r--r--tests/benchmarks/gui/painting/qtbench/tst_qtbench.cpp2
-rw-r--r--tests/benchmarks/gui/painting/qtracebench/tst_qtracebench.cpp2
-rw-r--r--tests/benchmarks/gui/text/qtext/main.cpp2
-rw-r--r--tests/benchmarks/network/access/qnetworkreply/tst_qnetworkreply.cpp2
-rw-r--r--tools/uilib/abstractformbuilder.cpp112
-rw-r--r--tools/uilib/abstractformbuilder.h2
-rw-r--r--tools/uilib/container.h7
-rw-r--r--tools/uilib/container.qdoc27
-rw-r--r--tools/uilib/formbuilderextra.cpp1
-rw-r--r--tools/uilib/formbuilderextra_p.h2
1260 files changed, 2551 insertions, 17736 deletions
diff --git a/configure b/configure
index d599cb5535..fd0c185c17 100755
--- a/configure
+++ b/configure
@@ -751,6 +751,7 @@ CFG_DECORATION_PLUGIN_AVAILABLE=
CFG_DECORATION_PLUGIN=
CFG_XINPUT=runtime
CFG_XKB=auto
+CFG_XCB=no
CFG_NIS=auto
CFG_CUPS=auto
CFG_ICONV=auto
@@ -1043,7 +1044,7 @@ while [ "$#" -gt 0 ]; do
VAL=no
;;
#Qt style yes options
- -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
+ -incremental|-qvfb|-profile|-shared|-static|-sm|-xinerama|-xshape|-xsync|-xinput|-egl|-reduce-exports|-pch|-separate-debug-info|-stl|-freetype|-xcursor|-xfixes|-xrandr|-xrender|-mitshm|-fontconfig|-xkb|-xcb|-nis|-qdbus|-dbus|-dbus-linked|-glib|-gstreamer|-gtkstyle|-cups|-iconv|-largefile|-h|-help|-v|-verbose|-debug|-release|-fast|-accessibility|-confirm-license|-gnumake|-framework|-qt3support|-debug-and-release|-exceptions|-cocoa|-carbon|-universal|-harfbuzz|-prefix-install|-silent|-armfpa|-optimized-qmake|-dwarf2|-reduce-relocations|-sse|-openssl|-openssl-linked|-ptmalloc|-xmlpatterns|-phonon|-phonon-backend|-multimedia|-audio-backend|-svg|-declarative|-declarative-debug|-javascript-jit|-script|-scripttools|-rpath|-force-pkg-config|-s60|-usedeffiles|-icu)
VAR=`echo $1 | sed "s,^-\(.*\),\1,"`
VAL=yes
;;
@@ -1971,6 +1972,13 @@ while [ "$#" -gt 0 ]; do
UNKNOWN_OPT=yes
fi
;;
+ xcb)
+ if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
+ CFG_XCB="$VAL"
+ else
+ UNKNOWN_OPT=yes
+ fi
+ ;;
cups)
if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then
CFG_CUPS="$VAL"
@@ -3711,6 +3719,14 @@ if [ "$OPT_HELP" = "yes" ]; then
PHN=" "
fi
+ if [ "$CFG_XCB" = "no" ]; then
+ XCY=" "
+ XCN="*"
+ else
+ XCY="*"
+ XCN=" "
+ fi
+
cat <<EOF
Usage: $relconf [-h] [-prefix <dir>] [-prefix-install] [-bindir <dir>] [-libdir <dir>]
[-docdir <dir>] [-headerdir <dir>] [-plugindir <dir> ] [-importdir <dir>] [-datadir <dir>]
@@ -4061,6 +4077,9 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "ye
$SBN -no-separate-debug-info . Do not store debug information in a separate file.
$SBY -separate-debug-info .... Strip debug information into a separate .debug file.
+ $XKN -no-xcb ............ Do not compile Xcb (X protocol C-language Binding) support.
+ $XKY -xcb ............... Compile Xcb support.
+
EOF
fi # X11/QWS
@@ -7270,6 +7289,7 @@ fi
[ "$CFG_OPENSSL" = "yes" ] && QT_CONFIG="$QT_CONFIG openssl"
[ "$CFG_OPENSSL" = "linked" ] && QT_CONFIG="$QT_CONFIG openssl-linked"
[ "$CFG_MAC_HARFBUZZ" = "yes" ] && QT_CONFIG="$QT_CONFIG harfbuzz"
+[ "$CFG_XCB" = "yes" ] && QT_CONFIG="$QT_CONFIG xcb"
if [ "$PLATFORM_X11" = "yes" ]; then
[ "$CFG_SM" = "yes" ] && QT_CONFIG="$QT_CONFIG x11sm"
@@ -7524,10 +7544,8 @@ EOF
canBuildQtConcurrent="no"
;;
symbian-gcce)
- canBuildQtConcurrent="no"
;;
symbian-armcc)
- canBuildQtConcurrent="no"
;;
esac
@@ -8256,7 +8274,7 @@ if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then
# We cannot use Linux's default export rules since they export everything.
QCONFIG_FLAGS="$QCONFIG_FLAGS QT_DLL"
# Disable non-working features.
- QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CONCURRENT QT_NO_QFUTURE QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON"
+ QCONFIG_FLAGS="$QCONFIG_FLAGS QT_NO_CRASHHANDLER QT_NO_PRINTER QT_NO_SYSTEMTRAYICON"
fi
if [ -n "$QCONFIG_FLAGS" ]; then
@@ -8834,6 +8852,7 @@ if [ "$PLATFORM_MAC" = "yes" ]; then
fi
echo "ICD support ............ $CFG_ICD"
echo "libICU support ......... $CFG_ICU"
+echo "Xcb support ............ $CFG_XCB"
echo
[ "$CFG_PTMALLOC" != "no" ] && echo "Use ptmalloc ........... $CFG_PTMALLOC"
diff --git a/configure.exe b/configure.exe
index 9ccd3af81d..6860244b30 100644
--- a/configure.exe
+++ b/configure.exe
Binary files differ
diff --git a/doc/src/snippets/qstring/stringbuilder.cpp b/doc/src/snippets/qstring/stringbuilder.cpp
index 8ff1dd8206..b8acbc1e2a 100644
--- a/doc/src/snippets/qstring/stringbuilder.cpp
+++ b/doc/src/snippets/qstring/stringbuilder.cpp
@@ -49,14 +49,9 @@
//! [0]
//! [3]
- #define QT_USE_FAST_CONCATENATION
+ DEFINES *= QT_USE_QSTRINGBUILDER
//! [3]
-//! [4]
- #define QT_USE_FAST_CONCATENATION
- #define QT_USE_FAST_OPERATOR_PLUS
-//! [4]
-
//! [5]
#include <QStringBuilder>
diff --git a/mkspecs/features/testcase.prf b/mkspecs/features/testcase.prf
index 7a7c9e305a..eb0aa9fb85 100644
--- a/mkspecs/features/testcase.prf
+++ b/mkspecs/features/testcase.prf
@@ -38,6 +38,10 @@ embedded: check.commands += -qws
# Allow for custom arguments to tests
check.commands += $(TESTARGS)
+
+# If the test is marked as insignificant, discard the exit code
+insignificant_test:check.commands = -$${check.commands}
+
QMAKE_EXTRA_TARGETS *= check
!debug_and_release|build_pass {
diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h
index 0627b4e568..df58d95131 100644
--- a/src/corelib/tools/qbytearray.h
+++ b/src/corelib/tools/qbytearray.h
@@ -57,9 +57,10 @@
# ifdef QT_USE_FAST_OPERATOR_PLUS
# undef QT_USE_FAST_OPERATOR_PLUS
# endif
-# ifdef QT_USE_FAST_CONCATENATION
-# undef QT_USE_FAST_CONCATENATION
+# ifdef QT_USE_QSTRINGBUILDER
+# undef QT_USE_QSTRINGBUILDER
# endif
+
#endif
@@ -559,8 +560,7 @@ inline bool operator>=(const QByteArray &a1, const char *a2)
{ return qstrcmp(a1, a2) >= 0; }
inline bool operator>=(const char *a1, const QByteArray &a2)
{ return qstrcmp(a1, a2) >= 0; }
-#ifndef QT_USE_FAST_OPERATOR_PLUS
-# ifndef QT_USE_FAST_CONCATENATION
+#if !defined(QT_USE_QSTRINGBUILDER)
inline const QByteArray operator+(const QByteArray &a1, const QByteArray &a2)
{ return QByteArray(a1) += a2; }
inline const QByteArray operator+(const QByteArray &a1, const char *a2)
@@ -571,8 +571,7 @@ inline const QByteArray operator+(const char *a1, const QByteArray &a2)
{ return QByteArray(a1) += a2; }
inline const QByteArray operator+(char a1, const QByteArray &a2)
{ return QByteArray(&a1, 1) += a2; }
-# endif // QT_USE_FAST_CONCATENATION
-#endif // QT_USE_FAST_OPERATOR_PLUS
+#endif // QT_USE_QSTRINGBUILDER
inline QBool QByteArray::contains(const char *c) const
{ return QBool(indexOf(c) != -1); }
inline QByteArray &QByteArray::replace(char before, const char *c)
@@ -615,7 +614,7 @@ QT_END_NAMESPACE
QT_END_HEADER
-#ifdef QT_USE_FAST_CONCATENATION
+#ifdef QT_USE_QSTRINGBUILDER
#include <QtCore/qstring.h>
#endif
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index 5493ba915b..3b3f715b9d 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -777,16 +777,12 @@ const QString::Null QString::null = { };
\snippet doc/src/snippets/qstring/stringbuilder.cpp 5
- A more global approach is to include this define:
+ A more global approach which is the most convenient but
+ not entirely source compatible, is to this define in your
+ .pro file:
\snippet doc/src/snippets/qstring/stringbuilder.cpp 3
- and use \c{'%'} instead of \c{'+'} for string concatenation
- everywhere. The third approach, which is the most convenient but
- not entirely source compatible, is to include two defines:
-
- \snippet doc/src/snippets/qstring/stringbuilder.cpp 4
-
and the \c{'+'} will automatically be performed as the
\c{QStringBuilder} \c{'%'} everywhere.
diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h
index 6418a8cbd4..7c4367efde 100644
--- a/src/corelib/tools/qstring.h
+++ b/src/corelib/tools/qstring.h
@@ -1016,8 +1016,7 @@ inline int QByteArray::findRev(const QString &s, int from) const
# endif // QT3_SUPPORT
#endif // QT_NO_CAST_TO_ASCII
-#ifndef QT_USE_FAST_OPERATOR_PLUS
-# ifndef QT_USE_FAST_CONCATENATION
+#if !defined(QT_USE_FAST_OPERATOR_PLUS) && !defined(QT_USE_QSTRINGBUILDER)
inline const QString operator+(const QString &s1, const QString &s2)
{ QString t(s1); t += s2; return t; }
inline const QString operator+(const QString &s1, QChar s2)
@@ -1038,8 +1037,7 @@ inline QT_ASCII_CAST_WARN const QString operator+(const QByteArray &ba, const QS
inline QT_ASCII_CAST_WARN const QString operator+(const QString &s, const QByteArray &ba)
{ QString t(s); t += QString::fromAscii(ba.constData(), qstrnlen(ba.constData(), ba.size())); return t; }
# endif // QT_NO_CAST_FROM_ASCII
-# endif // QT_USE_FAST_CONCATENATION
-#endif // QT_USE_FAST_OPERATOR_PLUS
+#endif // QT_USE_QSTRINGBUILDER
#ifndef QT_NO_STL
inline std::string QString::toStdString() const
@@ -1288,7 +1286,7 @@ QT_END_NAMESPACE
QT_END_HEADER
-#ifdef QT_USE_FAST_CONCATENATION
+#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER)
#include <QtCore/qstringbuilder.h>
#endif
diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h
index 2d3475fed9..029aa0b216 100644
--- a/src/corelib/tools/qstringbuilder.h
+++ b/src/corelib/tools/qstringbuilder.h
@@ -410,7 +410,9 @@ operator%(const A &a, const B &b)
return QStringBuilder<typename QConcatenable<A>::type, typename QConcatenable<B>::type>(a, b);
}
-#ifdef QT_USE_FAST_OPERATOR_PLUS
+// QT_USE_FAST_OPERATOR_PLUS was introduced in 4.7, QT_USE_QSTRINGBUILDER is to be used from 4.8 onwards
+// QT_USE_FAST_OPERATOR_PLUS does not remove the normal operator+ for QByteArray
+#if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER)
template <typename A, typename B>
QStringBuilder<typename QConcatenable<A>::type, typename QConcatenable<B>::type>
operator+(const A &a, const B &b)
diff --git a/src/gui/painting/qcolor.cpp b/src/gui/painting/qcolor.cpp
index 1a6b090f63..1f342aeef7 100644
--- a/src/gui/painting/qcolor.cpp
+++ b/src/gui/painting/qcolor.cpp
@@ -532,8 +532,7 @@ QString QColor::name() const
void QColor::setNamedColor(const QString &name)
{
- if (!setColorFromString(name))
- qWarning("QColor::setNamedColor: Unknown color name '%s'", name.toLatin1().constData());
+ setColorFromString(name);
}
/*!
diff --git a/src/gui/painting/qdrawhelper_neon.cpp b/src/gui/painting/qdrawhelper_neon.cpp
index e673dd9861..a098e82e19 100644
--- a/src/gui/painting/qdrawhelper_neon.cpp
+++ b/src/gui/painting/qdrawhelper_neon.cpp
@@ -986,7 +986,7 @@ public:
static inline Int32x4 v_toInt(Float32x4 x) { return vcvtq_s32_f32(x); }
- static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vcge_f32(a, b); }
+ static inline Int32x4 v_greaterOrEqual(Float32x4 a, Float32x4 b) { return vreinterpretq_s32_u32(vcgeq_f32(a, b)); }
};
const uint * QT_FASTCALL qt_fetch_radial_gradient_neon(uint *buffer, const Operator *op, const QSpanData *data,
diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp
index 8b7883bc58..2cc8863091 100644
--- a/src/gui/painting/qpaintengine_raster.cpp
+++ b/src/gui/painting/qpaintengine_raster.cpp
@@ -3008,8 +3008,16 @@ void QRasterPaintEngine::drawStaticTextItem(QStaticTextItem *textItem)
ensurePen();
ensureState();
- drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions,
- textItem->fontEngine());
+ QRasterPaintEngineState *s = state();
+
+ QFontEngine *fontEngine = textItem->fontEngine();
+ const qreal pixelSize = fontEngine->fontDef.pixelSize;
+ if (pixelSize * pixelSize * qAbs(s->matrix.determinant()) < 64 * 64) {
+ drawCachedGlyphs(textItem->numGlyphs, textItem->glyphs, textItem->glyphPositions,
+ fontEngine);
+ } else {
+ QPaintEngineEx::drawStaticTextItem(textItem);
+ }
}
/*!
diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp
index bbdf76f0c0..304e5fc486 100644
--- a/src/gui/painting/qpaintengineex.cpp
+++ b/src/gui/painting/qpaintengineex.cpp
@@ -44,6 +44,8 @@
#include "qstroker_p.h"
#include "qbezier_p.h"
#include <private/qpainterpath_p.h>
+#include <private/qfontengine_p.h>
+#include <private/qstatictext_p.h>
#include <qvarlengtharray.h>
#include <qdebug.h>
@@ -1057,5 +1059,38 @@ Q_GUI_EXPORT QPainterPath qt_painterPathFromVectorPath(const QVectorPath &path)
return p;
}
+void QPaintEngineEx::drawStaticTextItem(QStaticTextItem *staticTextItem)
+{
+ QPainterPath path;
+#ifndef Q_WS_MAC
+ path.setFillRule(Qt::WindingFill);
+#endif
+
+ if (staticTextItem->numGlyphs == 0)
+ return;
+
+ QFontEngine *fontEngine = staticTextItem->fontEngine();
+ fontEngine->addGlyphsToPath(staticTextItem->glyphs, staticTextItem->glyphPositions,
+ staticTextItem->numGlyphs, &path, 0);
+ if (!path.isEmpty()) {
+ QPainterState *s = state();
+ QPainter::RenderHints oldHints = s->renderHints;
+ bool changedHints = false;
+ if (bool(oldHints & QPainter::TextAntialiasing)
+ && !bool(fontEngine->fontDef.styleStrategy & QFont::NoAntialias)
+ && !bool(oldHints & QPainter::Antialiasing)) {
+ s->renderHints |= QPainter::Antialiasing;
+ renderHintsChanged();
+ changedHints = true;
+ }
+
+ fill(qtVectorPathForPath(path), staticTextItem->color);
+
+ if (changedHints) {
+ s->renderHints = oldHints;
+ renderHintsChanged();
+ }
+ }
+}
QT_END_NAMESPACE
diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h
index da469936fc..39f872a27c 100644
--- a/src/gui/painting/qpaintengineex_p.h
+++ b/src/gui/painting/qpaintengineex_p.h
@@ -201,7 +201,7 @@ public:
virtual void updateState(const QPaintEngineState &state);
- virtual void drawStaticTextItem(QStaticTextItem *) = 0;
+ virtual void drawStaticTextItem(QStaticTextItem *);
virtual void setState(QPainterState *s);
inline QPainterState *state() { return static_cast<QPainterState *>(QPaintEngine::state); }
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index 4dae2a3784..855eaec8c4 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -795,7 +795,7 @@ int QFontEngineFT::loadFlags(QGlyphSet *set, GlyphFormat format, int flags,
if (set && set->outline_drawing)
load_flags = FT_LOAD_NO_BITMAP;
- if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics))
+ if (default_hint_style == HintNone || (flags & HB_ShaperFlag_UseDesignMetrics) || set->outline_drawing)
load_flags |= FT_LOAD_NO_HINTING;
else
load_flags |= load_target;
diff --git a/src/network/kernel/qhostaddress.cpp b/src/network/kernel/qhostaddress.cpp
index ae7d7a1486..4e7c286d80 100644
--- a/src/network/kernel/qhostaddress.cpp
+++ b/src/network/kernel/qhostaddress.cpp
@@ -720,7 +720,8 @@ Q_IPV6ADDR QHostAddress::toIPv6Address() const
Returns the address as a string.
For example, if the address is the IPv4 address 127.0.0.1, the
- returned string is "127.0.0.1".
+ returned string is "127.0.0.1". For IPv6 the string format will
+ follow the RFC5952 recommendation.
\sa toIPv4Address()
*/
@@ -741,8 +742,32 @@ QString QHostAddress::toString() const
ugle[i] = (quint16(d->a6[2*i]) << 8) | quint16(d->a6[2*i+1]);
}
QString s;
- s.sprintf("%X:%X:%X:%X:%X:%X:%X:%X",
- ugle[0], ugle[1], ugle[2], ugle[3], ugle[4], ugle[5], ugle[6], ugle[7]);
+ QString temp;
+ bool zeroDetected = false;
+ bool zeroShortened = false;
+ for (int i = 0; i < 8; i++) {
+ if ((ugle[i] != 0) || zeroShortened) {
+ temp.sprintf("%X", ugle[i]);
+ s.append(temp);
+ if (zeroDetected)
+ zeroShortened = true;
+ } else {
+ if (!zeroDetected) {
+ if (i<7 && (ugle[i+1] == 0)) {
+ s.append(QLatin1Char(':'));
+ zeroDetected = true;
+ } else {
+ temp.sprintf("%X", ugle[i]);
+ s.append(temp);
+ if (i<7)
+ s.append(QLatin1Char(':'));
+ }
+ }
+ }
+ if (i<7 && ((ugle[i] != 0) || zeroShortened || (i==0 && zeroDetected)))
+ s.append(QLatin1Char(':'));
+ }
+
if (!d->scopeId.isEmpty())
s.append(QLatin1Char('%') + d->scopeId);
return s;
diff --git a/src/network/kernel/qnetworkinterface_unix.cpp b/src/network/kernel/qnetworkinterface_unix.cpp
index 6098bdeee0..7f251a782b 100644
--- a/src/network/kernel/qnetworkinterface_unix.cpp
+++ b/src/network/kernel/qnetworkinterface_unix.cpp
@@ -219,7 +219,7 @@ static QNetworkInterfacePrivate *findInterface(int socket, QList<QNetworkInterfa
#ifdef SIOCGIFHWADDR
// Get the HW address
if (qt_safe_ioctl(socket, SIOCGIFHWADDR, &req) >= 0) {
- uchar *addr = (uchar *)&req.ifr_addr;
+ uchar *addr = (uchar *)req.ifr_addr.sa_data;
iface->hardwareAddress = iface->makeHwAddress(6, addr);
}
#endif
diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
index f702f13359..fa8b0d0612 100644
--- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
+++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
@@ -1436,19 +1436,30 @@ void QGL2PaintEngineEx::drawStaticTextItem(QStaticTextItem *textItem)
ensureActive();
- QFontEngineGlyphCache::Type glyphType = textItem->fontEngine()->glyphFormat >= 0
- ? QFontEngineGlyphCache::Type(textItem->fontEngine()->glyphFormat)
- : d->glyphCacheType;
- if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) {
- if (d->device->alphaRequested() || state()->matrix.type() > QTransform::TxTranslate
- || (state()->composition_mode != QPainter::CompositionMode_Source
- && state()->composition_mode != QPainter::CompositionMode_SourceOver))
- {
- glyphType = QFontEngineGlyphCache::Raster_A8;
+ QPainterState *s = state();
+ float det = s->matrix.determinant();
+
+ // don't try to cache huge fonts or vastly transformed fonts
+ QFontEngine *fontEngine = textItem->fontEngine();
+ const qreal pixelSize = fontEngine->fontDef.pixelSize;
+ if (pixelSize * pixelSize * qAbs(det) < QT_MAX_CACHED_GLYPH_SIZE * QT_MAX_CACHED_GLYPH_SIZE ||
+ det < 0.25f || det > 4.f) {
+ QFontEngineGlyphCache::Type glyphType = fontEngine->glyphFormat >= 0
+ ? QFontEngineGlyphCache::Type(textItem->fontEngine()->glyphFormat)
+ : d->glyphCacheType;
+ if (glyphType == QFontEngineGlyphCache::Raster_RGBMask) {
+ if (d->device->alphaRequested() || s->matrix.type() > QTransform::TxTranslate
+ || (s->composition_mode != QPainter::CompositionMode_Source
+ && s->composition_mode != QPainter::CompositionMode_SourceOver))
+ {
+ glyphType = QFontEngineGlyphCache::Raster_A8;
+ }
}
- }
- d->drawCachedGlyphs(glyphType, textItem);
+ d->drawCachedGlyphs(glyphType, textItem);
+ } else {
+ QPaintEngineEx::drawStaticTextItem(textItem);
+ }
}
bool QGL2PaintEngineEx::drawTexture(const QRectF &dest, GLuint textureId, const QSize &size, const QRectF &src)
diff --git a/src/opengl/qgl_qpa.cpp b/src/opengl/qgl_qpa.cpp
index 5eaaee9702..9c3d4246ae 100644
--- a/src/opengl/qgl_qpa.cpp
+++ b/src/opengl/qgl_qpa.cpp
@@ -83,21 +83,21 @@ QGLFormat QGLFormat::fromWindowFormat(const QWindowFormat &format)
QWindowFormat QGLFormat::toWindowFormat(const QGLFormat &format)
{
QWindowFormat retFormat;
- if (format.alphaBufferSize() >= 0)
- retFormat.setAlphaBufferSize(format.alphaBufferSize());
+ if (format.alpha())
+ retFormat.setAlphaBufferSize(format.alphaBufferSize() == -1 ? 1 : format.alphaBufferSize());
if (format.blueBufferSize() >= 0)
retFormat.setBlueBufferSize(format.blueBufferSize());
if (format.greenBufferSize() >= 0)
retFormat.setGreenBufferSize(format.greenBufferSize());
if (format.redBufferSize() >= 0)
retFormat.setRedBufferSize(format.redBufferSize());
- if (format.depthBufferSize() >= 0)
- retFormat.setDepthBufferSize(format.depthBufferSize());
+ if (format.depth())
+ retFormat.setDepthBufferSize(format.depthBufferSize() == -1 ? 1 : format.depthBufferSize());
retFormat.setSwapBehavior(format.doubleBuffer() ? QWindowFormat::DoubleBuffer : QWindowFormat::DefaultSwapBehavior);
- if (format.sampleBuffers() && format.samples() > 1)
- retFormat.setSamples(format.samples());
- if (format.stencil() && format.stencilBufferSize() > 0)
- retFormat.setStencilBufferSize(format.stencilBufferSize());
+ if (format.sampleBuffers())
+ retFormat.setSamples(format.samples() == -1 ? 4 : format.samples());
+ if (format.stencil())
+ retFormat.setStencilBufferSize(format.stencilBufferSize() == -1 ? 1 : format.stencilBufferSize());
retFormat.setStereo(format.stereo());
return retFormat;
}
@@ -138,6 +138,8 @@ bool QGLContext::chooseContext(const QGLContext* shareContext)
winFormat.setSharedContext(shareContext->d_func()->windowContext);
}
widget->windowHandle()->setSurfaceType(QWindow::OpenGLSurface);
+ if (widget->testAttribute(Qt::WA_TranslucentBackground))
+ winFormat.setAlphaBufferSize(qMax(winFormat.alphaBufferSize(), 8));
winFormat.setWindowSurface(false);
widget->windowHandle()->setWindowFormat(winFormat);
widget->winId();//make window
diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 4598bffabb..8ca95a88c9 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -362,17 +362,17 @@ QGLShader::ShaderType QGLShader::shaderType() const
// The precision qualifiers are useful on OpenGL/ES systems,
// but usually not present on desktop systems. Define the
// keywords to empty strings on desktop systems.
-#ifndef QT_OPENGL_ES
+#if !defined(QT_OPENGL_ES) || defined(QT_OPENGL_FORCE_SHADER_DEFINES)
#define QGL_DEFINE_QUALIFIERS 1
static const char qualifierDefines[] =
"#define lowp\n"
"#define mediump\n"
"#define highp\n";
-#endif
+
+#else
// The "highp" qualifier doesn't exist in fragment shaders
// on all ES platforms. When it doesn't exist, use "mediump".
-#ifdef QT_OPENGL_ES
#define QGL_REDEFINE_HIGHP 1
static const char redefineHighp[] =
"#ifndef GL_FRAGMENT_PRECISION_HIGH\n"
diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp
index 62a631855f..4f194327ad 100644
--- a/src/opengl/qwindowsurface_gl.cpp
+++ b/src/opengl/qwindowsurface_gl.cpp
@@ -485,19 +485,30 @@ void QGLWindowSurface::beginPaint(const QRegion &)
d_ptr->did_paint = true;
updateGeometry();
- if (!context())
- return;
-
int clearFlags = 0;
- if (context()->d_func()->workaround_needsFullClearOnEveryFrame)
+#if 0
+ QGLContext *ctx = reinterpret_cast<QGLContext *>(window()->d_func()->extraData()->glContext);
+#endif
+ const QGLContext *ctx = QGLContext::currentContext();
+
+ if (!ctx)
+ return;
+
+ if (ctx->d_func()->workaround_needsFullClearOnEveryFrame)
clearFlags = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
- else if (context()->format().alpha())
+ else if (ctx->format().alpha())
clearFlags = GL_COLOR_BUFFER_BIT;
if (clearFlags) {
+ if (d_ptr->fbo)
+ d_ptr->fbo->bind();
+
glClearColor(0.0, 0.0, 0.0, 0.0);
glClear(clearFlags);
+
+ if (d_ptr->fbo)
+ d_ptr->fbo->release();
}
}
diff --git a/src/plugins/codecs/jp/qsjiscodec.cpp b/src/plugins/codecs/jp/qsjiscodec.cpp
index 49190d310f..3ea5300d51 100644
--- a/src/plugins/codecs/jp/qsjiscodec.cpp
+++ b/src/plugins/codecs/jp/qsjiscodec.cpp
@@ -155,7 +155,9 @@ QString QSjisCodec::convertToUnicode(const char* chars, int len, ConverterState
uchar ch = chars[i];
switch (nbuf) {
case 0:
- if (ch < 0x80 || IsKana(ch)) {
+ if (ch < 0x80) {
+ result += QValidChar(ch);
+ } else if (IsKana(ch)) {
// JIS X 0201 Latin or JIS X 0201 Kana
u = conv->jisx0201ToUnicode(ch);
result += QValidChar(u);
diff --git a/src/plugins/platforms/glxconvenience/glxconvenience.pri b/src/plugins/platforms/glxconvenience/glxconvenience.pri
index d6c992229e..b4d43a30b5 100644
--- a/src/plugins/platforms/glxconvenience/glxconvenience.pri
+++ b/src/plugins/platforms/glxconvenience/glxconvenience.pri
@@ -5,3 +5,11 @@ HEADERS += \
SOURCES += \
$$PWD/qglxconvenience.cpp
+
+CONFIG += xrender
+
+xrender {
+ LIBS += -lXrender
+} else {
+ DEFINES += QT_NO_XRENDER
+}
diff --git a/src/plugins/platforms/glxconvenience/qglxconvenience.cpp b/src/plugins/platforms/glxconvenience/qglxconvenience.cpp
index abf7b83e04..1d9c5090dd 100644
--- a/src/plugins/platforms/glxconvenience/qglxconvenience.cpp
+++ b/src/plugins/platforms/glxconvenience/qglxconvenience.cpp
@@ -43,6 +43,10 @@
#include <QtCore/QVector>
+#ifndef QT_NO_XRENDER
+#include <X11/extensions/Xrender.h>
+#endif
+
enum {
XFocusOut = FocusOut,
XFocusIn = FocusIn,
@@ -76,19 +80,25 @@ QVector<int> qglx_buildSpec(const QWindowFormat &format, int drawableBit)
spec[i++] = GLX_DRAWABLE_TYPE; spec[i++] = drawableBit;
spec[i++] = GLX_RENDER_TYPE; spec[i++] = GLX_RGBA_BIT;
+
spec[i++] = GLX_RED_SIZE; spec[i++] = (format.redBufferSize() == -1) ? 1 : format.redBufferSize();
spec[i++] = GLX_GREEN_SIZE; spec[i++] = (format.greenBufferSize() == -1) ? 1 : format.greenBufferSize();
spec[i++] = GLX_BLUE_SIZE; spec[i++] = (format.blueBufferSize() == -1) ? 1 : format.blueBufferSize();
if (format.hasAlpha()) {
- spec[i++] = GLX_ALPHA_SIZE; spec[i++] = (format.alphaBufferSize() == -1) ? 1 : format.alphaBufferSize();
+ spec[i++] = GLX_ALPHA_SIZE; spec[i++] = format.alphaBufferSize();
}
spec[i++] = GLX_DOUBLEBUFFER; spec[i++] = format.swapBehavior() != QWindowFormat::SingleBuffer ? True : False;
+
spec[i++] = GLX_STEREO; spec[i++] = format.stereo() ? True : False;
- spec[i++] = GLX_DEPTH_SIZE; spec[i++] = (format.depthBufferSize() == -1) ? 1 : format.depthBufferSize();
+ if (format.depthBufferSize() > 0) {
+ spec[i++] = GLX_DEPTH_SIZE; spec[i++] = format.depthBufferSize();
+ }
- spec[i++] = GLX_STENCIL_SIZE; spec[i++] = (format.stencilBufferSize() == -1) ? 1 : format.stencilBufferSize();
+ if (format.stencilBufferSize() > 0) {
+ spec[i++] = GLX_STENCIL_SIZE; spec[i++] = (format.stencilBufferSize() == -1) ? 1 : format.stencilBufferSize();
+ }
if (format.samples() > 1) {
spec[i++] = GLX_SAMPLE_BUFFERS_ARB;
@@ -119,8 +129,17 @@ GLXFBConfig qglx_findConfig(Display *display, int screen , const QWindowFormat &
if (reducedFormat.hasAlpha()) {
int alphaSize;
glXGetFBConfigAttrib(display,configs[i],GLX_ALPHA_SIZE,&alphaSize);
- if (alphaSize > 0)
- break;
+ if (alphaSize > 0) {
+ XVisualInfo *visual = glXGetVisualFromFBConfig(display, chosenConfig);
+#if !defined(QT_NO_XRENDER)
+ XRenderPictFormat *pictFormat = XRenderFindVisualFormat(display, visual->visual);
+ if (pictFormat->direct.alphaMask > 0)
+ break;
+#else
+ if (visual->depth == 32)
+ break;
+#endif
+ }
} else {
break; // Just choose the first in the list if there's no alpha requested
}
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index 1fb4f01c1e..13dba86691 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -50,8 +50,8 @@ QMinimalIntegration::QMinimalIntegration()
QMinimalScreen *mPrimaryScreen = new QMinimalScreen();
mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320);
- mPrimaryScreen->mDepth = 16;
- mPrimaryScreen->mFormat = QImage::Format_RGB16;
+ mPrimaryScreen->mDepth = 32;
+ mPrimaryScreen->mFormat = QImage::Format_ARGB32_Premultiplied;
mScreens.append(mPrimaryScreen);
}
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h
index 7191441b91..eecb4e51a7 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
@@ -51,7 +51,7 @@ class QMinimalScreen : public QPlatformScreen
{
public:
QMinimalScreen()
- : mDepth(16), mFormat(QImage::Format_RGB16) {}
+ : mDepth(32), mFormat(QImage::Format_ARGB32_Premultiplied) {}
QRect geometry() const { return mGeometry; }
int depth() const { return mDepth; }
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index f27ec830e3..9d7ae296a9 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -6,7 +6,10 @@ contains(QT_CONFIG, wayland) {
SUBDIRS += wayland
}
+contains(QT_CONFIG, xcb) {
+ SUBDIRS += xcb
+}
+
mac {
SUBDIRS += cocoa
}
-
diff --git a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
index 39316adf6c..39bd99e5a0 100644
--- a/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp
@@ -132,10 +132,12 @@ void QWaylandXCompositeGLXContext::geometryChanged()
Colormap cmap = XCreateColormap(mGlxIntegration->xDisplay(),mGlxIntegration->rootWindow(),visualInfo->visual,AllocNone);
XSetWindowAttributes a;
+ a.background_pixel = WhitePixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen());
+ a.border_pixel = BlackPixel(mGlxIntegration->xDisplay(), mGlxIntegration->screen());
a.colormap = cmap;
mXWindow = XCreateWindow(mGlxIntegration->xDisplay(), mGlxIntegration->rootWindow(),0, 0, size.width(), size.height(),
0, visualInfo->depth, InputOutput, visualInfo->visual,
- CWColormap, &a);
+ CWBackPixel|CWBorderPixel|CWColormap, &a);
XCompositeRedirectWindow(mGlxIntegration->xDisplay(), mXWindow, CompositeRedirectManual);
XMapWindow(mGlxIntegration->xDisplay(), mXWindow);
diff --git a/src/plugins/platforms/wayland/qwaylandclipboard.cpp b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
index 77c9990d9e..3c90112a91 100644
--- a/src/plugins/platforms/wayland/qwaylandclipboard.cpp
+++ b/src/plugins/platforms/wayland/qwaylandclipboard.cpp
@@ -48,7 +48,7 @@
#include <QtCore/QStringList>
#include <QtCore/QFile>
#include <QtCore/QtDebug>
-#include <QtWidgets/private/qdnd_p.h>
+#include <QtGui/private/qdnd_p.h>
static QWaylandClipboard *clipboard;
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.cpp b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
index bd3f210533..310e266e64 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.cpp
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.cpp
@@ -51,6 +51,10 @@
#include "gl_integration/qwaylandglintegration.h"
#endif
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+#include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
+#endif
+
#include <QtCore/QAbstractEventDispatcher>
#include <QtGui/private/qguiapplication_p.h>
@@ -96,6 +100,13 @@ QWaylandGLIntegration * QWaylandDisplay::eglIntegration()
}
#endif
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+QWaylandWindowManagerIntegration *QWaylandDisplay::windowManagerIntegration()
+{
+ return mWindowManagerIntegration;
+}
+#endif
+
void QWaylandDisplay::shellHandleConfigure(void *data, struct wl_shell *shell,
uint32_t time, uint32_t edges,
struct wl_surface *surface,
@@ -135,6 +146,10 @@ QWaylandDisplay::QWaylandDisplay(void)
mEglIntegration->initialize();
#endif
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+ mWindowManagerIntegration = QWaylandWindowManagerIntegration::createIntegration(this);
+#endif
+
connect(QAbstractEventDispatcher::instance(), SIGNAL(aboutToBlock()), this, SLOT(flushRequests()));
mFd = wl_display_get_fd(mDisplay, sourceUpdate, this);
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h
index 0658956dc3..626636038d 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay.h
@@ -55,6 +55,8 @@ class QWaylandBuffer;
class QPlatformScreen;
class QWaylandScreen;
class QWaylandGLIntegration;
+class QWaylandWindowManagerIntegration;
+
class QWaylandDisplay : public QObject {
Q_OBJECT
@@ -74,6 +76,11 @@ public:
#ifdef QT_WAYLAND_GL_SUPPORT
QWaylandGLIntegration *eglIntegration();
#endif
+
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+ QWaylandWindowManagerIntegration *windowManagerIntegration();
+#endif
+
void setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y);
void syncCallback(wl_display_sync_func_t func, void *data);
@@ -124,6 +131,10 @@ private:
QWaylandGLIntegration *mEglIntegration;
#endif
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+ QWaylandWindowManagerIntegration *mWindowManagerIntegration;
+#endif
+
static void shellHandleConfigure(void *data, struct wl_shell *shell,
uint32_t time, uint32_t edges,
struct wl_surface *surface,
diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp
index b30cd4ab16..1e13f30b64 100644
--- a/src/plugins/platforms/wayland/qwaylandwindow.cpp
+++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp
@@ -47,6 +47,12 @@
#include "qwaylandscreen.h"
#include <QtGui/QWindow>
+
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+#include "windowmanager_integration/qwaylandwindowmanagerintegration.h"
+#endif
+
+#include <QCoreApplication>
#include <QtGui/QWindowSystemInterface>
#include <QDebug>
@@ -60,6 +66,10 @@ QWaylandWindow::QWaylandWindow(QWindow *window)
static WId id = 1;
mWindowId = id++;
+#ifdef QT_WAYLAND_WINDOWMANAGER_SUPPORT
+ mDisplay->windowManagerIntegration()->mapClientToProcess(qApp->applicationPid());
+#endif
+
mSurface = mDisplay->createSurface(this);
}
@@ -120,7 +130,6 @@ void QWaylandWindow::attach(QWaylandBuffer *buffer)
}
}
-
void QWaylandWindow::damage(const QRegion &region)
{
//We have to do sync stuff before calling damage, or we might
diff --git a/src/plugins/platforms/wayland/wayland.pro b/src/plugins/platforms/wayland/wayland.pro
index 1a9368f13c..e49c73bfae 100644
--- a/src/plugins/platforms/wayland/wayland.pro
+++ b/src/plugins/platforms/wayland/wayland.pro
@@ -45,8 +45,10 @@ QT += core-private
QT += widgets-private
include ($$PWD/gl_integration/gl_integration.pri)
+include ($$PWD/windowmanager_integration/windowmanager_integration.pri)
include (../fontdatabases/genericunix/genericunix.pri)
target.path += $$[QT_INSTALL_PLUGINS]/platforms
INSTALLS += target
+
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h
new file mode 100644
index 0000000000..ec776c5f87
--- /dev/null
+++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanager-client-protocol.h
@@ -0,0 +1,82 @@
+/*
+ * Copyright © 2010 Kristian Høgsberg
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+
+#ifndef WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H
+#define WAYLAND_WINDOWMANAGER_CLIENT_PROTOCOL_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-util.h"
+
+struct wl_client;
+
+struct wl_windowmanager;
+
+extern const struct wl_interface wl_windowmanager_interface;
+
+#define WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS 0
+
+static inline struct wl_windowmanager *
+wl_windowmanager_create(struct wl_display *display, uint32_t id, uint32_t /*version*/)
+{
+ // ### does not run without latest wayland. must be enabled later
+ //wl_display_bind(display, id, "wl_windowmanager", version);
+
+ return (struct wl_windowmanager *)
+ wl_proxy_create_for_id(display, &wl_windowmanager_interface, id);
+}
+
+static inline void
+wl_windowmanager_set_user_data(struct wl_windowmanager *wl_windowmanager, void *user_data)
+{
+ wl_proxy_set_user_data((struct wl_proxy *) wl_windowmanager, user_data);
+}
+
+static inline void *
+wl_windowmanager_get_user_data(struct wl_windowmanager *wl_windowmanager)
+{
+ return wl_proxy_get_user_data((struct wl_proxy *) wl_windowmanager);
+}
+
+static inline void
+wl_windowmanager_destroy(struct wl_windowmanager *wl_windowmanager)
+{
+ wl_proxy_destroy((struct wl_proxy *) wl_windowmanager);
+}
+
+static inline void
+wl_windowmanager_map_client_to_process(struct wl_windowmanager *wl_windowmanager, uint32_t processid)
+{
+ wl_proxy_marshal((struct wl_proxy *) wl_windowmanager,
+ WL_WINDOWMANAGER_MAP_CLIENT_TO_PROCESS, processid);
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
new file mode 100644
index 0000000000..b93e6d2f70
--- /dev/null
+++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.cpp
@@ -0,0 +1,85 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qwaylandwindowmanagerintegration.h"
+#include "qwaylandwindowmanager-client-protocol.h"
+
+#include <stdint.h>
+
+QWaylandWindowManagerIntegration *QWaylandWindowManagerIntegration::createIntegration(QWaylandDisplay *waylandDisplay)
+{
+ return new QWaylandWindowManagerIntegration(waylandDisplay);
+}
+
+QWaylandWindowManagerIntegration::QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay)
+ : mWaylandDisplay(waylandDisplay)
+ , mWaylandWindowManager(0)
+{
+ wl_display_add_global_listener(mWaylandDisplay->wl_display(),
+ QWaylandWindowManagerIntegration::wlHandleListenerGlobal,
+ this);
+}
+
+QWaylandWindowManagerIntegration::~QWaylandWindowManagerIntegration()
+{
+
+}
+
+struct wl_windowmanager *QWaylandWindowManagerIntegration::windowManager() const
+{
+ return mWaylandWindowManager;
+}
+
+void QWaylandWindowManagerIntegration::wlHandleListenerGlobal(wl_display *display, uint32_t id, const char *interface,
+ uint32_t version, void *data)
+{
+ if (strcmp(interface, "wl_windowmanager") == 0) {
+ QWaylandWindowManagerIntegration *integration = static_cast<QWaylandWindowManagerIntegration *>(data);
+ integration->mWaylandWindowManager = wl_windowmanager_create(display,id, version);
+ }
+}
+
+void QWaylandWindowManagerIntegration::mapClientToProcess(long long processId)
+{
+ if (mWaylandWindowManager)
+ wl_windowmanager_map_client_to_process(mWaylandWindowManager, (uint32_t) processId);
+}
+
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h
new file mode 100644
index 0000000000..01a7bdd960
--- /dev/null
+++ b/src/plugins/platforms/wayland/windowmanager_integration/qwaylandwindowmanagerintegration.h
@@ -0,0 +1,69 @@
+/****************************************************************************
+**
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QWAYLANDWINDOWMANAGERINTEGRATION_H
+#define QWAYLANDWINDOWMANAGERINTEGRATION_H
+
+#include <QObject>
+#include "wayland-client.h"
+#include "qwaylanddisplay.h"
+
+class QWaylandWindowManagerIntegration
+{
+public:
+ explicit QWaylandWindowManagerIntegration(QWaylandDisplay *waylandDisplay);
+ virtual ~QWaylandWindowManagerIntegration();
+ static QWaylandWindowManagerIntegration *createIntegration(QWaylandDisplay *waylandDisplay);
+ struct wl_windowmanager *windowManager() const;
+
+ void mapSurfaceToProcess(struct wl_surface *surface, long long processId);
+ void mapClientToProcess(long long processId);
+
+private:
+ static void wlHandleListenerGlobal(wl_display *display, uint32_t id,
+ const char *interface, uint32_t version, void *data);
+
+private:
+ QWaylandDisplay *mWaylandDisplay;
+ struct wl_windowmanager *mWaylandWindowManager;
+};
+
+#endif // QWAYLANDWINDOWMANAGERINTEGRATION_H
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c
new file mode 100644
index 0000000000..48049d8571
--- /dev/null
+++ b/src/plugins/platforms/wayland/windowmanager_integration/wayland-windowmanager-protocol.c
@@ -0,0 +1,36 @@
+/*
+ * Copyright © 2010 Kristian Høgsberg
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission. The copyright holders make no representations
+ * about the suitability of this software for any purpose. It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+
+#include <stdlib.h>
+#include <stdint.h>
+#include "wayland-util.h"
+
+static const struct wl_message wl_windowmanager_requests[] = {
+ { "map_client_to_process", "u", NULL },
+};
+
+WL_EXPORT const struct wl_interface wl_windowmanager_interface = {
+ "wl_windowmanager", 1,
+ ARRAY_LENGTH(wl_windowmanager_requests), wl_windowmanager_requests,
+ 0, NULL,
+};
diff --git a/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri
new file mode 100644
index 0000000000..a28218272d
--- /dev/null
+++ b/src/plugins/platforms/wayland/windowmanager_integration/windowmanager_integration.pri
@@ -0,0 +1,16 @@
+DEFINES += QT_WAYLAND_WINDOWMANAGER_SUPPORT
+
+contains(DEFINES, QT_WAYLAND_WINDOWMANAGER_SUPPORT) {
+
+ HEADERS += \
+ $$PWD/qwaylandwindowmanager-client-protocol.h \
+ $$PWD/qwaylandwindowmanagerintegration.h
+
+ SOURCES += \
+ $$PWD/qwaylandwindowmanagerintegration.cpp \
+ $$PWD/wayland-windowmanager-protocol.c
+
+}
+
+
+
diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp
index 074fdafe87..2a7594ee9b 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindow.cpp
@@ -140,8 +140,9 @@ void QXcbWindow::create()
xcb_parent_id = static_cast<QXcbWindow *>(parent())->xcb_window();
#if defined(XCB_USE_GLX) || defined(XCB_USE_EGL)
- if (window()->surfaceType() == QWindow::OpenGLSurface
+ if ((window()->surfaceType() == QWindow::OpenGLSurface
&& QGuiApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL))
+ || window()->requestedWindowFormat().hasAlpha())
{
#if defined(XCB_USE_GLX)
XVisualInfo *visualInfo = qglx_findVisualInfo(DISPLAY_FROM_XCB(m_screen),m_screen->screenNumber(), window()->requestedWindowFormat());
@@ -159,13 +160,17 @@ void QXcbWindow::create()
visualInfo = XGetVisualInfo(DISPLAY_FROM_XCB(this), VisualIDMask, &visualInfoTemplate, &matchingCount);
#endif //XCB_USE_GLX
if (visualInfo) {
+ m_depth = visualInfo->depth;
+ m_format = (m_depth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
Colormap cmap = XCreateColormap(DISPLAY_FROM_XCB(this), xcb_parent_id, visualInfo->visual, AllocNone);
XSetWindowAttributes a;
+ a.background_pixel = WhitePixel(DISPLAY_FROM_XCB(this), m_screen->screenNumber());
+ a.border_pixel = BlackPixel(DISPLAY_FROM_XCB(this), m_screen->screenNumber());
a.colormap = cmap;
m_window = XCreateWindow(DISPLAY_FROM_XCB(this), xcb_parent_id, rect.x(), rect.y(), rect.width(), rect.height(),
0, visualInfo->depth, InputOutput, visualInfo->visual,
- CWColormap, &a);
+ CWBackPixel|CWBorderPixel|CWColormap, &a);
printf("created GL window: %x\n", m_window);
} else {
@@ -175,6 +180,8 @@ void QXcbWindow::create()
#endif //defined(XCB_USE_GLX) || defined(XCB_USE_EGL)
{
m_window = xcb_generate_id(xcb_connection());
+ m_depth = m_screen->screen()->root_depth;
+ m_format = (m_depth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
Q_XCB_CALL(xcb_create_window(xcb_connection(),
XCB_COPY_FROM_PARENT, // depth -- same as root
diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h
index a6ca3de565..ec6fe95dd8 100644
--- a/src/plugins/platforms/xcb/qxcbwindow.h
+++ b/src/plugins/platforms/xcb/qxcbwindow.h
@@ -44,6 +44,7 @@
#include <QtGui/QPlatformWindow>
#include <QtGui/QWindowFormat>
+#include <QtGui/QImage>
#include <xcb/xcb.h>
#include <xcb/sync.h>
@@ -76,6 +77,8 @@ public:
QPlatformGLContext *glContext() const;
xcb_window_t xcb_window() const { return m_window; }
+ uint depth() const { return m_depth; }
+ QImage::Format format() const { return m_format; }
void handleExposeEvent(const xcb_expose_event_t *event);
void handleClientMessageEvent(const xcb_client_message_event_t *event);
@@ -116,6 +119,9 @@ private:
xcb_window_t m_window;
QPlatformGLContext *m_context;
+ uint m_depth;
+ QImage::Format m_format;
+
xcb_sync_int64_t m_syncValue;
xcb_sync_counter_t m_syncCounter;
diff --git a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
index a371d2dd06..07b3763ff0 100644
--- a/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
+++ b/src/plugins/platforms/xcb/qxcbwindowsurface.cpp
@@ -54,11 +54,12 @@
#include <stdio.h>
#include <qdebug.h>
+#include <qpainter.h>
class QXcbShmImage : public QXcbObject
{
public:
- QXcbShmImage(QXcbScreen *connection, const QSize &size);
+ QXcbShmImage(QXcbScreen *connection, const QSize &size, uint depth, QImage::Format format);
~QXcbShmImage() { destroy(); }
QImage *image() { return &m_qimage; }
@@ -81,7 +82,7 @@ private:
QRegion m_dirty;
};
-QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size)
+QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size, uint depth, QImage::Format format)
: QXcbObject(screen->connection())
, m_gc(0)
, m_gc_window(0)
@@ -91,7 +92,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size)
size.width(),
size.height(),
XCB_IMAGE_FORMAT_Z_PIXMAP,
- screen->depth(),
+ depth,
0,
~0,
0);
@@ -111,7 +112,7 @@ QXcbShmImage::QXcbShmImage(QXcbScreen *screen, const QSize &size)
if (shmctl(m_shm_info.shmid, IPC_RMID, 0) == -1)
qWarning() << "QXcbWindowSurface: Error while marking the shared memory segment to be destroyed";
- m_qimage = QImage( (uchar*) m_xcb_image->data, m_xcb_image->width, m_xcb_image->height, m_xcb_image->stride, screen->format());
+ m_qimage = QImage( (uchar*) m_xcb_image->data, m_xcb_image->width, m_xcb_image->height, m_xcb_image->stride, format);
}
void QXcbShmImage::destroy()
@@ -189,6 +190,16 @@ QPaintDevice *QXcbWindowSurface::paintDevice()
void QXcbWindowSurface::beginPaint(const QRegion &region)
{
m_image->preparePaint(region);
+
+ if (m_image->image()->hasAlphaChannel()) {
+ QPainter p(m_image->image());
+ p.setCompositionMode(QPainter::CompositionMode_Source);
+ const QVector<QRect> rects = region.rects();
+ const QColor blank = Qt::transparent;
+ for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
+ p.fillRect(*it, blank);
+ }
+ }
}
void QXcbWindowSurface::endPaint(const QRegion &)
@@ -229,9 +240,10 @@ void QXcbWindowSurface::resize(const QSize &size)
QWindowSurface::resize(size);
QXcbScreen *screen = static_cast<QXcbScreen *>(QPlatformScreen::platformScreenForWindow(window()));
+ QXcbWindow* win = static_cast<QXcbWindow *>(window()->handle());
delete m_image;
- m_image = new QXcbShmImage(screen, size);
+ m_image = new QXcbShmImage(screen, size, win->depth(), win->format());
Q_XCB_NOOP(connection());
m_syncingResize = true;
diff --git a/src/plugins/platforms/xlib/qxlibintegration.cpp b/src/plugins/platforms/xlib/qxlibintegration.cpp
index 78f907abd2..b0c8bc9560 100644
--- a/src/plugins/platforms/xlib/qxlibintegration.cpp
+++ b/src/plugins/platforms/xlib/qxlibintegration.cpp
@@ -150,7 +150,7 @@ bool QXlibIntegration::hasOpenGL() const
{
#if !defined(QT_NO_OPENGL)
#if !defined(QT_OPENGL_ES_2)
- QXlibScreen *screen = static_cast<const QXlibScreen *>(mScreens.at(0));
+ QXlibScreen *screen = static_cast<QXlibScreen *>(mScreens.at(0));
return glXQueryExtension(screen->display()->nativeDisplay(), 0, 0) != 0;
#else
static bool eglHasbeenInitialized = false;
diff --git a/src/plugins/platforms/xlib/qxlibscreen.cpp b/src/plugins/platforms/xlib/qxlibscreen.cpp
index 7c8a367373..920116a614 100644
--- a/src/plugins/platforms/xlib/qxlibscreen.cpp
+++ b/src/plugins/platforms/xlib/qxlibscreen.cpp
@@ -41,6 +41,8 @@
#include "qxlibscreen.h"
+#include <X11/extensions/Xfixes.h>
+
#include "qxlibcursor.h"
#include "qxlibwindow.h"
#include "qxlibkeyboard.h"
@@ -54,8 +56,6 @@
#include <private/qapplication_p.h>
-#include <X11/extensions/Xfixes.h>
-
QT_BEGIN_NAMESPACE
static int (*original_x_errhandler)(Display *dpy, XErrorEvent *);
@@ -201,7 +201,7 @@ QXlibScreen::QXlibScreen()
#ifndef DONT_USE_MIT_SHM
- Status MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay());
+ int MIT_SHM_extension_supported = XShmQueryExtension (mDisplay->nativeDisplay());
Q_ASSERT(MIT_SHM_extension_supported == True);
#endif
original_x_errhandler = XSetErrorHandler(qt_x_errhandler);
diff --git a/src/plugins/platforms/xlib/qxlibstatic.cpp b/src/plugins/platforms/xlib/qxlibstatic.cpp
index 61177812d5..7b562ea50d 100644
--- a/src/plugins/platforms/xlib/qxlibstatic.cpp
+++ b/src/plugins/platforms/xlib/qxlibstatic.cpp
@@ -51,10 +51,6 @@
#include <QDebug>
-#ifndef QT_NO_XFIXES
-#include <X11/extensions/Xfixes.h>
-#endif // QT_NO_XFIXES
-
static const char * x11_atomnames = {
// window-manager <-> client protocols
"WM_PROTOCOLS\0"
diff --git a/src/plugins/platforms/xlib/qxlibstatic.h b/src/plugins/platforms/xlib/qxlibstatic.h
index 8517de0bc2..fec2a16cdf 100644
--- a/src/plugins/platforms/xlib/qxlibstatic.h
+++ b/src/plugins/platforms/xlib/qxlibstatic.h
@@ -135,6 +135,7 @@ typedef char *XPointer;
#endif
#ifndef QT_NO_XFIXES
+#include <X11/extensions/Xfixes.h>
typedef Bool (*PtrXFixesQueryExtension)(Display *, int *, int *);
typedef Status (*PtrXFixesQueryVersion)(Display *, int *, int *);
typedef void (*PtrXFixesSetCursorName)(Display *dpy, Cursor cursor, const char *name);
diff --git a/src/plugins/platforms/xlib/qxlibwindow.cpp b/src/plugins/platforms/xlib/qxlibwindow.cpp
index 9a05fc620d..50ea7b58e4 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindow.cpp
@@ -47,14 +47,6 @@
#include "qxlibstatic.h"
#include "qxlibdisplay.h"
-#include <QtGui/QWindowSystemInterface>
-#include <QSocketNotifier>
-#include <QApplication>
-#include <QDebug>
-
-#include <QtGui/private/qwindowsurface_p.h>
-#include <QtGui/private/qapplication_p.h>
-
#if !defined(QT_NO_OPENGL)
#if !defined(QT_OPENGL_ES_2)
#include "qglxintegration.h"
@@ -66,6 +58,15 @@
#endif //QT_OPENGL_ES_2
#endif //QT_NO_OPENGL
+
+#include <QtGui/QWindowSystemInterface>
+#include <QSocketNotifier>
+#include <QApplication>
+#include <QDebug>
+
+#include <QtGui/private/qwindowsurface_p.h>
+#include <QtGui/private/qapplication_p.h>
+
//#define MYX11_DEBUG
QT_BEGIN_NAMESPACE
@@ -80,9 +81,10 @@ QXlibWindow::QXlibWindow(QWidget *window)
int w = window->width();
int h = window->height();
- if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL
- && QApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL) ) {
#if !defined(QT_NO_OPENGL)
+ if(window->platformWindowFormat().windowApi() == QPlatformWindowFormat::OpenGL
+ && QApplicationPrivate::platformIntegration()->hasCapability(QPlatformIntegration::OpenGL)
+ || window->platformWindowFormat().alpha()) {
#if !defined(QT_OPENGL_ES_2)
XVisualInfo *visualInfo = qglx_findVisualInfo(mScreen->display()->nativeDisplay(),mScreen->xScreenNumber(),window->platformWindowFormat());
#else
@@ -101,18 +103,28 @@ QXlibWindow::QXlibWindow(QWidget *window)
visualInfo = XGetVisualInfo(mScreen->display()->nativeDisplay(), VisualIDMask, &visualInfoTemplate, &matchingCount);
#endif //!defined(QT_OPENGL_ES_2)
if (visualInfo) {
- Colormap cmap = XCreateColormap(mScreen->display()->nativeDisplay(),mScreen->rootWindow(),visualInfo->visual,AllocNone);
+ mDepth = visualInfo->depth;
+ mFormat = (mDepth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
+ mVisual = visualInfo->visual;
+ Colormap cmap = XCreateColormap(mScreen->display()->nativeDisplay(), mScreen->rootWindow(), visualInfo->visual, AllocNone);
XSetWindowAttributes a;
+ a.background_pixel = WhitePixel(mScreen->display()->nativeDisplay(), mScreen->xScreenNumber());
+ a.border_pixel = BlackPixel(mScreen->display()->nativeDisplay(), mScreen->xScreenNumber());
a.colormap = cmap;
x_window = XCreateWindow(mScreen->display()->nativeDisplay(), mScreen->rootWindow(),x, y, w, h,
0, visualInfo->depth, InputOutput, visualInfo->visual,
- CWColormap, &a);
+ CWBackPixel|CWBorderPixel|CWColormap, &a);
} else {
qFatal("no window!");
}
+ } else
#endif //!defined(QT_NO_OPENGL)
- } else {
+ {
+ mDepth = mScreen->depth();
+ mFormat = (mDepth == 32) ? QImage::Format_ARGB32_Premultiplied : QImage::Format_RGB32;
+ mVisual = mScreen->defaultVisual();
+
x_window = XCreateSimpleWindow(mScreen->display()->nativeDisplay(), mScreen->rootWindow(),
x, y, w, h, 0 /*border_width*/,
mScreen->blackPixel(), mScreen->whitePixel());
diff --git a/src/plugins/platforms/xlib/qxlibwindow.h b/src/plugins/platforms/xlib/qxlibwindow.h
index 08694a5026..2d11224c23 100644
--- a/src/plugins/platforms/xlib/qxlibwindow.h
+++ b/src/plugins/platforms/xlib/qxlibwindow.h
@@ -122,6 +122,10 @@ public:
Window xWindow() const;
GC graphicsContext() const;
+ inline uint depth() const { return mDepth; }
+ QImage::Format format() const { return mFormat; }
+ Visual* visual() const { return mVisual; }
+
protected:
QVector<Atom> getNetWmState() const;
void setMWMHints(const QXlibMWMHints &mwmhints);
@@ -135,6 +139,10 @@ private:
Window x_window;
GC gc;
+ uint mDepth;
+ QImage::Format mFormat;
+ Visual* mVisual;
+
GC createGC();
QPlatformGLContext *mGLContext;
diff --git a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
index 513f10dc6a..a917f452e8 100644
--- a/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
+++ b/src/plugins/platforms/xlib/qxlibwindowsurface.cpp
@@ -49,6 +49,8 @@
#include "qxlibscreen.h"
#include "qxlibdisplay.h"
+#include "qpainter.h"
+
# include <sys/ipc.h>
# include <sys/shm.h>
# include <X11/extensions/XShm.h>
@@ -80,20 +82,19 @@ void QXlibShmImageInfo::destroy()
void QXlibWindowSurface::resizeShmImage(int width, int height)
{
+ QXlibScreen *screen = QXlibScreen::testLiteScreenForWidget(window());
+ QXlibWindow *win = static_cast<QXlibWindow*>(window()->platformWindow());
#ifdef DONT_USE_MIT_SHM
- shm_img = QImage(width, height, QImage::Format_RGB32);
+ shm_img = QImage(width, height, win->format());
#else
- QXlibScreen *screen = QXlibScreen::testLiteScreenForWidget(window());
if (image_info)
image_info->destroy();
else
image_info = new QXlibShmImageInfo(screen->display()->nativeDisplay());
- Visual *visual = screen->defaultVisual();
-
- XImage *image = XShmCreateImage (screen->display()->nativeDisplay(), visual, 24, ZPixmap, 0,
+ XImage *image = XShmCreateImage (screen->display()->nativeDisplay(), win->visual(), win->depth(), ZPixmap, 0,
&image_info->shminfo, width, height);
@@ -109,7 +110,7 @@ void QXlibWindowSurface::resizeShmImage(int width, int height)
Q_ASSERT(shm_attach_status == True);
- shm_img = QImage( (uchar*) image->data, image->width, image->height, image->bytes_per_line, QImage::Format_RGB32 );
+ shm_img = QImage( (uchar*) image->data, image->width, image->height, image->bytes_per_line, win->format() );
#endif
painted = false;
}
@@ -160,11 +161,11 @@ void QXlibWindowSurface::flush(QWidget *widget, const QRegion &region, const QPo
#ifdef DONT_USE_MIT_SHM
// just convert the image every time...
if (!shm_img.isNull()) {
- Visual *visual = DefaultVisual(screen->display(), screen->xScreenNumber());
+ QXlibWindow *win = static_cast<QXlibWindow*>(window()->platformWindow());
QImage image = shm_img;
//img.convertToFormat(
- XImage *xi = XCreateImage(screen->display(), visual, 24, ZPixmap,
+ XImage *xi = XCreateImage(screen->display(), win->visual(), win->depth(), ZPixmap,
0, (char *) image.scanLine(0), image.width(), image.height(),
32, image.bytesPerLine());
@@ -214,6 +215,16 @@ void QXlibWindowSurface::beginPaint(const QRegion &region)
{
Q_UNUSED(region);
resizeBuffer(size());
+
+ if (shm_img.hasAlphaChannel()) {
+ QPainter p(&shm_img);
+ p.setCompositionMode(QPainter::CompositionMode_Source);
+ const QVector<QRect> rects = region.rects();
+ const QColor blank = Qt::transparent;
+ for (QVector<QRect>::const_iterator it = rects.begin(); it != rects.end(); ++it) {
+ p.fillRect(*it, blank);
+ }
+ }
}
void QXlibWindowSurface::endPaint(const QRegion &region)
diff --git a/src/qbase.pri b/src/qbase.pri
index 03f85cf931..cf02978853 100644
--- a/src/qbase.pri
+++ b/src/qbase.pri
@@ -174,7 +174,7 @@ contains(QT_PRODUCT, OpenSource.*):DEFINES *= QT_OPENSOURCE
DEFINES *= QT_NO_CAST_TO_ASCII QT_ASCII_CAST_WARNINGS
contains(QT_CONFIG, gui-qt3support):DEFINES *= QT3_SUPPORT
DEFINES *= QT_MOC_COMPAT #we don't need warnings from calling moc code in our generated code
-DEFINES *= QT_USE_FAST_OPERATOR_PLUS QT_USE_FAST_CONCATENATION
+DEFINES *= QT_USE_QSTRINGBUILDER
TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
diff --git a/src/uitools/quiloader.cpp b/src/uitools/quiloader.cpp
index 6270e35d54..7950901055 100644
--- a/src/uitools/quiloader.cpp
+++ b/src/uitools/quiloader.cpp
@@ -653,7 +653,7 @@ QUiLoader::~QUiLoader()
Loads a form from the given \a device and creates a new widget with the
given \a parentWidget to hold its contents.
- \sa createWidget()
+ \sa createWidget(), errorString()
*/
QWidget *QUiLoader::load(QIODevice *device, QWidget *parentWidget)
{
@@ -936,6 +936,19 @@ bool QUiLoader::isTranslationEnabled() const
return d->builder.trEnabled;
}
+/*!
+ Returns a human-readable description of the last error occurred in load().
+
+ \since 5.0
+ \sa load()
+*/
+
+QString QUiLoader::errorString() const
+{
+ Q_D(const QUiLoader);
+ return d->builder.errorString();
+}
+
QT_END_NAMESPACE
#include "quiloader.moc"
diff --git a/src/uitools/quiloader.h b/src/uitools/quiloader.h
index 214342ef83..0c21a276ee 100644
--- a/src/uitools/quiloader.h
+++ b/src/uitools/quiloader.h
@@ -90,6 +90,8 @@ public:
void setTranslationEnabled(bool enabled);
bool isTranslationEnabled() const;
+ QString errorString() const;
+
private:
QScopedPointer<QUiLoaderPrivate> d_ptr;
Q_DECLARE_PRIVATE(QUiLoader)
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 6721fdbb6a..02487679bf 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -96,6 +96,12 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
win->setWindowFlags(data.window_flags);
win->setGeometry(q->geometry());
+ if (q->testAttribute(Qt::WA_TranslucentBackground)) {
+ QWindowFormat format = win->requestedWindowFormat();
+ format.setAlphaBufferSize(8);
+ win->setWindowFormat(format);
+ }
+
if (QWidget *nativeParent = q->nativeParentWidget()) {
if (nativeParent->windowHandle())
win->setParent(nativeParent->windowHandle());
@@ -396,6 +402,7 @@ void QWidgetPrivate::show_sys()
surface->resize(geomRect.size());
}
}
+
if (window)
window->setVisible(true);
}
diff --git a/src/widgets/platforms/x11/qapplication_x11.cpp b/src/widgets/platforms/x11/qapplication_x11.cpp
index 20542ea328..d1f9eb1b8a 100644
--- a/src/widgets/platforms/x11/qapplication_x11.cpp
+++ b/src/widgets/platforms/x11/qapplication_x11.cpp
@@ -1740,8 +1740,8 @@ void qt_init(QApplicationPrivate *priv, int,
} else {
// Qt controls everything (default)
- if (QApplication::testAttribute(Qt::AA_X11InitThreads))
- XInitThreads();
+ // With the threaded QML renderer, we always need this.
+ XInitThreads();
// Set application name and class
char *app_class = 0;
diff --git a/tests/arthur/common/common.pro b/tests/arthur/common/common.pro
index 9510f87f06..2a1f8f04fb 100644
--- a/tests/arthur/common/common.pro
+++ b/tests/arthur/common/common.pro
@@ -6,7 +6,7 @@
#include(../arthurtester.pri)
#TEMPLATE = lib
#CONFIG += static
-#QT += xml opengl svg qt3support
+#QT += xml opengl svg
#build_all:!build_pass {
# CONFIG -= build_all
diff --git a/tests/arthur/common/paintcommands.cpp b/tests/arthur/common/paintcommands.cpp
index 9273142905..a6762082cb 100644
--- a/tests/arthur/common/paintcommands.cpp
+++ b/tests/arthur/common/paintcommands.cpp
@@ -49,10 +49,6 @@
#include <qtextlayout.h>
#include <qdebug.h>
-#ifdef QT3_SUPPORT
-#include <q3painter.h>
-#endif
-
#ifndef QT_NO_OPENGL
#include <qglpixelbuffer.h>
#endif
@@ -364,33 +360,6 @@ void PaintCommands::staticInit()
"^gradient_setCoordinateMode\\s+(\\w*)$",
"gradient_setCoordinateMode <coordinate method enum>",
"gradient_setCoordinateMode ObjectBoundingMode");
-#ifdef QT3_SUPPORT
- DECL_PAINTCOMMANDSECTION("qt3 drawing ops");
- DECL_PAINTCOMMAND("qt3_drawArc", command_qt3_drawArc,
- "^qt3_drawArc\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
- "qt3_drawArc <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
- "qt3_drawArc 10 10 20 20 0 5760");
- DECL_PAINTCOMMAND("qt3_drawChord", command_qt3_drawChord,
- "^qt3_drawChord\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
- "qt3_drawChord <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
- "qt3_drawChord 10 10 20 20 0 5760");
- DECL_PAINTCOMMAND("qt3_drawEllipse", command_qt3_drawEllipse,
- "^qt3_drawEllipse\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
- "qt3_drawEllipse <x> <y> <w> <h>",
- "qt3_drawEllipse 10 10 20 20");
- DECL_PAINTCOMMAND("qt3_drawPie", command_qt3_drawPie,
- "^qt3_drawPie\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
- "qt3_drawPie <x> <y> <w> <h> <angleStart> <angleArc>\n - angles are expressed in 1/16th of degree",
- "qt3_drawPie 10 10 20 20 0 5760");
- DECL_PAINTCOMMAND("qt3_drawRect", command_qt3_drawRect,
- "^qt3_drawRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)$",
- "qt3_drawRect <x> <y> <w> <h>",
- "qt3_drawRect 10 10 20 20");
- DECL_PAINTCOMMAND("qt3_drawRoundRect", command_qt3_drawRoundRect,
- "^qt3_drawRoundRect\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s+(-?\\w*)\\s*(-?\\w)?\\s*(-?\\w)?$",
- "qt3_drawRoundRect <x> <y> <w> <h> [rx] [ry]",
- "qt3_drawRoundRect 10 10 20 20 3 3");
-#endif
DECL_PAINTCOMMANDSECTION("drawing ops");
DECL_PAINTCOMMAND("drawPoint", command_drawPoint,
"^drawPoint\\s+(-?[\\w.]*)\\s+(-?[\\w.]*)$",
@@ -1271,123 +1240,6 @@ void PaintCommands::command_drawArc(QRegExp re)
m_painter->drawArc(x, y, w, h, angle, sweep);
}
-#ifdef QT3_SUPPORT
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawRect(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawRect(%d, %d, %d, %d)\n", x, y, w, h);
-
- static_cast<Q3Painter*>(m_painter)->drawRect(x, y, w, h);
-#endif
-}
-
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawRoundRect(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
- int xrnd = caps.at(5).isEmpty() ? 25 : convertToInt(caps.at(5));
- int yrnd = caps.at(6).isEmpty() ? 25 : convertToInt(caps.at(6));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawRoundRect(%d, %d, %d, %d), %d, %d\n", x, y, w, h, xrnd, yrnd);
-
- static_cast<Q3Painter*>(m_painter)->drawRoundRect(x, y, w, h, xrnd, yrnd);
-#endif
-}
-
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawEllipse(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawEllipse(%d, %d, %d, %d)\n", x, y, w, h);
-
- static_cast<Q3Painter*>(m_painter)->drawEllipse(x, y, w, h);
-#endif
-}
-
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawPie(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
- int angle = convertToInt(caps.at(5));
- int sweep = convertToInt(caps.at(6));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawPie(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
-
- static_cast<Q3Painter*>(m_painter)->drawPie(x, y, w, h, angle, sweep);
-#endif
-}
-
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawChord(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
- int angle = convertToInt(caps.at(5));
- int sweep = convertToInt(caps.at(6));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawChord(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
-
- static_cast<Q3Painter*>(m_painter)->drawChord(x, y, w, h, angle, sweep);
-#endif
-}
-
-/***************************************************************************************************/
-void PaintCommands::command_qt3_drawArc(QRegExp re)
-{
- Q_UNUSED(re);
-#ifdef QT3_SUPPORT
- QStringList caps = re.capturedTexts();
- int x = convertToInt(caps.at(1));
- int y = convertToInt(caps.at(2));
- int w = convertToInt(caps.at(3));
- int h = convertToInt(caps.at(4));
- int angle = convertToInt(caps.at(5));
- int sweep = convertToInt(caps.at(6));
-
- if (m_verboseMode)
- printf(" -(lance) qt3_drawArc(%d, %d, %d, %d, %d, %d)\n", x, y, w, h, angle, sweep);
-
- static_cast<Q3Painter*>(m_painter)->drawArc(x, y, w, h, angle, sweep);
-#endif
-}
-#endif //QT3_SUPPORT
/***************************************************************************************************/
void PaintCommands::command_drawText(QRegExp re)
{
diff --git a/tests/arthur/common/paintcommands.h b/tests/arthur/common/paintcommands.h
index 08c0e25a7b..786ff64943 100644
--- a/tests/arthur/common/paintcommands.h
+++ b/tests/arthur/common/paintcommands.h
@@ -185,14 +185,6 @@ private:
void command_gradient_setCoordinateMode(QRegExp re);
// commands: drawing ops
-#ifdef QT3_SUPPORT
- void command_qt3_drawArc(QRegExp re);
- void command_qt3_drawChord(QRegExp re);
- void command_qt3_drawEllipse(QRegExp re);
- void command_qt3_drawPie(QRegExp re);
- void command_qt3_drawRect(QRegExp re);
- void command_qt3_drawRoundRect(QRegExp re);
-#endif
void command_drawArc(QRegExp re);
void command_drawChord(QRegExp re);
void command_drawConvexPolygon(QRegExp re);
diff --git a/tests/arthur/data/qps/sizes.qps b/tests/arthur/data/qps/sizes.qps
index 30f6557538..c585e5a01f 100644
--- a/tests/arthur/data/qps/sizes.qps
+++ b/tests/arthur/data/qps/sizes.qps
@@ -14,16 +14,6 @@ drawRect 120 0 16 16
drawRect 140 0 17 17
drawRect 160 0 18 18
drawRect 180 0 19 19
-qt3_drawRect 200 0 10 10
-qt3_drawRect 220 0 11 11
-qt3_drawRect 240 0 12 12
-qt3_drawRect 260 0 13 13
-qt3_drawRect 280 0 14 14
-qt3_drawRect 300 0 15 15
-qt3_drawRect 320 0 16 16
-qt3_drawRect 340 0 17 17
-qt3_drawRect 360 0 18 18
-qt3_drawRect 380 0 19 19
drawEllipse 0 20 10 10
drawEllipse 20 20 11 11
@@ -35,16 +25,6 @@ drawEllipse 120 20 16 16
drawEllipse 140 20 17 17
drawEllipse 160 20 18 18
drawEllipse 180 20 19 19
-qt3_drawEllipse 200 20 10 10
-qt3_drawEllipse 220 20 11 11
-qt3_drawEllipse 240 20 12 12
-qt3_drawEllipse 260 20 13 13
-qt3_drawEllipse 280 20 14 14
-qt3_drawEllipse 300 20 15 15
-qt3_drawEllipse 320 20 16 16
-qt3_drawEllipse 340 20 17 17
-qt3_drawEllipse 360 20 18 18
-qt3_drawEllipse 380 20 19 19
drawRoundRect 0 40 10 10
drawRoundRect 20 40 11 11
@@ -56,16 +36,6 @@ drawRoundRect 120 40 16 16
drawRoundRect 140 40 17 17
drawRoundRect 160 40 18 18
drawRoundRect 180 40 19 19
-qt3_drawRoundRect 200 40 10 10
-qt3_drawRoundRect 220 40 11 11
-qt3_drawRoundRect 240 40 12 12
-qt3_drawRoundRect 260 40 13 13
-qt3_drawRoundRect 280 40 14 14
-qt3_drawRoundRect 300 40 15 15
-qt3_drawRoundRect 320 40 16 16
-qt3_drawRoundRect 340 40 17 17
-qt3_drawRoundRect 360 40 18 18
-qt3_drawRoundRect 380 40 19 19
drawPie 0 60 10 10 0 4320
drawPie 20 60 11 11 0 4320
@@ -77,16 +47,6 @@ drawPie 120 60 16 16 0 4320
drawPie 140 60 17 17 0 4320
drawPie 160 60 18 18 0 4320
drawPie 180 60 19 19 0 4320
-qt3_drawPie 200 60 10 10 0 4320
-qt3_drawPie 220 60 11 11 0 4320
-qt3_drawPie 240 60 12 12 0 4320
-qt3_drawPie 260 60 13 13 0 4320
-qt3_drawPie 280 60 14 14 0 4320
-qt3_drawPie 300 60 15 15 0 4320
-qt3_drawPie 320 60 16 16 0 4320
-qt3_drawPie 340 60 17 17 0 4320
-qt3_drawPie 360 60 18 18 0 4320
-qt3_drawPie 380 60 19 19 0 4320
drawArc 0 80 10 10 0 4320
drawArc 20 80 11 11 0 4320
@@ -98,16 +58,6 @@ drawArc 120 80 16 16 0 4320
drawArc 140 80 17 17 0 4320
drawArc 160 80 18 18 0 4320
drawArc 180 80 19 19 0 4320
-qt3_drawArc 200 80 10 10 0 4320
-qt3_drawArc 220 80 11 11 0 4320
-qt3_drawArc 240 80 12 12 0 4320
-qt3_drawArc 260 80 13 13 0 4320
-qt3_drawArc 280 80 14 14 0 4320
-qt3_drawArc 300 80 15 15 0 4320
-qt3_drawArc 320 80 16 16 0 4320
-qt3_drawArc 340 80 17 17 0 4320
-qt3_drawArc 360 80 18 18 0 4320
-qt3_drawArc 380 80 19 19 0 4320
drawChord 0 100 10 10 0 4320
drawChord 20 100 11 11 0 4320
@@ -119,16 +69,6 @@ drawChord 120 100 16 16 0 4320
drawChord 140 100 17 17 0 4320
drawChord 160 100 18 18 0 4320
drawChord 180 100 19 19 0 4320
-qt3_drawChord 200 100 10 10 0 4320
-qt3_drawChord 220 100 11 11 0 4320
-qt3_drawChord 240 100 12 12 0 4320
-qt3_drawChord 260 100 13 13 0 4320
-qt3_drawChord 280 100 14 14 0 4320
-qt3_drawChord 300 100 15 15 0 4320
-qt3_drawChord 320 100 16 16 0 4320
-qt3_drawChord 340 100 17 17 0 4320
-qt3_drawChord 360 100 18 18 0 4320
-qt3_drawChord 380 100 19 19 0 4320
end_block
diff --git a/tests/arthur/datagenerator/datagenerator.pro b/tests/arthur/datagenerator/datagenerator.pro
index 9da6fcd5c5..2c320a3418 100644
--- a/tests/arthur/datagenerator/datagenerator.pro
+++ b/tests/arthur/datagenerator/datagenerator.pro
@@ -8,9 +8,8 @@ DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = ../bin
-QT += svg xml
+QT += svg xml core-private gui-private
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
-contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += datagenerator.h \
diff --git a/tests/arthur/htmlgenerator/htmlgenerator.pro b/tests/arthur/htmlgenerator/htmlgenerator.pro
index 4a1c8ba89b..4f5d5c8c16 100644
--- a/tests/arthur/htmlgenerator/htmlgenerator.pro
+++ b/tests/arthur/htmlgenerator/htmlgenerator.pro
@@ -9,9 +9,8 @@ DESTDIR = ../bin
CONFIG += console
-QT += svg xml
+QT += svg xml core-private gui-private
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
-contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += htmlgenerator.h
diff --git a/tests/arthur/lance/lance.pro b/tests/arthur/lance/lance.pro
index 56b7f25b81..8f3407cfc9 100644
--- a/tests/arthur/lance/lance.pro
+++ b/tests/arthur/lance/lance.pro
@@ -10,7 +10,6 @@ SOURCES += interactivewidget.cpp main.cpp
RESOURCES += icons.qrc
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
-contains(QT_CONFIG, qt3support):QT += qt3support
symbian*: {
testData.files = $$QT_BUILD_TREE/tests/arthur/data/qps
@@ -18,6 +17,6 @@ symbian*: {
DEPLOYMENT += testData
}
-QT += xml svg
+QT += xml svg core-private gui-private
diff --git a/tests/arthur/lance/main.cpp b/tests/arthur/lance/main.cpp
index 2bda932130..9e8e07f96d 100644
--- a/tests/arthur/lance/main.cpp
+++ b/tests/arthur/lance/main.cpp
@@ -137,14 +137,6 @@ static void displayCommands()
" drawText x y \"text\"\n"
" drawTiledPixmap pixmapfile x y width height sx sy\n"
"\n"
- "Compat functions for Qt 3:\n"
- " qt3_drawArc x y width height angle sweep\n"
- " qt3_drawChord x y width height angle sweep\n"
- " qt3_drawEllipse x y width height\n"
- " qt3_drawPie x y width height angle sweep\n"
- " qt3_drawRect x y width height\n"
- " qt3_drawRoundRect x y width height xfactor yfactor\n"
- "\n"
"Path commands:\n"
" path_addEllipse pathname x y width height\n"
" path_addPolygon pathname [ x1 y1 x2 y2 ... ] winding?\n"
diff --git a/tests/arthur/performancediff/performancediff.pro b/tests/arthur/performancediff/performancediff.pro
index 15d5ec5956..8c1fb98047 100644
--- a/tests/arthur/performancediff/performancediff.pro
+++ b/tests/arthur/performancediff/performancediff.pro
@@ -9,9 +9,8 @@ DESTDIR = ../bin
CONFIG += console
-QT += xml svg
+QT += xml svg core-private gui-private
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
-contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += performancediff.h
diff --git a/tests/arthur/shower/shower.pro b/tests/arthur/shower/shower.pro
index c02ded0865..f4f8d47809 100644
--- a/tests/arthur/shower/shower.pro
+++ b/tests/arthur/shower/shower.pro
@@ -7,9 +7,8 @@ DEPENDPATH += .
INCLUDEPATH += .
DESTDIR = ../bin
-QT += xml svg
+QT += xml svg core-private gui-private
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2):QT += opengl
-contains(QT_CONFIG, qt3support):QT += qt3support
# Input
HEADERS += shower.h
diff --git a/tests/auto/collections/tst_collections.cpp b/tests/auto/collections/tst_collections.cpp
index b1ea32629b..18a32fd486 100644
--- a/tests/auto/collections/tst_collections.cpp
+++ b/tests/auto/collections/tst_collections.cpp
@@ -100,10 +100,6 @@ void foo()
#include "qvector.h"
#include "qqueue.h"
-#ifdef QT3_SUPPORT
-#include "q3cleanuphandler.h"
-#endif
-
template class QList<int>;
//TESTED_FILES=
@@ -133,7 +129,6 @@ private slots:
void cache();
void regexp();
void pair();
- void cleanupHandler();
void sharableQList();
void sharableQLinkedList();
void sharableQVector();
@@ -2191,14 +2186,7 @@ void tst_Collections::qstring()
QVERIFY(s.toLatin1() == "first");
s = "second";
QVERIFY(s.toLatin1() == "second");
-#ifdef QT3_SUPPORT
- const char* cache = s.latin1();
- QVERIFY(cache == s.latin1());
-#endif
s.clear();
-#ifdef QT3_SUPPORT
- QVERIFY(*s.latin1() == '\0');
-#endif
QVERIFY(s.isNull());
QVERIFY(s.toLatin1().size() == 0);
QVERIFY(s.toLatin1().isEmpty());
@@ -2208,14 +2196,7 @@ void tst_Collections::qstring()
QVERIFY(s.toUtf8() == "first-utf8");
s = "second-utf8";
QVERIFY(s.toUtf8() == "second-utf8");
-#ifdef QT3_SUPPORT
- cache = s.utf8();
- QVERIFY(cache == s.utf8());
-#endif
s.clear();
-#ifdef QT3_SUPPORT
- QVERIFY(*s.utf8() == '\0');
-#endif
QVERIFY(s.isNull());
QVERIFY(s.toUtf8().size() == 0);
QVERIFY(s.toUtf8().isEmpty());
@@ -2225,14 +2206,7 @@ void tst_Collections::qstring()
QVERIFY(s.toUtf8() == "first-utf8");
s = "second-utf8";
QVERIFY(s.toUtf8() == "second-utf8");
-#ifdef QT3_SUPPORT
- cache = s.utf8();
- QVERIFY(cache == s.utf8());
-#endif
s.clear();
-#ifdef QT3_SUPPORT
- QVERIFY(*s.utf8() == '\0');
-#endif
QVERIFY(s.isNull());
QVERIFY(s.toUtf8().size() == 0);
QVERIFY(s.toUtf8().isEmpty());
@@ -2242,14 +2216,7 @@ void tst_Collections::qstring()
QVERIFY(s.toLocal8Bit() == "first-local8Bit");
s = "second-local8Bit";
QVERIFY(s.toLocal8Bit() == "second-local8Bit");
-#ifdef QT3_SUPPORT
- cache = s.local8Bit();
- QVERIFY(cache == s.local8Bit());
-#endif
s.clear();
-#ifdef QT3_SUPPORT
- QVERIFY(*s.local8Bit() == '\0');
-#endif
QVERIFY(s.isNull());
QVERIFY(s.toLocal8Bit().size() == 0);
QVERIFY(s.toLocal8Bit().isEmpty());
@@ -2258,14 +2225,7 @@ void tst_Collections::qstring()
QVERIFY(s.toAscii() == "first-ascii");
s = "second-ascii";
QVERIFY(s.toAscii() == "second-ascii");
-#ifdef QT3_SUPPORT
- cache = s.ascii();
- QVERIFY(cache == s.ascii());
-#endif
s.clear();
-#ifdef QT3_SUPPORT
- QVERIFY(*s.ascii() == '\0');
-#endif
QVERIFY(s.isNull());
QVERIFY(s.toAscii().size() == 0);
QVERIFY(s.toAscii().isEmpty());
@@ -2508,24 +2468,6 @@ void tst_Collections::pair()
QVERIFY(!(a > a || b > b || c > c || d > d || e > e));
}
-void tst_Collections::cleanupHandler()
-{
-#ifdef QT3_SUPPORT
- LargeStatic * f1 = 0;
- LargeStatic * f2 = 0;
- {
- Q3CleanupHandler<LargeStatic> cleanup;
- f1 = new LargeStatic;
- f2 = new LargeStatic;
- cleanup.add(&f1);
- cleanup.add(&f2);
- }
- QVERIFY(f1 == 0 && f2 == 0);
-#else
- QSKIP("No Qt3 support", SkipAll);
-#endif
-}
-
/*
These test that Java-style mutable iterators don't trash shared
copy (the setSharable() mechanism).
diff --git a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
index e7e516eddd..d167228b7b 100644
--- a/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
+++ b/tests/auto/exceptionsafety_objects/tst_exceptionsafety_objects.cpp
@@ -60,7 +60,7 @@ QT_USE_NAMESPACE
#include "3rdparty/memcheck.h"
#endif
-class tst_ExceptionSafetyObjects: public QObject
+class tst_ExceptionSafety_Objects: public QObject
{
Q_OBJECT
@@ -156,7 +156,7 @@ struct DirCreator : public AbstractTester
}
};
-void tst_ExceptionSafetyObjects::objects_data()
+void tst_ExceptionSafety_Objects::objects_data()
{
QTest::addColumn<AbstractTester *>("objectCreator");
@@ -164,12 +164,12 @@ void tst_ExceptionSafetyObjects::objects_data()
NEWROW(QObject);
NEWROW(QBuffer);
NEWROW(QFile);
+ NEWROW(QFSFileEngine);
NEWROW(QProcess);
NEWROW(QSettings);
NEWROW(QThread);
NEWROW(QThreadPool);
NEWROW(QTranslator);
- NEWROW(QFSFileEngine);
#define NEWROW2(T, CREATOR) QTest::newRow(#T) << static_cast<AbstractTester *>(new CREATOR)
NEWROW2(QBitArray, BitArrayCreator);
@@ -177,7 +177,6 @@ void tst_ExceptionSafetyObjects::objects_data()
NEWROW2(QCryptographicHash, CryptographicHashCreator);
NEWROW2(QDataStream, DataStreamCreator);
NEWROW2(QDir, DirCreator);
-
}
// create and destructs an object, and lets each and every allocation
@@ -274,9 +273,9 @@ public:
}
};
-QtMsgHandler tst_ExceptionSafetyObjects::testMessageHandler;
+QtMsgHandler tst_ExceptionSafety_Objects::testMessageHandler;
-void tst_ExceptionSafetyObjects::safeMessageHandler(QtMsgType type, const char *msg)
+void tst_ExceptionSafety_Objects::safeMessageHandler(QtMsgType type, const char *msg)
{
// this temporarily suspends OOM testing while handling a message
int currentIndex = mallocFailIndex;
@@ -301,7 +300,7 @@ void debugUnexpected()
(*defaultUnexpected)();
}
-void tst_ExceptionSafetyObjects::initTestCase()
+void tst_ExceptionSafety_Objects::initTestCase()
{
// set handlers for bad exception cases, you might want to step in and breakpoint the default handlers too
defaultTerminate = std::set_terminate(&debugTerminate);
@@ -345,17 +344,25 @@ void tst_ExceptionSafetyObjects::initTestCase()
QCOMPARE(malloc2Failed, 1);
}
-void tst_ExceptionSafetyObjects::cleanupTestCase()
+void tst_ExceptionSafety_Objects::cleanupTestCase()
{
qInstallMsgHandler(testMessageHandler);
}
-void tst_ExceptionSafetyObjects::objects()
+void tst_ExceptionSafety_Objects::objects()
{
+ QLatin1String tag = QLatin1String(QTest::currentDataTag());
+ if (tag == QLatin1String("QFile")
+ || tag == QLatin1String("QProcess")
+ || tag == QLatin1String("QSettings")
+ || tag == QLatin1String("QThread")
+ || tag == QLatin1String("QThreadPool"))
+ QSKIP("This type of object is not currently strongly exception safe", SkipSingle);
+
QFETCH(AbstractTester *, objectCreator);
doOOMTest(*objectCreator, 0);
-
+
delete objectCreator;
}
@@ -364,7 +371,8 @@ struct WidgetCreator : public AbstractTester
{
void operator()(QObject *parent)
{
- Q_ASSERT(!parent || parent->isWidgetType());
+ if (parent && !parent->isWidgetType())
+ qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO);
QScopedPointer<T> ptr(parent ? new T(static_cast<QWidget *>(parent)) : new T);
}
};
@@ -374,7 +382,8 @@ template <> struct WidgetCreator<QSizeGrip> : public AbstractTester
{
void operator()(QObject *parent)
{
- Q_ASSERT(!parent || parent->isWidgetType());
+ if (parent && !parent->isWidgetType())
+ qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO);
QScopedPointer<QSizeGrip> ptr(new QSizeGrip(static_cast<QWidget *>(parent)));
}
};
@@ -384,17 +393,18 @@ template <> struct WidgetCreator<QDesktopWidget> : public AbstractTester
{
void operator()(QObject *parent)
{
- Q_ASSERT(!parent || parent->isWidgetType());
+ if (parent && !parent->isWidgetType())
+ qFatal("%s: parent must be either null or a widget type", Q_FUNC_INFO);
QScopedPointer<QDesktopWidget> ptr(new QDesktopWidget());
}
};
-void tst_ExceptionSafetyObjects::widgets_data()
+void tst_ExceptionSafety_Objects::widgets_data()
{
#ifdef Q_OS_SYMBIAN
// Initialise the S60 rasteriser, which crashes if started while out of memory
- QImage image(20, 20, QImage::Format_RGB32);
- QPainter p(&image);
- p.drawText(0, 15, "foo");
+ QImage image(20, 20, QImage::Format_RGB32);
+ QPainter p(&image);
+ p.drawText(0, 15, "foo");
#endif
QTest::addColumn<AbstractTester *>("widgetCreator");
@@ -405,23 +415,27 @@ void tst_ExceptionSafetyObjects::widgets_data()
NEWROW(QWidget);
NEWROW(QButtonGroup);
- NEWROW(QDesktopWidget);
NEWROW(QCheckBox);
+ NEWROW(QColumnView);
NEWROW(QComboBox);
NEWROW(QCommandLinkButton);
NEWROW(QDateEdit);
NEWROW(QDateTimeEdit);
+ NEWROW(QDesktopWidget);
NEWROW(QDial);
NEWROW(QDoubleSpinBox);
NEWROW(QFocusFrame);
NEWROW(QFontComboBox);
NEWROW(QFrame);
NEWROW(QGroupBox);
- NEWROW(QLCDNumber);
NEWROW(QLabel);
NEWROW(QLCDNumber);
NEWROW(QLineEdit);
+ NEWROW(QListView);
+ NEWROW(QListWidget);
+ NEWROW(QMainWindow);
NEWROW(QMenu);
+ NEWROW(QMenuBar);
NEWROW(QPlainTextEdit);
NEWROW(QProgressBar);
NEWROW(QPushButton);
@@ -435,28 +449,58 @@ void tst_ExceptionSafetyObjects::widgets_data()
NEWROW(QStackedWidget);
NEWROW(QStatusBar);
NEWROW(QTabBar);
+ NEWROW(QTableView);
+ NEWROW(QTableWidget);
NEWROW(QTabWidget);
NEWROW(QTextBrowser);
NEWROW(QTextEdit);
NEWROW(QTimeEdit);
+ NEWROW(QToolBar);
NEWROW(QToolBox);
NEWROW(QToolButton);
- NEWROW(QStatusBar);
- NEWROW(QToolBar);
- NEWROW(QMenuBar);
- NEWROW(QMainWindow);
- NEWROW(QWorkspace);
- NEWROW(QColumnView);
- NEWROW(QListView);
- NEWROW(QListWidget);
- NEWROW(QTableView);
- NEWROW(QTableWidget);
NEWROW(QTreeView);
NEWROW(QTreeWidget);
+ NEWROW(QWorkspace);
}
-void tst_ExceptionSafetyObjects::widgets()
-{
+void tst_ExceptionSafety_Objects::widgets()
+{
+ QLatin1String tag = QLatin1String(QTest::currentDataTag());
+ if (tag == QLatin1String("QColumnView")
+ || tag == QLatin1String("QComboBox")
+ || tag == QLatin1String("QCommandLinkButton")
+ || tag == QLatin1String("QDateEdit")
+ || tag == QLatin1String("QDateTimeEdit")
+ || tag == QLatin1String("QDesktopWidget")
+ || tag == QLatin1String("QDoubleSpinBox")
+ || tag == QLatin1String("QFontComboBox")
+ || tag == QLatin1String("QGroupBox")
+ || tag == QLatin1String("QLineEdit")
+ || tag == QLatin1String("QListView")
+ || tag == QLatin1String("QListWidget")
+ || tag == QLatin1String("QMainWindow")
+ || tag == QLatin1String("QMenu")
+ || tag == QLatin1String("QMenuBar")
+ || tag == QLatin1String("QPlainTextEdit")
+ || tag == QLatin1String("QProgressBar")
+ || tag == QLatin1String("QPushButton")
+ || tag == QLatin1String("QScrollArea")
+ || tag == QLatin1String("QSpinBox")
+ || tag == QLatin1String("QStackedWidget")
+ || tag == QLatin1String("QStatusBar")
+ || tag == QLatin1String("QTableView")
+ || tag == QLatin1String("QTableWidget")
+ || tag == QLatin1String("QTabWidget")
+ || tag == QLatin1String("QTextBrowser")
+ || tag == QLatin1String("QTextEdit")
+ || tag == QLatin1String("QTimeEdit")
+ || tag == QLatin1String("QToolBar")
+ || tag == QLatin1String("QToolBox")
+ || tag == QLatin1String("QTreeView")
+ || tag == QLatin1String("QTreeWidget")
+ || tag == QLatin1String("QWorkspace"))
+ QSKIP("This type of widget is not currently strongly exception safe", SkipSingle);
+
QFETCH(AbstractTester *, widgetCreator);
doOOMTest(*widgetCreator, 0, 00000);
@@ -547,7 +591,9 @@ struct IntegerMoveable
};
int IntegerMoveable::instanceCount = 0;
+QT_BEGIN_NAMESPACE
Q_DECLARE_TYPEINFO(IntegerMoveable, Q_MOVABLE_TYPE);
+QT_END_NAMESPACE
template <typename T, template<typename> class Container>
void containerInsertTest(QObject*)
@@ -720,12 +766,12 @@ static void containerData()
QTest::newRow("erase moveable") << static_cast<TestFunction>(containerEraseTest<IntegerMoveable, Container>);
}
-void tst_ExceptionSafetyObjects::vector_data()
+void tst_ExceptionSafety_Objects::vector_data()
{
containerData<QVector>();
}
-void tst_ExceptionSafetyObjects::vector()
+void tst_ExceptionSafety_Objects::vector()
{
QFETCH(TestFunction, testFunction);
@@ -736,30 +782,30 @@ void tst_ExceptionSafetyObjects::vector()
doOOMTest(testFunction, 0);
}
-void tst_ExceptionSafetyObjects::list_data()
+void tst_ExceptionSafety_Objects::list_data()
{
containerData<QList>();
}
-void tst_ExceptionSafetyObjects::list()
+void tst_ExceptionSafety_Objects::list()
{
QFETCH(TestFunction, testFunction);
doOOMTest(testFunction, 0);
}
-void tst_ExceptionSafetyObjects::linkedList_data()
+void tst_ExceptionSafety_Objects::linkedList_data()
{
containerData<QLinkedList>();
}
-void tst_ExceptionSafetyObjects::linkedList()
+void tst_ExceptionSafety_Objects::linkedList()
{
QFETCH(TestFunction, testFunction);
doOOMTest(testFunction, 0);
}
-QTEST_MAIN(tst_ExceptionSafetyObjects)
+QTEST_MAIN(tst_ExceptionSafety_Objects)
#include "tst_exceptionsafety_objects.moc"
#endif // QT_NO_EXCEPTIONS
diff --git a/tests/auto/gestures/tst_gestures.cpp b/tests/auto/gestures/tst_gestures.cpp
index 7327a49169..d580c8bb91 100644
--- a/tests/auto/gestures/tst_gestures.cpp
+++ b/tests/auto/gestures/tst_gestures.cpp
@@ -280,7 +280,7 @@ protected:
eventsPtr->canceled << g->gestureType();
break;
default:
- Q_ASSERT(false);
+ qWarning() << "Unknown GestureState enum value:" << static_cast<int>(g->state());
}
}
} else if (event->type() == CustomEvent::EventType) {
@@ -823,7 +823,7 @@ public:
emit gestureCanceled(e->type(), g);
break;
default:
- Q_ASSERT(false);
+ qWarning() << "Unknown GestureState enum value:" << static_cast<int>(g->state());
}
}
} else if (event->type() == CustomEvent::EventType) {
@@ -1518,17 +1518,20 @@ void tst_Gestures::autoCancelGestures()
{
class MockWidget : public GestureWidget {
public:
- MockWidget(const char *name) : GestureWidget(name) { }
+ MockWidget(const char *name) : GestureWidget(name), badGestureEvents(0) { }
bool event(QEvent *event)
{
if (event->type() == QEvent::Gesture) {
QGestureEvent *ge = static_cast<QGestureEvent*>(event);
- Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here...
+ if (ge->gestures().count() != 1)
+ ++badGestureEvents; // event should contain exactly one gesture
ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext);
}
return GestureWidget::event(event);
}
+
+ int badGestureEvents;
};
const Qt::GestureType secondGesture = QGestureRecognizer::registerRecognizer(new CustomGestureRecognizer);
@@ -1563,22 +1566,26 @@ void tst_Gestures::autoCancelGestures()
event.serial = CustomGesture::SerialFinishedThreshold;
QApplication::sendEvent(child, &event);
QCOMPARE(parent.events.all.count(), 2);
+ QCOMPARE(parent.badGestureEvents, 0);
}
void tst_Gestures::autoCancelGestures2()
{
class MockItem : public GestureItem {
public:
- MockItem(const char *name) : GestureItem(name) { }
+ MockItem(const char *name) : GestureItem(name), badGestureEvents(0) { }
bool event(QEvent *event) {
if (event->type() == QEvent::Gesture) {
QGestureEvent *ge = static_cast<QGestureEvent*>(event);
- Q_ASSERT(ge->gestures().count() == 1); // can't use QCOMPARE here...
+ if (ge->gestures().count() != 1)
+ ++badGestureEvents; // event should contain exactly one gesture
ge->gestures().first()->setGestureCancelPolicy(QGesture::CancelAllInContext);
}
return GestureItem::event(event);
}
+
+ int badGestureEvents;
};
const Qt::GestureType secondGesture = QGestureRecognizer ::registerRecognizer(new CustomGestureRecognizer);
@@ -1614,6 +1621,7 @@ void tst_Gestures::autoCancelGestures2()
event.serial = CustomGesture::SerialFinishedThreshold;
scene.sendEvent(child, &event);
QCOMPARE(parent->events.all.count(), 2);
+ QCOMPARE(parent->badGestureEvents, 0);
}
void tst_Gestures::graphicsViewParentPropagation()
diff --git a/tests/auto/lancelot/scripts/sizes.qps b/tests/auto/lancelot/scripts/sizes.qps
index 268808ec09..68e01c3262 100644
--- a/tests/auto/lancelot/scripts/sizes.qps
+++ b/tests/auto/lancelot/scripts/sizes.qps
@@ -17,16 +17,6 @@ drawRect 120 0 16 16
drawRect 140 0 17 17
drawRect 160 0 18 18
drawRect 180 0 19 19
-# qt3_drawRect 200 0 10 10
-# qt3_drawRect 220 0 11 11
-# qt3_drawRect 240 0 12 12
-# qt3_drawRect 260 0 13 13
-# qt3_drawRect 280 0 14 14
-# qt3_drawRect 300 0 15 15
-# qt3_drawRect 320 0 16 16
-# qt3_drawRect 340 0 17 17
-# qt3_drawRect 360 0 18 18
-# qt3_drawRect 380 0 19 19
drawEllipse 0 20 10 10
drawEllipse 20 20 11 11
@@ -38,16 +28,6 @@ drawEllipse 120 20 16 16
drawEllipse 140 20 17 17
drawEllipse 160 20 18 18
drawEllipse 180 20 19 19
-# qt3_drawEllipse 200 20 10 10
-# qt3_drawEllipse 220 20 11 11
-# qt3_drawEllipse 240 20 12 12
-# qt3_drawEllipse 260 20 13 13
-# qt3_drawEllipse 280 20 14 14
-# qt3_drawEllipse 300 20 15 15
-# qt3_drawEllipse 320 20 16 16
-# qt3_drawEllipse 340 20 17 17
-# qt3_drawEllipse 360 20 18 18
-# qt3_drawEllipse 380 20 19 19
drawRoundRect 0 40 10 10
drawRoundRect 20 40 11 11
@@ -59,16 +39,6 @@ drawRoundRect 120 40 16 16
drawRoundRect 140 40 17 17
drawRoundRect 160 40 18 18
drawRoundRect 180 40 19 19
-# qt3_drawRoundRect 200 40 10 10
-# qt3_drawRoundRect 220 40 11 11
-# qt3_drawRoundRect 240 40 12 12
-# qt3_drawRoundRect 260 40 13 13
-# qt3_drawRoundRect 280 40 14 14
-# qt3_drawRoundRect 300 40 15 15
-# qt3_drawRoundRect 320 40 16 16
-# qt3_drawRoundRect 340 40 17 17
-# qt3_drawRoundRect 360 40 18 18
-# qt3_drawRoundRect 380 40 19 19
drawPie 0 60 10 10 0 4320
drawPie 20 60 11 11 0 4320
@@ -80,16 +50,6 @@ drawPie 120 60 16 16 0 4320
drawPie 140 60 17 17 0 4320
drawPie 160 60 18 18 0 4320
drawPie 180 60 19 19 0 4320
-# qt3_drawPie 200 60 10 10 0 4320
-# qt3_drawPie 220 60 11 11 0 4320
-# qt3_drawPie 240 60 12 12 0 4320
-# qt3_drawPie 260 60 13 13 0 4320
-# qt3_drawPie 280 60 14 14 0 4320
-# qt3_drawPie 300 60 15 15 0 4320
-# qt3_drawPie 320 60 16 16 0 4320
-# qt3_drawPie 340 60 17 17 0 4320
-# qt3_drawPie 360 60 18 18 0 4320
-# qt3_drawPie 380 60 19 19 0 4320
drawArc 0 80 10 10 0 4320
drawArc 20 80 11 11 0 4320
@@ -101,16 +61,6 @@ drawArc 120 80 16 16 0 4320
drawArc 140 80 17 17 0 4320
drawArc 160 80 18 18 0 4320
drawArc 180 80 19 19 0 4320
-# qt3_drawArc 200 80 10 10 0 4320
-# qt3_drawArc 220 80 11 11 0 4320
-# qt3_drawArc 240 80 12 12 0 4320
-# qt3_drawArc 260 80 13 13 0 4320
-# qt3_drawArc 280 80 14 14 0 4320
-# qt3_drawArc 300 80 15 15 0 4320
-# qt3_drawArc 320 80 16 16 0 4320
-# qt3_drawArc 340 80 17 17 0 4320
-# qt3_drawArc 360 80 18 18 0 4320
-# qt3_drawArc 380 80 19 19 0 4320
drawChord 0 100 10 10 0 4320
drawChord 20 100 11 11 0 4320
@@ -122,16 +72,6 @@ drawChord 120 100 16 16 0 4320
drawChord 140 100 17 17 0 4320
drawChord 160 100 18 18 0 4320
drawChord 180 100 19 19 0 4320
-# qt3_drawChord 200 100 10 10 0 4320
-# qt3_drawChord 220 100 11 11 0 4320
-# qt3_drawChord 240 100 12 12 0 4320
-# qt3_drawChord 260 100 13 13 0 4320
-# qt3_drawChord 280 100 14 14 0 4320
-# qt3_drawChord 300 100 15 15 0 4320
-# qt3_drawChord 320 100 16 16 0 4320
-# qt3_drawChord 340 100 17 17 0 4320
-# qt3_drawChord 360 100 18 18 0 4320
-# qt3_drawChord 380 100 19 19 0 4320
end_block
diff --git a/tests/auto/maketestselftest/tst_maketestselftest.cpp b/tests/auto/maketestselftest/tst_maketestselftest.cpp
index 9fbfd5a2c6..7069fdf3eb 100644
--- a/tests/auto/maketestselftest/tst_maketestselftest.cpp
+++ b/tests/auto/maketestselftest/tst_maketestselftest.cpp
@@ -348,7 +348,6 @@ QStringList tst_MakeTestSelfTest::find_subdirs(QString const& pro_file, FindSubd
<< "QT_CONFIG+=phonon"
<< "QT_CONFIG+=private_tests"
<< "QT_CONFIG+=pulseaudio"
- << "QT_CONFIG+=qt3support"
<< "QT_CONFIG+=script"
<< "QT_CONFIG+=svg"
<< "QT_CONFIG+=webkit"
diff --git a/tests/auto/moc/no-keywords.h b/tests/auto/moc/no-keywords.h
index 1ebc4062c2..bec39a1512 100644
--- a/tests/auto/moc/no-keywords.h
+++ b/tests/auto/moc/no-keywords.h
@@ -52,9 +52,6 @@
#include <QtNetwork/QtNetwork>
#include <QtSql/QtSql>
//#include <QtSvg>
-#if defined(QT3_SUPPORT)
-#include <Qt3Support>
-#endif
#if defined(WITH_DBUS)
#include <QtDBus>
#endif
diff --git a/tests/auto/modeltest/dynamictreemodel.cpp b/tests/auto/modeltest/dynamictreemodel.cpp
index fa634b6a5f..80708d440e 100644
--- a/tests/auto/modeltest/dynamictreemodel.cpp
+++ b/tests/auto/modeltest/dynamictreemodel.cpp
@@ -44,6 +44,7 @@
#include <QtCore/QHash>
#include <QtCore/QList>
#include <QtCore/QTimer>
+#include <QtCore/QDebug>
DynamicTreeModel::DynamicTreeModel(QObject *parent)
@@ -66,9 +67,11 @@ QModelIndex DynamicTreeModel::index(int row, int column, const QModelIndex &pare
const qint64 grandParent = findParentId(parent.internalId());
if (grandParent >= 0) {
QList<QList<qint64> > parentTable = m_childItems.value(grandParent);
- Q_ASSERT(parent.column() < parentTable.size());
+ if (parent.column() >= parentTable.size())
+ qFatal("%s: parent.column() must be less than parentTable.size()", Q_FUNC_INFO);
QList<qint64> parentSiblings = parentTable.at(parent.column());
- Q_ASSERT(parent.row() < parentSiblings.size());
+ if (parent.row() >= parentSiblings.size())
+ qFatal("%s: parent.row() must be less than parentSiblings.size()", Q_FUNC_INFO);
}
if (childIdColumns.size() == 0)
@@ -189,7 +192,8 @@ QModelIndex ModelChangeCommand::findIndex(QList<int> rows)
while (i.hasNext())
{
parent = m_model->index(i.next(), col, parent);
- Q_ASSERT(parent.isValid());
+ if (!parent.isValid())
+ qFatal("%s: parent must be valid", Q_FUNC_INFO);
}
return parent;
}
diff --git a/tests/auto/modeltest/modeltest.cpp b/tests/auto/modeltest/modeltest.cpp
index 98d707c8da..f60f86d09c 100644
--- a/tests/auto/modeltest/modeltest.cpp
+++ b/tests/auto/modeltest/modeltest.cpp
@@ -45,8 +45,6 @@
#include "modeltest.h"
#include <QtTest/QtTest>
-#undef Q_ASSERT
-#define Q_ASSERT QVERIFY
Q_DECLARE_METATYPE ( QModelIndex )
@@ -55,7 +53,8 @@ Q_DECLARE_METATYPE ( QModelIndex )
*/
ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false )
{
- Q_ASSERT ( model );
+ if (!model)
+ qFatal("%s: model must not be null", Q_FUNC_INFO);
connect ( model, SIGNAL ( columnsAboutToBeInserted ( const QModelIndex &, int, int ) ),
this, SLOT ( runAllTests() ) );
@@ -118,15 +117,15 @@ void ModelTest::runAllTests()
*/
void ModelTest::nonDestructiveBasicTest()
{
- Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() );
+ QVERIFY( model->buddy ( QModelIndex() ) == QModelIndex() );
model->canFetchMore ( QModelIndex() );
- Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 );
- Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() );
+ QVERIFY( model->columnCount ( QModelIndex() ) >= 0 );
+ QVERIFY( model->data ( QModelIndex() ) == QVariant() );
fetchingMore = true;
model->fetchMore ( QModelIndex() );
fetchingMore = false;
Qt::ItemFlags flags = model->flags ( QModelIndex() );
- Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 );
+ QVERIFY( flags == Qt::ItemIsDropEnabled || flags == 0 );
model->hasChildren ( QModelIndex() );
model->hasIndex ( 0, 0 );
model->headerData ( 0, Qt::Horizontal );
@@ -135,8 +134,8 @@ void ModelTest::nonDestructiveBasicTest()
QVariant cache;
model->match ( QModelIndex(), -1, cache );
model->mimeTypes();
- Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() );
- Q_ASSERT ( model->rowCount() >= 0 );
+ QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
+ QVERIFY( model->rowCount() >= 0 );
QVariant variant;
model->setData ( QModelIndex(), variant, -1 );
model->setHeaderData ( -1, Qt::Horizontal, QVariant() );
@@ -158,17 +157,17 @@ void ModelTest::rowCount()
// check top row
QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
int rows = model->rowCount ( topIndex );
- Q_ASSERT ( rows >= 0 );
+ QVERIFY( rows >= 0 );
if ( rows > 0 )
- Q_ASSERT ( model->hasChildren ( topIndex ) == true );
+ QVERIFY( model->hasChildren ( topIndex ) );
QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex );
if ( secondLevelIndex.isValid() ) { // not the top level
// check a row count where parent is valid
rows = model->rowCount ( secondLevelIndex );
- Q_ASSERT ( rows >= 0 );
+ QVERIFY( rows >= 0 );
if ( rows > 0 )
- Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true );
+ QVERIFY( model->hasChildren ( secondLevelIndex ) );
}
// The models rowCount() is tested more extensively in checkChildren(),
@@ -182,12 +181,12 @@ void ModelTest::columnCount()
{
// check top row
QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
- Q_ASSERT ( model->columnCount ( topIndex ) >= 0 );
+ QVERIFY( model->columnCount ( topIndex ) >= 0 );
// check a column count where parent is valid
QModelIndex childIndex = model->index ( 0, 0, topIndex );
if ( childIndex.isValid() )
- Q_ASSERT ( model->columnCount ( childIndex ) >= 0 );
+ QVERIFY( model->columnCount ( childIndex ) >= 0 );
// columnCount() is tested more extensively in checkChildren(),
// but this catches the big mistakes
@@ -200,19 +199,19 @@ void ModelTest::hasIndex()
{
// qDebug() << "hi";
// Make sure that invalid values returns an invalid index
- Q_ASSERT ( model->hasIndex ( -2, -2 ) == false );
- Q_ASSERT ( model->hasIndex ( -2, 0 ) == false );
- Q_ASSERT ( model->hasIndex ( 0, -2 ) == false );
+ QVERIFY( !model->hasIndex ( -2, -2 ) );
+ QVERIFY( !model->hasIndex ( -2, 0 ) );
+ QVERIFY( !model->hasIndex ( 0, -2 ) );
int rows = model->rowCount();
int columns = model->columnCount();
// check out of bounds
- Q_ASSERT ( model->hasIndex ( rows, columns ) == false );
- Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false );
+ QVERIFY( !model->hasIndex ( rows, columns ) );
+ QVERIFY( !model->hasIndex ( rows + 1, columns + 1 ) );
if ( rows > 0 )
- Q_ASSERT ( model->hasIndex ( 0, 0 ) == true );
+ QVERIFY( model->hasIndex ( 0, 0 ) );
// hasIndex() is tested more extensively in checkChildren(),
// but this catches the big mistakes
@@ -225,9 +224,9 @@ void ModelTest::index()
{
// qDebug() << "i";
// Make sure that invalid values returns an invalid index
- Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() );
- Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() );
- Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() );
+ QVERIFY( model->index ( -2, -2 ) == QModelIndex() );
+ QVERIFY( model->index ( -2, 0 ) == QModelIndex() );
+ QVERIFY( model->index ( 0, -2 ) == QModelIndex() );
int rows = model->rowCount();
int columns = model->columnCount();
@@ -236,13 +235,13 @@ void ModelTest::index()
return;
// Catch off by one errors
- Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() );
- Q_ASSERT ( model->index ( 0, 0 ).isValid() == true );
+ QVERIFY( model->index ( rows, columns ) == QModelIndex() );
+ QVERIFY( model->index ( 0, 0 ).isValid() );
// Make sure that the same index is *always* returned
QModelIndex a = model->index ( 0, 0 );
QModelIndex b = model->index ( 0, 0 );
- Q_ASSERT ( a == b );
+ QVERIFY( a == b );
// index() is tested more extensively in checkChildren(),
// but this catches the big mistakes
@@ -256,7 +255,7 @@ void ModelTest::parent()
// qDebug() << "p";
// Make sure the model wont crash and will return an invalid QModelIndex
// when asked for the parent of an invalid index.
- Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() );
+ QVERIFY( model->parent ( QModelIndex() ) == QModelIndex() );
if ( model->rowCount() == 0 )
return;
@@ -269,13 +268,13 @@ void ModelTest::parent()
// Common error test #1, make sure that a top level index has a parent
// that is a invalid QModelIndex.
QModelIndex topIndex = model->index ( 0, 0, QModelIndex() );
- Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() );
+ QVERIFY( model->parent ( topIndex ) == QModelIndex() );
// Common error test #2, make sure that a second level index has a parent
// that is the first level index.
if ( model->rowCount ( topIndex ) > 0 ) {
QModelIndex childIndex = model->index ( 0, 0, topIndex );
- Q_ASSERT ( model->parent ( childIndex ) == topIndex );
+ QVERIFY( model->parent ( childIndex ) == topIndex );
}
// Common error test #3, the second column should NOT have the same children
@@ -285,7 +284,7 @@ void ModelTest::parent()
if ( model->rowCount ( topIndex1 ) > 0 ) {
QModelIndex childIndex = model->index ( 0, 0, topIndex );
QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 );
- Q_ASSERT ( childIndex != childIndex1 );
+ QVERIFY( childIndex != childIndex1 );
}
// Full test, walk n levels deep through the model making sure that all
@@ -325,47 +324,47 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
int columns = model->columnCount ( parent );
if ( rows > 0 )
- Q_ASSERT ( model->hasChildren ( parent ) );
+ QVERIFY( model->hasChildren ( parent ) );
// Some further testing against rows(), columns(), and hasChildren()
- Q_ASSERT ( rows >= 0 );
- Q_ASSERT ( columns >= 0 );
+ QVERIFY( rows >= 0 );
+ QVERIFY( columns >= 0 );
if ( rows > 0 )
- Q_ASSERT ( model->hasChildren ( parent ) == true );
+ QVERIFY( model->hasChildren ( parent ) );
//qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows
// << "columns:" << columns << "parent column:" << parent.column();
- Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false );
+ QVERIFY( !model->hasIndex ( rows + 1, 0, parent ) );
for ( int r = 0; r < rows; ++r ) {
if ( model->canFetchMore ( parent ) ) {
fetchingMore = true;
model->fetchMore ( parent );
fetchingMore = false;
}
- Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false );
+ QVERIFY( !model->hasIndex ( r, columns + 1, parent ) );
for ( int c = 0; c < columns; ++c ) {
- Q_ASSERT ( model->hasIndex ( r, c, parent ) == true );
+ QVERIFY( model->hasIndex ( r, c, parent ) );
QModelIndex index = model->index ( r, c, parent );
// rowCount() and columnCount() said that it existed...
- Q_ASSERT ( index.isValid() == true );
+ QVERIFY( index.isValid() );
// index() should always return the same index when called twice in a row
QModelIndex modifiedIndex = model->index ( r, c, parent );
- Q_ASSERT ( index == modifiedIndex );
+ QVERIFY( index == modifiedIndex );
// Make sure we get the same index if we request it twice in a row
QModelIndex a = model->index ( r, c, parent );
QModelIndex b = model->index ( r, c, parent );
- Q_ASSERT ( a == b );
+ QVERIFY( a == b );
// Some basic checking on the index that is returned
- Q_ASSERT ( index.model() == model );
- Q_ASSERT ( index.row() == r );
- Q_ASSERT ( index.column() == c );
+ QVERIFY( index.model() == model );
+ QCOMPARE( index.row(), r );
+ QCOMPARE( index.column(), c );
// While you can technically return a QVariant usually this is a sign
- // of an bug in data() Disable if this really is ok in your model.
-// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true );
+ // of a bug in data(). Disable if this really is ok in your model.
+// QVERIFY( model->data ( index, Qt::DisplayRole ).isValid() );
// If the next test fails here is some somewhat useful debug you play with.
@@ -380,8 +379,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
}
// Check that we can get back our real parent.
-// qDebug() << model->parent ( index ) << parent ;
- Q_ASSERT ( model->parent ( index ) == parent );
+ QCOMPARE( model->parent ( index ), parent );
// recursively go down the children
if ( model->hasChildren ( index ) && currentDepth < 10 ) {
@@ -391,7 +389,7 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
// make sure that after testing the children that the index doesn't change.
QModelIndex newerIndex = model->index ( r, c, parent );
- Q_ASSERT ( index == newerIndex );
+ QVERIFY( index == newerIndex );
}
}
}
@@ -402,68 +400,68 @@ void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth )
void ModelTest::data()
{
// Invalid index should return an invalid qvariant
- Q_ASSERT ( !model->data ( QModelIndex() ).isValid() );
+ QVERIFY( !model->data ( QModelIndex() ).isValid() );
if ( model->rowCount() == 0 )
return;
// A valid index should have a valid QVariant data
- Q_ASSERT ( model->index ( 0, 0 ).isValid() );
+ QVERIFY( model->index ( 0, 0 ).isValid() );
// shouldn't be able to set data on an invalid index
- Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false );
+ QVERIFY( !model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) );
// General Purpose roles that should return a QString
QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole );
if ( variant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+ QVERIFY( qVariantCanConvert<QString> ( variant ) );
}
variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole );
if ( variant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+ QVERIFY( qVariantCanConvert<QString> ( variant ) );
}
variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole );
if ( variant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QString> ( variant ) );
+ QVERIFY( qVariantCanConvert<QString> ( variant ) );
}
// General Purpose roles that should return a QSize
variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole );
if ( variant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QSize> ( variant ) );
+ QVERIFY( qVariantCanConvert<QSize> ( variant ) );
}
// General Purpose roles that should return a QFont
QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole );
if ( fontVariant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QFont> ( fontVariant ) );
+ QVERIFY( qVariantCanConvert<QFont> ( fontVariant ) );
}
// Check that the alignment is one we know about
QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole );
if ( textAlignmentVariant.isValid() ) {
int alignment = textAlignmentVariant.toInt();
- Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
+ QCOMPARE( alignment, ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) );
}
// General Purpose roles that should return a QColor
QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole );
if ( colorVariant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) );
+ QVERIFY( qVariantCanConvert<QColor> ( colorVariant ) );
}
colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole );
if ( colorVariant.isValid() ) {
- Q_ASSERT ( qVariantCanConvert<QColor> ( colorVariant ) );
+ QVERIFY( qVariantCanConvert<QColor> ( colorVariant ) );
}
// Check that the "check state" is one we know about.
QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole );
if ( checkStateVariant.isValid() ) {
int state = checkStateVariant.toInt();
- Q_ASSERT ( state == Qt::Unchecked ||
- state == Qt::PartiallyChecked ||
- state == Qt::Checked );
+ QVERIFY( state == Qt::Unchecked ||
+ state == Qt::PartiallyChecked ||
+ state == Qt::Checked );
}
}
@@ -472,7 +470,7 @@ void ModelTest::data()
\sa rowsInserted()
*/
-void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end )
+void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int /* end */)
{
// Q_UNUSED(end);
// qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString()
@@ -494,7 +492,7 @@ void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, in
void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end )
{
Changing c = insert.pop();
- Q_ASSERT ( c.parent == parent );
+ QVERIFY( c.parent == parent );
// qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize
// << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent );
@@ -504,8 +502,8 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end )
// }
// qDebug();
- Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) );
- Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
+ QVERIFY( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) );
+ QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
if (c.next != model->data(model->index(end + 1, 0, c.parent))) {
qDebug() << start << end;
@@ -514,7 +512,7 @@ void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end )
qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent));
}
- Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) );
+ QVERIFY( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) );
}
void ModelTest::layoutAboutToBeChanged()
@@ -527,7 +525,7 @@ void ModelTest::layoutChanged()
{
for ( int i = 0; i < changing.count(); ++i ) {
QPersistentModelIndex p = changing[i];
- Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) );
+ QVERIFY( p == model->index ( p.row(), p.column(), p.parent() ) );
}
changing.clear();
}
@@ -557,10 +555,10 @@ void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end )
{
qDebug() << "rr" << parent << start << end;
Changing c = remove.pop();
- Q_ASSERT ( c.parent == parent );
- Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) );
- Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
- Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) );
+ QVERIFY( c.parent == parent );
+ QVERIFY( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) );
+ QVERIFY( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) );
+ QVERIFY( c.next == model->data ( model->index ( start, 0, c.parent ) ) );
}
diff --git a/tests/auto/modeltest/tst_modeltest.cpp b/tests/auto/modeltest/tst_modeltest.cpp
index a75fe5b3c0..aedaffe5fb 100644
--- a/tests/auto/modeltest/tst_modeltest.cpp
+++ b/tests/auto/modeltest/tst_modeltest.cpp
@@ -201,8 +201,10 @@ class ObservingObject : public QObject
Q_OBJECT
public:
ObservingObject(AccessibleProxyModel *proxy, QObject *parent = 0)
- : QObject(parent),
- m_proxy(proxy)
+ : QObject(parent)
+ , m_proxy(proxy)
+ , storePersistentFailureCount(0)
+ , checkPersistentFailureCount(0)
{
connect(m_proxy, SIGNAL(layoutAboutToBeChanged()), SLOT(storePersistent()));
connect(m_proxy, SIGNAL(layoutChanged()), SLOT(checkPersistent()));
@@ -215,8 +217,14 @@ public slots:
for (int row = 0; row < m_proxy->rowCount(parent); ++row) {
QModelIndex proxyIndex = m_proxy->index(row, 0, parent);
QModelIndex sourceIndex = m_proxy->mapToSource(proxyIndex);
- Q_ASSERT(proxyIndex.isValid());
- Q_ASSERT(sourceIndex.isValid());
+ if (!proxyIndex.isValid()) {
+ qWarning("%s: Invalid proxy index", Q_FUNC_INFO);
+ ++storePersistentFailureCount;
+ }
+ if (!sourceIndex.isValid()) {
+ qWarning("%s: invalid source index", Q_FUNC_INFO);
+ ++storePersistentFailureCount;
+ }
m_persistentSourceIndexes.append(sourceIndex);
m_persistentProxyIndexes.append(proxyIndex);
if (m_proxy->hasChildren(proxyIndex))
@@ -226,12 +234,24 @@ public slots:
void storePersistent()
{
- foreach(const QModelIndex &idx, m_persistentProxyIndexes)
- Q_ASSERT(idx.isValid()); // This is called from layoutAboutToBeChanged. Persistent indexes should be valid
-
- Q_ASSERT(m_proxy->persistent().isEmpty());
+ // This method is called from layoutAboutToBeChanged. Persistent indexes should be valid
+ foreach(const QModelIndex &idx, m_persistentProxyIndexes)
+ if (!idx.isValid()) {
+ qWarning("%s: persistentProxyIndexes contains invalid index", Q_FUNC_INFO);
+ ++storePersistentFailureCount;
+ }
+
+ if (!m_proxy->persistent().isEmpty()) {
+ qWarning("%s: proxy should have no persistent indexes when storePersistent called",
+ Q_FUNC_INFO);
+ ++storePersistentFailureCount;
+ }
storePersistent(QModelIndex());
- Q_ASSERT(!m_proxy->persistent().isEmpty());
+ if (m_proxy->persistent().isEmpty()) {
+ qWarning("%s: proxy should have persistent index after storePersistent called",
+ Q_FUNC_INFO);
+ ++storePersistentFailureCount;
+ }
}
void checkPersistent()
@@ -243,7 +263,10 @@ public slots:
for (int row = 0; row < m_persistentProxyIndexes.size(); ++row) {
QModelIndex updatedProxy = m_persistentProxyIndexes.at(row);
QModelIndex updatedSource = m_persistentSourceIndexes.at(row);
- QCOMPARE(m_proxy->mapToSource(updatedProxy), updatedSource);
+ if (m_proxy->mapToSource(updatedProxy) != updatedSource) {
+ qWarning("%s: check failed at row %d", Q_FUNC_INFO, row);
+ ++checkPersistentFailureCount;
+ }
}
m_persistentSourceIndexes.clear();
m_persistentProxyIndexes.clear();
@@ -253,6 +276,9 @@ private:
AccessibleProxyModel *m_proxy;
QList<QPersistentModelIndex> m_persistentSourceIndexes;
QList<QPersistentModelIndex> m_persistentProxyIndexes;
+public:
+ int storePersistentFailureCount;
+ int checkPersistentFailureCount;
};
void tst_ModelTest::moveSourceItems()
@@ -280,6 +306,9 @@ void tst_ModelTest::moveSourceItems()
moveCommand->setDestAncestors(QList<int>() << 1);
moveCommand->setDestRow(0);
moveCommand->doCommand();
+
+ QCOMPARE(observer.storePersistentFailureCount, 0);
+ QCOMPARE(observer.checkPersistentFailureCount, 0);
}
void tst_ModelTest::testResetThroughProxy()
@@ -302,6 +331,9 @@ void tst_ModelTest::testResetThroughProxy()
ModelResetCommand *resetCommand = new ModelResetCommand(model, this);
resetCommand->setNumCols(0);
resetCommand->doCommand();
+
+ QCOMPARE(observer.storePersistentFailureCount, 0);
+ QCOMPARE(observer.checkPersistentFailureCount, 0);
}
diff --git a/tests/auto/other.pro b/tests/auto/other.pro
index a84ab05104..b50e1697b3 100644
--- a/tests/auto/other.pro
+++ b/tests/auto/other.pro
@@ -3,14 +3,12 @@
TEMPLATE=subdirs
SUBDIRS=\
-# exceptionsafety_objects \ shouldn't enable it
# baselineexample \ Just an example demonstrating qbaselinetest usage
lancelot \
- qaccessibility \
qalgorithms \
qcombobox \
qcssparser \
- #qdatastream \ # FIXME: uses qtsvg (QTBUG-19244)
+ qdatastream \
qdir \
qfocusevent \
qimage \
@@ -37,6 +35,8 @@ SUBDIRS=\
windowsmobile \
nativeimagehandleprovider
+contains(QT_CONFIG, accessibility):SUBDIRS += qaccessibility
+
contains(QT_CONFIG, OdfWriter):SUBDIRS += qzip qtextodfwriter
mac: {
SUBDIRS += macgui \
@@ -56,6 +56,8 @@ symbian {
qs60mainapplication
}
+!win32-msvc*:!wince*:SUBDIRS += exceptionsafety_objects
+
# Following tests depends on private API
!contains(QT_CONFIG, private_tests): SUBDIRS -= \
qcombobox \
diff --git a/tests/auto/platformsocketengine/platformsocketengine.pro b/tests/auto/platformsocketengine/platformsocketengine.pro
index faf745c679..99ae358a93 100644
--- a/tests/auto/platformsocketengine/platformsocketengine.pro
+++ b/tests/auto/platformsocketengine/platformsocketengine.pro
@@ -7,7 +7,7 @@ requires(contains(QT_CONFIG,private_tests))
MOC_DIR=tmp
-QT = core network
+QT = core-private network-private
symbian {
TARGET.CAPABILITY = NetworkServices
diff --git a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
index 1178169ab1..e77b7bb95e 100644
--- a/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
+++ b/tests/auto/qabstractfileengine/tst_qabstractfileengine.cpp
@@ -83,8 +83,12 @@ public:
bool open(QIODevice::OpenMode openMode)
{
- Q_ASSERT(!openForRead_);
- Q_ASSERT(!openForWrite_);
+ if (openForRead_ || openForWrite_) {
+ qWarning("%s: file is already open for %s",
+ Q_FUNC_INFO,
+ (openForRead_ ? "reading" : "writing"));
+ return false;
+ }
openFile_ = resolveFile(openMode & QIODevice::WriteOnly);
if (!openFile_)
@@ -132,13 +136,19 @@ public:
qint64 pos() const
{
- Q_ASSERT(openForRead_ || openForWrite_);
+ if (!openForRead_ && !openForWrite_) {
+ qWarning("%s: file is not open", Q_FUNC_INFO);
+ return -1;
+ }
return position_;
}
bool seek(qint64 pos)
{
- Q_ASSERT(openForRead_ || openForWrite_);
+ if (!openForRead_ && !openForWrite_) {
+ qWarning("%s: file is not open", Q_FUNC_INFO);
+ return false;
+ }
if (pos >= 0) {
position_ = pos;
@@ -150,7 +160,11 @@ public:
bool flush()
{
- Q_ASSERT(openForRead_ || openForWrite_);
+ if (!openForRead_ && !openForWrite_) {
+ qWarning("%s: file is not open", Q_FUNC_INFO);
+ return false;
+ }
+
return true;
}
@@ -346,10 +360,10 @@ public:
void setFileName(const QString &file)
{
- Q_ASSERT(!openForRead_);
- Q_ASSERT(!openForWrite_);
-
- fileName_ = file;
+ if (openForRead_ || openForWrite_)
+ qWarning("%s: Can't set file name while file is open", Q_FUNC_INFO);
+ else
+ fileName_ = file;
}
// typedef QAbstractFileEngineIterator Iterator;
@@ -368,9 +382,16 @@ public:
qint64 read(char *data, qint64 maxLen)
{
- Q_ASSERT(openForRead_);
+ if (!openForRead_) {
+ qWarning("%s: file must be open for reading", Q_FUNC_INFO);
+ return -1;
+ }
+
+ if (openFile_.isNull()) {
+ qWarning("%s: file must not be null", Q_FUNC_INFO);
+ return -1;
+ }
- Q_ASSERT(!openFile_.isNull());
QMutexLocker lock(&openFile_->mutex);
qint64 readSize = qMin(openFile_->content.size() - position_, maxLen);
if (readSize < 0)
@@ -384,12 +405,19 @@ public:
qint64 write(const char *data, qint64 length)
{
- Q_ASSERT(openForWrite_);
+ if (!openForWrite_) {
+ qWarning("%s: file must be open for writing", Q_FUNC_INFO);
+ return -1;
+ }
+
+ if (openFile_.isNull()) {
+ qWarning("%s: file must not be null", Q_FUNC_INFO);
+ return -1;
+ }
if (length < 0)
return -1;
- Q_ASSERT(!openFile_.isNull());
QMutexLocker lock(&openFile_->mutex);
if (openFile_->content.size() == position_)
openFile_->content.append(data, length);
@@ -434,7 +462,8 @@ protected:
QSharedPointer<File> resolveFile(bool create) const
{
if (openForRead_ || openForWrite_) {
- Q_ASSERT(openFile_);
+ if (!openFile_)
+ qWarning("%s: file should not be null", Q_FUNC_INFO);
return openFile_;
}
diff --git a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
index f15244525d..3c202920d6 100644
--- a/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
+++ b/tests/auto/qabstractscrollarea/tst_qabstractscrollarea.cpp
@@ -299,7 +299,7 @@ public:
startTimer(2000);
}
- void timerEvent(QTimerEvent *event)
+ void timerEvent(QTimerEvent * /* event */)
{
// should not crash.
(void)new QScrollArea(this);
diff --git a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
index 11730f277c..8dfa37fc39 100644
--- a/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
+++ b/tests/auto/qabstracttextdocumentlayout/tst_qabstracttextdocumentlayout.cpp
@@ -90,7 +90,7 @@ public:
QSizeF documentSize() const { return QSizeF(); }
QRectF frameBoundingRect(QTextFrame *) const { return QRectF(); }
QRectF blockBoundingRect(const QTextBlock &) const { return QRectF(); }
- void documentChanged(int from, int oldLength, int length) {
+ void documentChanged(int from, int /* oldLength */, int length) {
++changeEvents;
QTextBlock last = document()->lastBlock();
diff --git a/tests/auto/qaccessibility/qaccessibility.pro b/tests/auto/qaccessibility/qaccessibility.pro
index 21e286baea..75fd1e9793 100644
--- a/tests/auto/qaccessibility/qaccessibility.pro
+++ b/tests/auto/qaccessibility/qaccessibility.pro
@@ -1,4 +1,5 @@
load(qttest_p4)
+requires(contains(QT_CONFIG,accessibility))
SOURCES += tst_qaccessibility.cpp
unix:!mac:LIBS+=-lm
diff --git a/tests/auto/qaccessibility/tst_qaccessibility.cpp b/tests/auto/qaccessibility/tst_qaccessibility.cpp
index 7ff1a0867c..9110bd717d 100644
--- a/tests/auto/qaccessibility/tst_qaccessibility.cpp
+++ b/tests/auto/qaccessibility/tst_qaccessibility.cpp
@@ -40,9 +40,6 @@
****************************************************************************/
-#ifdef QT3_SUPPORT
-#include <Qt3Support/Qt3Support>
-#endif
#include <QtTest/QtTest>
#ifndef Q_OS_WINCE
#include "../../shared/util.h"
@@ -228,17 +225,10 @@ private slots:
void customWidget();
void deletedWidget();
- void childCount();
- void childAt(); // also indexOfChild
- void relationTo();
void navigateGeometric();
void navigateHierarchy();
void navigateSlider();
void navigateCovered();
- void navigateControllers();
- void navigateLabels();
- void text();
- void setText();
void hideShowTest();
void userActionCount();
@@ -248,7 +238,6 @@ private slots:
void applicationTest();
void mainWindowTest();
void buttonTest();
- void sliderTest();
void scrollBarTest();
void tabTest();
void tabWidgetTest();
@@ -271,15 +260,11 @@ private slots:
void tableViewTest();
void calendarWidgetTest();
void dockWidgetTest();
- void pushButtonTest();
void comboBoxTest();
void accessibleName();
void treeWidgetTest();
void labelTest();
void accelerators();
-
-private:
- QWidget *createGUI();
};
const double Q_PI = 3.14159265358979323846;
@@ -326,69 +311,16 @@ QString eventName(const int ev)
}
}
-static QString stateNames(int state)
-{
- QString stateString;
- if (state == 0x00000000) stateString += " Normal";
- if (state & 0x00000001) stateString += " Unavailable";
- if (state & 0x00000002) stateString += " Selected";
- if (state & 0x00000004) stateString += " Focused";
- if (state & 0x00000008) stateString += " Pressed";
- if (state & 0x00000010) stateString += " Checked";
- if (state & 0x00000020) stateString += " Mixed";
- if (state & 0x00000040) stateString += " ReadOnly";
- if (state & 0x00000080) stateString += " HotTracked";
- if (state & 0x00000100) stateString += " DefaultButton";
- if (state & 0x00000200) stateString += " Expanded";
- if (state & 0x00000400) stateString += " Collapsed";
- if (state & 0x00000800) stateString += " Busy";
- if (state & 0x00001000) stateString += " Floating";
- if (state & 0x00002000) stateString += " Marqueed";
- if (state & 0x00004000) stateString += " Animated";
- if (state & 0x00008000) stateString += " Invisible";
- if (state & 0x00010000) stateString += " Offscreen";
- if (state & 0x00020000) stateString += " Sizeable";
- if (state & 0x00040000) stateString += " Moveable";
- if (state & 0x00080000) stateString += " SelfVoicing";
- if (state & 0x00100000) stateString += " Focusable";
- if (state & 0x00200000) stateString += " Selectable";
- if (state & 0x00400000) stateString += " Linked";
- if (state & 0x00800000) stateString += " Traversed";
- if (state & 0x01000000) stateString += " MultiSelectable";
- if (state & 0x02000000) stateString += " ExtSelectable";
- if (state & 0x04000000) stateString += " AlertLow";
- if (state & 0x08000000) stateString += " AlertMedium";
- if (state & 0x10000000) stateString += " AlertHigh";
- if (state & 0x20000000) stateString += " Protected";
- if (state & 0x3fffffff) stateString += " Valid";
-
- if (stateString.isEmpty())
- stateString = "Unknown state " + QString::number(state);
-
- return stateString;
-}
-
QAccessible::State state(QWidget * const widget)
{
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
- Q_ASSERT(iface);
- QAccessible::State state = iface->state(0);
+ if (!iface)
+ qWarning() << "Cannot get QAccessibleInterface for widget";
+ QAccessible::State state = (iface ? iface->state(0) : static_cast<QAccessible::State>(0));
delete iface;
return state;
}
-void printState(QWidget * const widget)
-{
- qDebug() << "State for" << widget->metaObject()->className() << stateNames(state(widget));
-}
-
-void printState(QAccessibleInterface * const iface, const int child = 0)
-{
- qDebug() << "State for" << iface->object()->metaObject()->className() << "child" << child
- << iface->text(QAccessible::Name, child) << stateNames(iface->state(child));
-}
-
-
class QtTestAccessibleWidget: public QWidget
{
Q_OBJECT
@@ -403,7 +335,6 @@ public:
}
};
-#ifdef QTEST_ACCESSIBILITY
class QtTestAccessibleWidgetIface: public QAccessibleWidget
{
public:
@@ -421,7 +352,6 @@ public:
return 0;
}
};
-#endif
tst_QAccessibility::tst_QAccessibility()
{
@@ -433,17 +363,13 @@ tst_QAccessibility::~tst_QAccessibility()
void tst_QAccessibility::initTestCase()
{
-#ifdef QTEST_ACCESSIBILITY
QTestAccessibility::initialize();
QAccessible::installFactory(QtTestAccessibleWidgetIface::ifaceFactory);
-#endif
}
void tst_QAccessibility::cleanupTestCase()
{
-#ifdef QTEST_ACCESSIBILITY
QTestAccessibility::cleanup();
-#endif
}
void tst_QAccessibility::init()
@@ -453,7 +379,6 @@ void tst_QAccessibility::init()
void tst_QAccessibility::cleanup()
{
-#ifdef QTEST_ACCESSIBILITY
const EventList list = QTestAccessibility::events();
if (!list.isEmpty()) {
qWarning("%d accessibility event(s) were not handled in testfunction '%s':", list.count(),
@@ -463,14 +388,10 @@ void tst_QAccessibility::cleanup()
eventName(list.at(i).event).toAscii().constData(), list.at(i).event, list.at(i).child);
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::eventTest()
{
-#ifdef QTEST_ACCESSIBILITY
QPushButton* button = new QPushButton(0);
button->setObjectName(QString("Olaf"));
@@ -491,14 +412,10 @@ void tst_QAccessibility::eventTest()
QVERIFY_EVENT(button, 0, QAccessible::ObjectHide);
delete button;
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::customWidget()
{
-#ifdef QTEST_ACCESSIBILITY
QtTestAccessibleWidget* widget = new QtTestAccessibleWidget(0, "Heinz");
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
@@ -510,14 +427,10 @@ void tst_QAccessibility::customWidget()
delete iface;
delete widget;
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::deletedWidget()
{
-#ifdef QTEST_ACCESSIBILITY
QtTestAccessibleWidget *widget = new QtTestAccessibleWidget(0, "Ralf");
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(widget);
QVERIFY(iface != 0);
@@ -528,403 +441,10 @@ void tst_QAccessibility::deletedWidget()
widget = 0;
QVERIFY(!iface->isValid());
delete iface;
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-}
-
-QWidget *tst_QAccessibility::createGUI()
-{
-#if !defined(QT3_SUPPORT)
- qWarning( "Should never get here without Qt3Support");
- return 0;
-#else
-# ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = new QWidget(0, Qt::X11BypassWindowManagerHint);
- QGridLayout *grid = new QGridLayout(toplevel, 2, 2);
-
- // topLeft - hierarchies
- Q3VBox *topLeft = new Q3VBox(toplevel, "topLeft");
- topLeft->setSpacing(2);
- grid->addWidget(topLeft, 0, 0);
-
- Q3VButtonGroup *group1 = new Q3VButtonGroup("Title1:", topLeft, "group1");
- /*QPushButton *pb1 = */ new QPushButton("Button&1", group1, "pb1");
- Q3VButtonGroup *group2 = new Q3VButtonGroup("Title2:", topLeft, "group2");
- /*QPushButton *pb2 = */ new QPushButton("Button2", group2, "pb2");
-
- Q3WidgetStack *stack = new Q3WidgetStack(topLeft, "stack");
- QLabel *page1 = new QLabel("Page 1", stack, "page1");
- stack->addWidget(page1);
- QLabel *page2 = new QLabel("Page 2", stack, "page2");
- stack->addWidget(page2);
- QLabel *page3 = new QLabel("Page 3", stack, "page3");
- stack->addWidget(page3);
-
- // topRight - controlling
- Q3VBox *topRight= new Q3VBox(toplevel, "topRight");
- grid->addWidget(topRight, 0, 1);
-
- QPushButton *pbOk = new QPushButton("Ok", topRight, "pbOk" );
- pbOk->setDefault(TRUE);
- QSlider *slider = new QSlider(Qt::Horizontal, topRight, "slider");
- QLCDNumber *sliderLcd = new QLCDNumber(topRight, "sliderLcd");
- QSpinBox *spinBox = new QSpinBox(topRight, "spinBox");
-
- connect(pbOk, SIGNAL(clicked()), toplevel, SLOT(close()) );
- connect(slider, SIGNAL(valueChanged(int)), sliderLcd, SLOT(display(int)));
- connect(spinBox, SIGNAL(valueChanged(int)), slider, SLOT(setValue(int)));
-
- spinBox->setValue(50);
-
- // bottomLeft - labeling and controlling
- Q3HBox *bottomLeft = new Q3HBox(toplevel, "bottomLeft");
- grid->addWidget(bottomLeft, 1, 0);
-
- QLabel *label = new QLabel("This is a &lineedit:", bottomLeft, "label");
- QLineEdit *lineedit = new QLineEdit(bottomLeft, "lineedit");
- label->setBuddy(lineedit);
- QLabel *label2 = new QLabel(bottomLeft, "label2");
-
- connect(lineedit, SIGNAL(textChanged(const QString&)), label2, SLOT(setText(const QString&)));
-
- Q3VButtonGroup *radiogroup = new Q3VButtonGroup("Exclusive &choices:", bottomLeft, "radiogroup");
- QLineEdit *frequency = new QLineEdit(radiogroup, "frequency");
- frequency->setText("100 Mhz");
- QRadioButton *radioAM = new QRadioButton("&AM", radiogroup, "radioAM");
- /* QRadioButton *radioFM = */ new QRadioButton("&FM", radiogroup, "radioFM");
- /* QRadioButton *radioSW = */ new QRadioButton("&Shortwave", radiogroup, "radioSW");
-
- // bottomRight - ### empty
- Q3HBox *bottomRight = new Q3HBox(toplevel, "bottomRight");
- grid->addWidget(bottomRight, 1, 1);
-
- toplevel->adjustSize(); // sends layout and child events
-
- // some tooltips
- QToolTip::add(label, "A label");
- QToolTip::add(lineedit, "A line edit");
- // some whatsthis
- QWhatsThis::add(label, "A label displays static text");
- QWhatsThis::add(frequency, "You can enter a single line of text here");
-
- radioAM->setFocus();
- QTestAccessibility::clearEvents();
- return toplevel;
-# else
- Q_ASSERT(0); // this function cannot be called without accessibility support
- return 0;
-# endif
-#endif // !QT3_SUPPORT
-}
-
-void tst_QAccessibility::childAt()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = createGUI();
- QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel);
- QVERIFY(acc_toplevel);
- // this is necessary to have the layout setup correctly
- toplevel->show();
-
- QObjectList children = toplevel->queryList("QWidget", 0, 0, 0);
- for (int c = 1; c <= children.count(); ++c) {
- QWidget *child = qobject_cast<QWidget*>(children.at(c-1));
- QAccessibleInterface *acc_child = QAccessible::queryAccessibleInterface(child);
- QVERIFY(acc_child);
- QCOMPARE(acc_child->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask, QAccessible::Child);
-
- QPoint center(child->mapToGlobal(child->rect().center()));
- QRect childRect(child->geometry());
- childRect.moveCenter(center);
-
- QCOMPARE(acc_child->rect(0), childRect);
- QCOMPARE(acc_toplevel->childAt(childRect.center().x(), childRect.center().y()), c);
- QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.top()), c);
- QCOMPARE(acc_toplevel->childAt(childRect.left(), childRect.bottom()), c);
- QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.top()), c);
- QCOMPARE(acc_toplevel->childAt(childRect.right(), childRect.bottom()), c);
-
- QCOMPARE(acc_toplevel->indexOfChild(acc_child), c);
- delete acc_child;
- }
-
- delete acc_toplevel;
- delete toplevel;
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
-}
-
-void tst_QAccessibility::childCount()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = createGUI();
- QObject *topLeft = toplevel->child("topLeft");
- QObject *topRight = toplevel->child("topRight");
- QObject *bottomLeft = toplevel->child("bottomLeft");
- QObject *bottomRight = toplevel->child("bottomRight");
-
- QAccessibleInterface* acc_toplevel = QAccessible::queryAccessibleInterface(toplevel);
- QAccessibleInterface* acc_topLeft = QAccessible::queryAccessibleInterface(topLeft);
- QAccessibleInterface* acc_topRight = QAccessible::queryAccessibleInterface(topRight);
- QAccessibleInterface* acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft);
- QAccessibleInterface* acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight);
-
- QVERIFY(acc_toplevel);
- QVERIFY(acc_topLeft);
- QVERIFY(acc_topRight);
- QVERIFY(acc_bottomLeft);
- QVERIFY(acc_bottomRight);
-
- toplevel->show();
- QCOMPARE(acc_toplevel->childCount(), toplevel->queryList("QWidget", 0, 0, 0).count());
- QCOMPARE(acc_topLeft->childCount(), topLeft->queryList("QWidget", 0, 0, 0).count());
- QCOMPARE(acc_topRight->childCount(), topRight->queryList("QWidget", 0, 0, 0).count());
- QCOMPARE(acc_bottomLeft->childCount(), bottomLeft->queryList("QWidget", 0, 0, 0).count());
- QCOMPARE(acc_bottomRight->childCount(), bottomRight->queryList("QWidget", 0, 0, 0).count());
-
- delete acc_toplevel;
- delete acc_topLeft;
- delete acc_topRight;
- delete acc_bottomLeft;
- delete acc_bottomRight;
- delete toplevel;
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
-}
-
-void tst_QAccessibility::relationTo()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = createGUI();
- toplevel->resize(400,300);
- QObject *topLeft = toplevel->child("topLeft");
- QObject *topRight = toplevel->child("topRight");
- QObject *bottomLeft = toplevel->child("bottomLeft");
- QObject *bottomRight = toplevel->child("bottomRight");
-
- toplevel->show();
-
- QAccessibleInterface *acc_toplevel = QAccessible::queryAccessibleInterface(toplevel);
-
- QAccessibleInterface *acc_topLeft = QAccessible::queryAccessibleInterface(topLeft);
- QAccessibleInterface *acc_group1 = QAccessible::queryAccessibleInterface(topLeft->child("group1"));
- QVERIFY(topLeft->child("group1"));
- QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("group1")->child("pb1"));
- QAccessibleInterface *acc_group2 = QAccessible::queryAccessibleInterface(topLeft->child("group2"));
- QAccessibleInterface *acc_pb2 = 0;
- QAccessibleInterface *acc_stack = QAccessible::queryAccessibleInterface(topLeft->child("stack"));
- QAccessibleInterface *acc_page1 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page1"));
- QAccessibleInterface *acc_page2 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page2"));
- QAccessibleInterface *acc_page3 = QAccessible::queryAccessibleInterface(topLeft->child("stack")->child("page3"));
- QAccessibleInterface *acc_topRight = QAccessible::queryAccessibleInterface(topRight);
- QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk"));
- QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider"));
- QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox"));
- QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd"));
-
- QAccessibleInterface *acc_bottomLeft = QAccessible::queryAccessibleInterface(bottomLeft);
- QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label"));
- QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit"));
- QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(bottomLeft->child("label2"));
- QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup"));
- QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM"));
- QAccessibleInterface *acc_radioFM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioFM"));
- QAccessibleInterface *acc_radioSW = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioSW"));
- QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency"));
-
- QAccessibleInterface *acc_bottomRight = QAccessible::queryAccessibleInterface(bottomRight);
-
- QVERIFY(acc_toplevel);
- QVERIFY(acc_topLeft);
- QVERIFY(acc_topRight);
- QVERIFY(acc_bottomLeft);
- QVERIFY(acc_bottomRight);
- QVERIFY(acc_group1);
- QVERIFY(acc_group2);
- QVERIFY(acc_stack);
- QVERIFY(acc_page1);
- QVERIFY(acc_page2);
- QVERIFY(acc_page3);
- QVERIFY(acc_pbOk);
- QVERIFY(acc_slider);
- QVERIFY(acc_spinBox);
- QVERIFY(acc_sliderLcd);
- QVERIFY(acc_label);
- QVERIFY(acc_lineedit);
- QVERIFY(acc_radiogroup);
- QVERIFY(acc_radioAM);
- QVERIFY(acc_radioFM);
- QVERIFY(acc_radioSW);
- QVERIFY(acc_frequency);
-
- // hierachy relations
- QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Self);
- QCOMPARE(acc_toplevel->relationTo(1, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
- QCOMPARE(acc_toplevel->relationTo(0, acc_toplevel, 1) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
-
- QCOMPARE(acc_toplevel->relationTo(0, acc_topLeft, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
- QCOMPARE(acc_toplevel->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
- QCOMPARE(acc_toplevel->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
- QCOMPARE(acc_toplevel->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
-
- QCOMPARE(acc_toplevel->relationTo(0, acc_group1, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
- QCOMPARE(acc_toplevel->relationTo(0, acc_page1, 0) & QAccessible::HierarchyMask,
- QAccessible::Ancestor);
- QCOMPARE(acc_group1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Descendent);
- QCOMPARE(acc_stack->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Descendent);
- QCOMPARE(acc_page1->relationTo(0, acc_stack, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
- QCOMPARE(acc_page1->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Descendent);
-
- QCOMPARE(acc_topLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
- QCOMPARE(acc_topRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
- QCOMPARE(acc_bottomLeft->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
- QCOMPARE(acc_bottomRight->relationTo(0, acc_toplevel, 0) & QAccessible::HierarchyMask,
- QAccessible::Child);
-
- QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0) & QAccessible::HierarchyMask,
- QAccessible::Sibling);
- QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0) & QAccessible::HierarchyMask,
- QAccessible::Sibling);
- QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0) & QAccessible::HierarchyMask,
- QAccessible::Sibling);
-
- QCOMPARE(acc_pb1->relationTo(0, acc_pb2, 0), QAccessible::Unrelated);
-
- // geometrical relations - only valid for siblings
- QCOMPARE(acc_topLeft->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Left);
- QCOMPARE(acc_topLeft->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Up);
- QCOMPARE(acc_topLeft->relationTo(0, acc_bottomRight, 0), QAccessible::Sibling | QAccessible::Left | QAccessible::Up);
-
- QCOMPARE(acc_bottomRight->relationTo(0, acc_topLeft, 0), QAccessible::Sibling | QAccessible::Right | QAccessible::Down);
- QCOMPARE(acc_bottomRight->relationTo(0, acc_topRight, 0), QAccessible::Sibling | QAccessible::Down);
- QCOMPARE(acc_bottomRight->relationTo(0, acc_bottomLeft, 0), QAccessible::Sibling | QAccessible::Right);
-#ifdef Q_WS_MAC
- QEXPECT_FAIL("", "Task 155501", Continue);
-#endif
- QCOMPARE(acc_group1->relationTo(0, acc_group2, 0), QAccessible::Sibling | QAccessible::Up);
-#ifdef Q_WS_MAC
- QEXPECT_FAIL("", "Task 155501", Continue);
-#endif
- QCOMPARE(acc_group2->relationTo(0, acc_group1, 0), QAccessible::Sibling | QAccessible::Down);
-
- // Covers/Covered tested in navigateCovered
-
- // logical relations - focus
- QCOMPARE(acc_radioAM->relationTo(0, acc_radioFM, 0) & QAccessible::FocusChild,
- QAccessible::Unrelated);
- QCOMPARE(acc_radioAM->relationTo(0, acc_radiogroup, 0) & QAccessible::FocusChild,
- QAccessible::FocusChild);
- QCOMPARE(acc_radioAM->relationTo(0, acc_bottomLeft, 0) & QAccessible::FocusChild,
- QAccessible::FocusChild);
- QCOMPARE(acc_radioAM->relationTo(0, acc_topLeft, 0) & QAccessible::FocusChild,
- QAccessible::Unrelated);
- QCOMPARE(acc_radioAM->relationTo(0, acc_toplevel, 0) & QAccessible::FocusChild,
- QAccessible::FocusChild);
-
- // logical relations - labels
- QCOMPARE(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask,
- QAccessible::Label);
- QCOMPARE(acc_lineedit->relationTo(0, acc_label, 0) & QAccessible::LogicalMask,
- QAccessible::Labelled);
- QCOMPARE(acc_label->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask,
- QAccessible::Unrelated);
- QCOMPARE(acc_lineedit->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask,
- QAccessible::Unrelated);
-
- QEXPECT_FAIL("", "Make me accessible", Continue);
- QCOMPARE(acc_radiogroup->relationTo(0, acc_radioAM, 0) & QAccessible::LogicalMask,
- QAccessible::Label | QAccessible::Controlled);
- QEXPECT_FAIL("", "Make me accessible", Continue);
- QCOMPARE(acc_radiogroup->relationTo(0, acc_radioFM, 0) & QAccessible::LogicalMask,
- QAccessible::Label | QAccessible::Controlled);
- QEXPECT_FAIL("", "Make me accessible", Continue);
- QCOMPARE(acc_radiogroup->relationTo(0, acc_radioSW, 0) & QAccessible::LogicalMask,
- QAccessible::Label | QAccessible::Controlled);
- QCOMPARE(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::LogicalMask,
- QAccessible::Label);
- QCOMPARE(acc_frequency->relationTo(0, acc_radiogroup, 0) & QAccessible::LogicalMask,
- QAccessible::Labelled);
- QCOMPARE(acc_radiogroup->relationTo(0, acc_lineedit, 0) & QAccessible::LogicalMask,
- QAccessible::Unrelated);
-
- // logical relations - controller
- QCOMPARE(acc_pbOk->relationTo(0, acc_toplevel, 0) & QAccessible::LogicalMask,
- QAccessible::Controller);
- QCOMPARE(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::LogicalMask,
- QAccessible::Controller);
- QCOMPARE(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::LogicalMask,
- QAccessible::Controller);
- QCOMPARE(acc_lineedit->relationTo(0, acc_label2, 0) & QAccessible::LogicalMask,
- QAccessible::Controller);
-
- delete acc_toplevel;
- delete acc_topLeft;
- delete acc_group1;
- delete acc_pb1;
- delete acc_group2;
- delete acc_stack;
- delete acc_page1;
- delete acc_page2;
- delete acc_page3;
- delete acc_topRight;
- delete acc_pbOk;
- delete acc_slider;
- delete acc_spinBox;
- delete acc_sliderLcd;
- delete acc_bottomLeft;
- delete acc_label;
- delete acc_lineedit;
- delete acc_label2;
- delete acc_radiogroup;
- delete acc_radioAM;
- delete acc_radioFM;
- delete acc_radioSW;
- delete acc_frequency;
- delete acc_bottomRight;
-
- delete toplevel;
-
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
}
void tst_QAccessibility::navigateGeometric()
{
-#ifdef QTEST_ACCESSIBILITY
{
static const int skip = 20; //speed the test up significantly
static const double step = Q_PI / 180;
@@ -1020,14 +540,10 @@ void tst_QAccessibility::navigateGeometric()
delete w;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::navigateSlider()
{
-#ifdef QTEST_ACCESSIBILITY
{
QSlider *slider = new QSlider(0);
slider->setObjectName(QString("Slidy"));
@@ -1054,14 +570,10 @@ void tst_QAccessibility::navigateSlider()
delete slider;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::navigateCovered()
{
-#ifdef QTEST_ACCESSIBILITY
{
QWidget *w = new QWidget(0);
w->setObjectName(QString("Harry"));
@@ -1164,14 +676,10 @@ void tst_QAccessibility::navigateCovered()
delete w;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::navigateHierarchy()
{
-#ifdef QTEST_ACCESSIBILITY
{
QWidget *w = new QWidget(0);
w->setObjectName(QString("Hans"));
@@ -1267,241 +775,11 @@ void tst_QAccessibility::navigateHierarchy()
delete w;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
#define QSETCOMPARE(thetypename, elements, otherelements) \
QCOMPARE((QSet<thetypename>() << elements), (QSet<thetypename>() << otherelements))
-void tst_QAccessibility::navigateControllers()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- {
- Q3VBox vbox;
- QSlider slider(&vbox);
- QSpinBox spinBox(&vbox);
- QLCDNumber lcd1(&vbox);
- QLCDNumber lcd2(&vbox);
- QLabel label(&vbox);
- vbox.show();
-
- slider.setObjectName("slider");
- spinBox.setObjectName("spinBox");
- lcd1.setObjectName("lcd1");
- lcd2.setObjectName("lcd2");
- label.setObjectName("label");
-
- QTestAccessibility::clearEvents();
-
- connect(&slider, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int)));
- connect(&slider, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int)));
- connect(&spinBox, SIGNAL(valueChanged(int)), &lcd2, SLOT(display(int)));
- connect(&spinBox, SIGNAL(valueChanged(int)), &lcd1, SLOT(display(int)));
- connect(&spinBox, SIGNAL(valueChanged(const QString&)), &label, SLOT(setText(const QString&)));
-
- QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(&slider);
- QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(&spinBox);
- QAccessibleInterface *acc_lcd1 = QAccessible::queryAccessibleInterface(&lcd1);
- QAccessibleInterface *acc_lcd2 = QAccessible::queryAccessibleInterface(&lcd2);
- QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label);
-
- QVERIFY(acc_slider->relationTo(0, acc_lcd1, 0) & QAccessible::Controller);
- QVERIFY(acc_slider->relationTo(0, acc_lcd2, 0) & QAccessible::Controller);
- QVERIFY(acc_spinBox->relationTo(0, acc_lcd1, 0) & QAccessible::Controller);
- QVERIFY(acc_spinBox->relationTo(0, acc_lcd2, 0) & QAccessible::Controller);
- QVERIFY(acc_spinBox->relationTo(0, acc_label, 0) & QAccessible::Controller);
-
- QAccessibleInterface *acc_target1, *acc_target2, *acc_target3;
- // from controller
- QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 0, &acc_target1), -1);
- QVERIFY(!acc_target1);
- QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 1, &acc_target1), 0);
- QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 2, &acc_target2), 0);
- QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object(),
- acc_target1->object() << acc_target2->object());
- delete acc_target1;
- delete acc_target2;
-
- QCOMPARE(acc_slider->navigate(QAccessible::Controlled, 3, &acc_target1), -1);
- QVERIFY(!acc_target1);
-
- QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 0, &acc_target1), -1);
- QVERIFY(!acc_target1);
- QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 1, &acc_target1), 0);
- QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 2, &acc_target2), 0);
- QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 3, &acc_target3), 0);
- QSETCOMPARE(QObject*, acc_lcd1->object() << acc_lcd2->object() << acc_label->object(),
- acc_target1->object() << acc_target2->object() << acc_target3->object());
- delete acc_target1;
- delete acc_target2;
- delete acc_target3;
-
- QCOMPARE(acc_spinBox->navigate(QAccessible::Controlled, 4, &acc_target1), -1);
- QVERIFY(!acc_target1);
-
- // to controller
- QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 0, &acc_target1), -1);
- QVERIFY(!acc_target1);
- QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 1, &acc_target1), 0);
- QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 2, &acc_target2), 0);
- QSETCOMPARE(QObject*, acc_slider->object() << acc_spinBox->object(),
- acc_target1->object() << acc_target2->object());
- delete acc_target1;
- delete acc_target2;
- QCOMPARE(acc_lcd1->navigate(QAccessible::Controller, 3, &acc_target1), -1);
- QVERIFY(!acc_target1);
-
- delete acc_label;
- delete acc_lcd2;
- delete acc_lcd1;
- delete acc_spinBox;
- delete acc_slider;
- }
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
-}
-
-void tst_QAccessibility::navigateLabels()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- {
- Q3VBox vbox;
- Q3HBox hbox(&vbox);
-
- QLabel label(&hbox);
- label.setText("This is a lineedit:");
- QLineEdit lineedit(&hbox);
- label.setBuddy(&lineedit);
-
- Q3VButtonGroup groupbox(&vbox);
- groupbox.setTitle("Be my children!");
- QRadioButton radio(&groupbox);
- QLabel label2(&groupbox);
- label2.setText("Another lineedit:");
- QLineEdit lineedit2(&groupbox);
- label2.setBuddy(&lineedit2);
- Q3GroupBox groupbox2(&groupbox);
- groupbox2.setTitle("Some grand-children");
- QLineEdit grandchild(&groupbox2);
-
- Q3GroupBox border(&vbox);
- QLineEdit lineedit3(&border);
- vbox.show();
- QTestAccessibility::clearEvents();
-
- QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(&label);
- QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(&lineedit);
- QAccessibleInterface *acc_groupbox = QAccessible::queryAccessibleInterface(&groupbox);
- QAccessibleInterface *acc_radio = QAccessible::queryAccessibleInterface(&radio);
- QAccessibleInterface *acc_label2 = QAccessible::queryAccessibleInterface(&label2);
- QAccessibleInterface *acc_lineedit2 = QAccessible::queryAccessibleInterface(&lineedit2);
- QAccessibleInterface *acc_groupbox2 = QAccessible::queryAccessibleInterface(&groupbox2);
- QAccessibleInterface *acc_grandchild = QAccessible::queryAccessibleInterface(&grandchild);
- QAccessibleInterface *acc_border = QAccessible::queryAccessibleInterface(&border);
- QAccessibleInterface *acc_lineedit3 = QAccessible::queryAccessibleInterface(&lineedit3);
-
- QVERIFY(acc_label->relationTo(0, acc_lineedit,0) & QAccessible::Label);
- QVERIFY(acc_groupbox->relationTo(0, acc_radio,0) & QAccessible::Label);
- QVERIFY(acc_groupbox->relationTo(0, acc_lineedit2,0) & QAccessible::Label);
- QVERIFY(acc_groupbox->relationTo(0, acc_groupbox2,0) & QAccessible::Label);
- QVERIFY(acc_groupbox2->relationTo(0, acc_grandchild,0) & QAccessible::Label);
- QVERIFY(!(acc_border->relationTo(0, acc_lineedit3,0) & QAccessible::Label));
-
- QAccessibleInterface *acc_target;
- // from label
- QCOMPARE(acc_label->navigate(QAccessible::Labelled, 0, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_label->navigate(QAccessible::Labelled, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_lineedit->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_label->navigate(QAccessible::Labelled, 2, &acc_target), -1);
- QVERIFY(!acc_target);
-
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 0, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_radio->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 2, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_label2->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 3, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_lineedit2->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 4, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_groupbox2->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_groupbox->navigate(QAccessible::Labelled, 5, &acc_target), -1);
- QVERIFY(!acc_target);
-
- QCOMPARE(acc_border->navigate(QAccessible::Labelled, 0, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_border->navigate(QAccessible::Labelled, 1, &acc_target), -1);
- QVERIFY(!acc_target);
-
- // to label
- QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 0, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_label->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_lineedit->navigate(QAccessible::Label, 2, &acc_target), -1);
- QVERIFY(!acc_target);
-
- QCOMPARE(acc_radio->navigate(QAccessible::Label, 0, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_radio->navigate(QAccessible::Label, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_groupbox->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_radio->navigate(QAccessible::Label, 2, &acc_target), -1);
- QVERIFY(!acc_target);
-
- QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_label2->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 2, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_groupbox->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_lineedit2->navigate(QAccessible::Label, 3, &acc_target), -1);
- QVERIFY(!acc_target);
-
- QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 1, &acc_target), 0);
- QVERIFY(acc_target->object() == acc_groupbox2->object());
- delete acc_target; acc_target = 0;
- QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 2, &acc_target), -1);
- QVERIFY(!acc_target);
- QCOMPARE(acc_grandchild->navigate(QAccessible::Label, 3, &acc_target), -1);
- QVERIFY(!acc_target);
-
- delete acc_label;
- delete acc_lineedit;
- delete acc_groupbox;
- delete acc_radio;
- delete acc_label2;
- delete acc_lineedit2;
- delete acc_groupbox2;
- delete acc_grandchild;
- delete acc_border;
- delete acc_lineedit3;
- }
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
-}
-
static QWidget *createWidgets()
{
QWidget *w = new QWidget();
@@ -1550,7 +828,6 @@ static QWidget *createWidgets()
void tst_QAccessibility::accessibleName()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget *toplevel = createWidgets();
toplevel->show();
#if defined(Q_WS_X11)
@@ -1575,158 +852,10 @@ void tst_QAccessibility::accessibleName()
delete toplevel;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-}
-
-void tst_QAccessibility::text()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = createGUI();
- toplevel->show();
-#if defined(Q_WS_X11)
- qt_x11_wait_for_window_manager(toplevel);
- QTest::qWait(100);
-#endif
- QObject *topLeft = toplevel->child("topLeft");
- QObject *topRight = toplevel->child("topRight");
- QObject *bottomLeft = toplevel->child("bottomLeft");
-
- QAccessibleInterface *acc_pb1 = QAccessible::queryAccessibleInterface(topLeft->child("pb1"));
-
- QAccessibleInterface *acc_pbOk = QAccessible::queryAccessibleInterface(topRight->child("pbOk"));
- QAccessibleInterface *acc_slider = QAccessible::queryAccessibleInterface(topRight->child("slider"));
- QAccessibleInterface *acc_spinBox = QAccessible::queryAccessibleInterface(topRight->child("spinBox"));
- QAccessibleInterface *acc_sliderLcd = QAccessible::queryAccessibleInterface(topRight->child("sliderLcd"));
-
- QAccessibleInterface *acc_label = QAccessible::queryAccessibleInterface(bottomLeft->child("label"));
- QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->child("lineedit"));
- QAccessibleInterface *acc_radiogroup = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup"));
- QVERIFY(bottomLeft->child("radiogroup"));
- QAccessibleInterface *acc_radioAM = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("radioAM"));
- QAccessibleInterface *acc_frequency = QAccessible::queryAccessibleInterface(bottomLeft->child("radiogroup")->child("frequency"));
-
- QVERIFY(acc_pb1);
-
- QVERIFY(acc_pbOk);
- QVERIFY(acc_slider);
- QVERIFY(acc_spinBox);
- QVERIFY(acc_sliderLcd);
-
- QVERIFY(acc_label);
- QVERIFY(acc_lineedit);
- QVERIFY(acc_radiogroup);
- QVERIFY(acc_radioAM);
- QVERIFY(acc_frequency);
-
- QVERIFY(acc_label->relationTo(0, acc_lineedit, 0) & QAccessible::Label);
- QVERIFY(acc_radiogroup->relationTo(0, acc_frequency, 0) & QAccessible::Label);
- QVERIFY(acc_slider->relationTo(0, acc_sliderLcd, 0) & QAccessible::Controller);
- QVERIFY(acc_spinBox->relationTo(0, acc_slider, 0) & QAccessible::Controller);
-
- // Name
- QCOMPARE(acc_lineedit->text(QAccessible::Name, 0), acc_label->text(QAccessible::Name,0));
- QCOMPARE(acc_frequency->text(QAccessible::Name, 0), acc_radiogroup->text(QAccessible::Name,0));
- QCOMPARE(acc_sliderLcd->text(QAccessible::Name, 0), acc_slider->text(QAccessible::Value,0));
- QCOMPARE(acc_pbOk->text(QAccessible::Name, 0), QString("Ok"));
- QCOMPARE(acc_radioAM->text(QAccessible::Name, 0), QString("AM"));
- QCOMPARE(acc_pb1->text(QAccessible::Name, 0), QString("Button1"));
-
- // Description
- QString desc = qobject_cast<QWidget*>(acc_label->object())->toolTip();
- QVERIFY(!desc.isEmpty());
- QCOMPARE(acc_label->text(QAccessible::Description, 0), desc);
- desc = qobject_cast<QWidget*>(acc_lineedit->object())->toolTip();
- QVERIFY(!desc.isEmpty());
- QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), desc);
-
- // Help
- QString help = qobject_cast<QWidget*>(acc_label->object())->whatsThis();
- QVERIFY(!help.isEmpty());
- QCOMPARE(acc_label->text(QAccessible::Help, 0), help);
- help = qobject_cast<QWidget*>(acc_frequency->object())->whatsThis();
- QVERIFY(!help.isEmpty());
- QCOMPARE(acc_frequency->text(QAccessible::Help, 0), help);
-
- // Value
- QString value = acc_frequency->object()->property("text").toString();
- QVERIFY(!value.isEmpty());
- QCOMPARE(acc_frequency->text(QAccessible::Value, 0), value);
- value = acc_slider->object()->property("value").toString();
- QVERIFY(!value.isEmpty());
- QCOMPARE(acc_slider->text(QAccessible::Value, 0), value);
- QCOMPARE(acc_spinBox->text(QAccessible::Value, 0), value);
-
- // Accelerator
- QCOMPARE(acc_pbOk->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::Key_Enter));
- QCOMPARE(acc_pb1->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT + Qt::Key_1));
- QCOMPARE(acc_lineedit->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "L");
- QCOMPARE(acc_frequency->text(QAccessible::Accelerator, 0), Q3Accel::keyToString(Qt::ALT) + "C");
-
- delete acc_pb1;
- delete acc_pbOk;
- delete acc_slider;
- delete acc_spinBox;
- delete acc_sliderLcd;
-
- delete acc_label;
- delete acc_lineedit;
- delete acc_radiogroup;
- delete acc_radioAM;
- delete acc_frequency;
-
- delete toplevel;
- QTestAccessibility::clearEvents();
-
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif // !QT3_SUPPORT
-}
-
-void tst_QAccessibility::setText()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QWidget *toplevel = createGUI();
- toplevel->show();
- QObject *bottomLeft = toplevel->findChild<QObject *>("bottomLeft");
-
- QAccessibleInterface *acc_lineedit = QAccessible::queryAccessibleInterface(bottomLeft->findChild<QLineEdit *>("lineedit"));
- // Value, read-write
- QString txt = acc_lineedit->text(QAccessible::Value, 0);
- QVERIFY(txt.isEmpty());
- txt = QLatin1String("Writable");
- acc_lineedit->setText(QAccessible::Value, 0, txt);
- QCOMPARE(acc_lineedit->text(QAccessible::Value, 0), txt);
-
- // Description, read-only
- txt = acc_lineedit->text(QAccessible::Description, 0);
- QVERIFY(!txt.isEmpty());
- acc_lineedit->setText(QAccessible::Description, 0, QLatin1String(""));
- QCOMPARE(acc_lineedit->text(QAccessible::Description, 0), txt);
-
- QVERIFY(acc_lineedit);
-
- delete acc_lineedit;
- delete toplevel;
- QTestAccessibility::clearEvents();
-
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif //QT3_SUPPORT
}
void tst_QAccessibility::hideShowTest()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget * const window = new QWidget();
QWidget * const child = new QWidget(window);
@@ -1753,14 +882,10 @@ void tst_QAccessibility::hideShowTest()
delete window;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::userActionCount()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget widget;
QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget);
@@ -1790,18 +915,14 @@ void tst_QAccessibility::userActionCount()
QCOMPARE(test->userActionCount(1), 0);
QCOMPARE(test->userActionCount(-1), 0);
delete test; test = 0;
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::actionText()
{
-#ifdef QTEST_ACCESSIBILITY
- QWidget widget;
- widget.show();
+ QWidget *widget = new QWidget;
+ widget->show();
- QAccessibleInterface *test = QAccessible::queryAccessibleInterface(&widget);
+ QAccessibleInterface *test = QAccessible::queryAccessibleInterface(widget);
QVERIFY(test);
QVERIFY(test->isValid());
@@ -1813,20 +934,15 @@ void tst_QAccessibility::actionText()
QCOMPARE(test->actionText(QAccessible::DefaultAction, QAccessible::Name, 0), QString("SetFocus"));
QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QString("SetFocus"));
- delete test; test = 0;
+ delete test;
+ delete widget;
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
+ QTestAccessibility::clearEvents();
}
void tst_QAccessibility::doAction()
{
-#ifdef QTEST_ACCESSIBILITY
QSKIP("TODO: Implement me", SkipAll);
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::applicationTest()
@@ -1881,7 +997,6 @@ public Q_SLOTS:
void tst_QAccessibility::buttonTest()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget window;
window.setLayout(new QVBoxLayout);
@@ -1913,32 +1028,6 @@ void tst_QAccessibility::buttonTest()
toggletool.setText("Toggle");
toggletool.setMinimumSize(20,20);
-#if 0
- // QT3_SUPPORT
- // push button with a menu
- QPushButton menuButton("Menu", &window);
- Q3PopupMenu buttonMenu(&menuButton);
- buttonMenu.insertItem("Some item");
- menuButton.setPopup(&buttonMenu);
-
- // menu toolbutton
- QToolButton menuToolButton(&window);
- menuToolButton.setText("Menu Tool");
- Q3PopupMenu toolMenu(&menuToolButton);
- toolMenu.insertItem("Some item");
- menuToolButton.setPopup(&toolMenu);
- menuToolButton.setMinimumSize(20,20);
-
- // splitted menu toolbutton
- QToolButton splitToolButton(&window);
- splitToolButton.setTextLabel("Split Tool");
- Q3PopupMenu splitMenu(&splitToolButton);
- splitMenu.insertItem("Some item");
- splitToolButton.setPopup(&splitMenu);
- splitToolButton.setPopupDelay(0);
- splitToolButton.setMinimumSize(20,20);
-#endif
-
// test push button
QAccessibleInterface* interface = QAccessible::queryAccessibleInterface(&pushButton);
QAccessibleActionInterface* actionInterface = interface->actionInterface();
@@ -2070,215 +1159,10 @@ void tst_QAccessibility::buttonTest()
// test->release();
QTestAccessibility::clearEvents();
-
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-}
-
-void tst_QAccessibility::sliderTest()
-{
-#if !defined(QT3_SUPPORT)
- QSKIP("This test needs Qt3Support", SkipAll);
-#else
-#ifdef QTEST_ACCESSIBILITY
- QAccessibleInterface *test = 0;
- Q3VBox vbox;
- QLabel labelHorizontal("Horizontal", &vbox);
- QSlider sliderHorizontal(Qt::Horizontal, &vbox);
- labelHorizontal.setBuddy(&sliderHorizontal);
-
- QLabel labelVertical("Vertical", &vbox);
- QSlider sliderVertical(Qt::Vertical, &vbox);
- labelVertical.setBuddy(&sliderVertical);
- vbox.show();
-
- // test horizontal slider
- test = QAccessible::queryAccessibleInterface(&sliderHorizontal);
- QVERIFY(test);
- QCOMPARE(test->childCount(), 3);
- QCOMPARE(test->role(0), QAccessible::Slider);
- QCOMPARE(test->role(1), QAccessible::PushButton);
- QCOMPARE(test->role(2), QAccessible::Indicator);
- QCOMPARE(test->role(3), QAccessible::PushButton);
-
- QCOMPARE(test->text(QAccessible::Name, 0), labelHorizontal.text());
- QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page left"));
- QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position"));
- QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page right"));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.value()));
- QCOMPARE(test->text(QAccessible::Value, 1), QString());
- QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderHorizontal.value()));
- QCOMPARE(test->text(QAccessible::Value, 3), QString());
-// Skip acton tests.
-#if 0
- QCOMPARE(test->defaultAction(0), QAccessible::SetFocus);
- QCOMPARE(test->defaultAction(1), QAccessible::Press);
- QCOMPARE(test->defaultAction(2), QAccessible::NoAction);
- QCOMPARE(test->defaultAction(3), QAccessible::Press);
- QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus"));
- QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press"));
- QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase"));
- QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease"));
- QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press"));
- QVERIFY(test->doAction(QAccessible::Press, 3));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 3));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 1));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 1));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0));
- QVERIFY(test->doAction(QAccessible::Increase, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep()));
- QVERIFY(test->doAction(QAccessible::Increase, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderHorizontal.lineStep()));
- QVERIFY(test->doAction(QAccessible::Decrease, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderHorizontal.lineStep()));
- QVERIFY(test->doAction(QAccessible::Decrease, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0));
-#endif
- delete test;
-
- // test vertical slider
- test = QAccessible::queryAccessibleInterface(&sliderVertical);
- QVERIFY(test);
- QCOMPARE(test->childCount(), 3);
- QCOMPARE(test->role(0), QAccessible::Slider);
- QCOMPARE(test->role(1), QAccessible::PushButton);
- QCOMPARE(test->role(2), QAccessible::Indicator);
- QCOMPARE(test->role(3), QAccessible::PushButton);
-
- QCOMPARE(test->text(QAccessible::Name, 0), labelVertical.text());
- QCOMPARE(test->text(QAccessible::Name, 1), QSlider::tr("Page up"));
- QCOMPARE(test->text(QAccessible::Name, 2), QSlider::tr("Position"));
- QCOMPARE(test->text(QAccessible::Name, 3), QSlider::tr("Page down"));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.value()));
- QCOMPARE(test->text(QAccessible::Value, 1), QString());
- QCOMPARE(test->text(QAccessible::Value, 2), QString::number(sliderVertical.value()));
- QCOMPARE(test->text(QAccessible::Value, 3), QString());
-// Skip acton tests.
-#if 0
- QCOMPARE(test->defaultAction(0), QAccessible::SetFocus);
- QCOMPARE(test->defaultAction(1), QAccessible::Press);
- QCOMPARE(test->defaultAction(2), QAccessible::NoAction);
- QCOMPARE(test->defaultAction(3), QAccessible::Press);
- QCOMPARE(test->actionText(QAccessible::SetFocus, QAccessible::Name, 0), QSlider::tr("Set Focus"));
- QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 1), QSlider::tr("Press"));
- QCOMPARE(test->actionText(QAccessible::Increase, QAccessible::Name, 2), QSlider::tr("Increase"));
- QCOMPARE(test->actionText(QAccessible::Decrease, QAccessible::Name, 2), QSlider::tr("Decrease"));
- QCOMPARE(test->actionText(QAccessible::Press, QAccessible::Name, 3), QSlider::tr("Press"));
- QVERIFY(test->doAction(QAccessible::Press, 3));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 3));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 1));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.pageStep()));
- QVERIFY(test->doAction(QAccessible::Press, 1));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0));
- QVERIFY(test->doAction(QAccessible::Increase, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep()));
- QVERIFY(test->doAction(QAccessible::Increase, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(2*sliderVertical.lineStep()));
- QVERIFY(test->doAction(QAccessible::Decrease, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(sliderVertical.lineStep()));
- QVERIFY(test->doAction(QAccessible::Decrease, 2));
- QCOMPARE(test->text(QAccessible::Value, 0), QString::number(0));
-#endif
- delete test;
-
- // Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the
- // Invisible state bit set.
- enum SubControls { PageLeft = 1, Position = 2, PageRight = 3 };
-
- QSlider *slider = new QSlider();
- QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider);
- QVERIFY(sliderInterface);
-
- QVERIFY(sliderInterface->state(0) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible);
-
- slider->show();
- QVERIFY(sliderInterface->state(0) ^ QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Invisible);
- QVERIFY(sliderInterface->state(Position) ^ QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Invisible);
- QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectShow)));
- QTestAccessibility::clearEvents();
-
- slider->hide();
- QVERIFY(sliderInterface->state(0) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(Position) & QAccessible::Invisible);
- QVERIFY(sliderInterface->state(PageRight) & QAccessible::Invisible);
- QVERIFY(QTestAccessibility::events().contains(QTestAccessibilityEvent(slider, 0, QAccessible::ObjectHide)));
- QTestAccessibility::clearEvents();
-
- // Test that the left/right subcontrols are set to unavailable when the slider is at the minimum/maximum.
- slider->show();
- slider->setMinimum(0);
- slider->setMaximum(100);
-
- slider->setValue(50);
- QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable);
-
- slider->setValue(0);
- QVERIFY(sliderInterface->state(PageLeft) & QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(PageRight) ^ QAccessible::Unavailable);
-
- slider->setValue(100);
- QVERIFY(sliderInterface->state(PageLeft) ^ QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(Position) ^ QAccessible::Unavailable);
- QVERIFY(sliderInterface->state(PageRight) & QAccessible::Unavailable);
-
- delete sliderInterface;
- delete slider;
-
- // Test that the rects are ok.
- {
- QSlider *slider = new QSlider(Qt::Horizontal);
- slider->show();
-#if defined(Q_WS_X11)
- qt_x11_wait_for_window_manager(slider);
- QTest::qWait(100);
-#endif
- QAccessibleInterface * const sliderInterface = QAccessible::queryAccessibleInterface(slider);
- QVERIFY(sliderInterface);
-
- slider->setMinimum(0);
- slider->setMaximum(100);
- slider->setValue(50);
-
- const QRect sliderRect = sliderInterface->rect(0);
- QVERIFY(sliderRect.isValid());
-
- // Verify that the sub-control rects are valid and inside the slider rect.
- for (int i = PageLeft; i <= PageRight; ++i) {
- const QRect testRect = sliderInterface->rect(i);
- QVERIFY(testRect.isValid());
- QVERIFY(sliderRect.contains(testRect));
- }
-
- delete slider;
- delete sliderInterface;
- }
-
-
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif //!QT3_SUPPORT
}
void tst_QAccessibility::scrollBarTest()
{
-#ifdef QTEST_ACCESSIBILITY
// Test that when we hide() a slider, the PageLeft, Indicator, and PageRight also gets the
// Invisible state bit set.
enum SubControls { LineUp = 1,
@@ -2286,7 +1170,7 @@ void tst_QAccessibility::scrollBarTest()
Position = 3,
PageDown = 4,
LineDown = 5
- };
+ };
QScrollBar *scrollBar = new QScrollBar();
QAccessibleInterface * const scrollBarInterface = QAccessible::queryAccessibleInterface(scrollBar);
@@ -2368,15 +1252,10 @@ void tst_QAccessibility::scrollBarTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
}
void tst_QAccessibility::tabTest()
{
-#ifdef QTEST_ACCESSIBILITY
QTabBar *tabBar = new QTabBar();
tabBar->show();
@@ -2412,9 +1291,6 @@ void tst_QAccessibility::tabTest()
delete tabBar;
delete interface;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::tabWidgetTest()
@@ -2512,7 +1388,6 @@ void tst_QAccessibility::tabWidgetTest()
void tst_QAccessibility::menuTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QMainWindow mw;
mw.resize(300, 200);
@@ -2758,14 +1633,10 @@ void tst_QAccessibility::menuTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::spinBoxTest()
{
-#ifdef QTEST_ACCESSIBILITY
QSpinBox * const spinBox = new QSpinBox();
spinBox->show();
@@ -2792,14 +1663,10 @@ void tst_QAccessibility::spinBoxTest()
QVERIFY(events.contains(expectedEvent));
delete spinBox;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::doubleSpinBoxTest()
{
-#ifdef QTEST_ACCESSIBILITY
QDoubleSpinBox *doubleSpinBox = new QDoubleSpinBox;
doubleSpinBox->show();
@@ -2819,14 +1686,10 @@ void tst_QAccessibility::doubleSpinBoxTest()
delete doubleSpinBox;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::textEditTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QTextEdit edit;
QString text = "hello world\nhow are you today?\n";
@@ -2846,14 +1709,10 @@ void tst_QAccessibility::textEditTest()
QCOMPARE(iface->textInterface()->characterRect(6, QAccessible2::RelativeToParent).size(), QSize(fm.width("w"), fm.height()));
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::textBrowserTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QTextBrowser textBrowser;
QString text = QLatin1String("Hello world\nhow are you today?\n");
@@ -2870,14 +1729,10 @@ void tst_QAccessibility::textBrowserTest()
QCOMPARE(interface->text(QAccessible::Value, 6), QString());
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::listViewTest()
{
-#if 1 //def QTEST_ACCESSIBILITY
{
QListView listView;
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(&listView);
@@ -2943,15 +1798,11 @@ void tst_QAccessibility::listViewTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::mdiAreaTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QMdiArea mdiArea;
mdiArea.resize(400,300);
@@ -3000,14 +1851,10 @@ void tst_QAccessibility::mdiAreaTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::mdiSubWindowTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QMdiArea mdiArea;
mdiArea.show();
@@ -3130,14 +1977,10 @@ void tst_QAccessibility::mdiSubWindowTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::lineEditTest()
{
-#ifdef QTEST_ACCESSIBILITY
QLineEdit *le = new QLineEdit;
QAccessibleInterface *iface = QAccessible::queryAccessibleInterface(le);
QVERIFY(iface);
@@ -3195,14 +2038,10 @@ void tst_QAccessibility::lineEditTest()
delete le2;
delete toplevel;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::workspaceTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QWorkspace workspace;
workspace.resize(400,300);
@@ -3256,14 +2095,10 @@ void tst_QAccessibility::workspaceTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::dialogButtonBoxTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QDialogButtonBox box(QDialogButtonBox::Reset |
QDialogButtonBox::Help |
@@ -3376,14 +2211,10 @@ void tst_QAccessibility::dialogButtonBoxTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::dialTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QDial dial;
dial.setValue(20);
@@ -3425,28 +2256,20 @@ void tst_QAccessibility::dialTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::rubberBandTest()
{
-#ifdef QTEST_ACCESSIBILITY
QRubberBand rubberBand(QRubberBand::Rectangle);
QAccessibleInterface *interface = QAccessible::queryAccessibleInterface(&rubberBand);
QVERIFY(interface);
QCOMPARE(interface->role(0), QAccessible::Border);
delete interface;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::abstractScrollAreaTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QAbstractScrollArea abstractScrollArea;
@@ -3604,14 +2427,10 @@ void tst_QAccessibility::abstractScrollAreaTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::scrollAreaTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QScrollArea scrollArea;
scrollArea.show();
@@ -3625,14 +2444,10 @@ void tst_QAccessibility::scrollAreaTest()
delete interface;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::tableWidgetTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QWidget *topLevel = new QWidget;
QTableWidget *w = new QTableWidget(8,4,topLevel);
@@ -3672,10 +2487,6 @@ void tst_QAccessibility::tableWidgetTest()
delete topLevel;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
}
class QtTestTableModel: public QAbstractTableModel
@@ -3758,7 +2569,6 @@ public:
void tst_QAccessibility::tableViewTest()
{
-#ifdef QTEST_ACCESSIBILITY
{
QtTestTableModel *model = new QtTestTableModel(3, 4);
QTableView *w = new QTableView();
@@ -3838,15 +2648,11 @@ void tst_QAccessibility::tableViewTest()
delete model;
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::calendarWidgetTest()
{
#ifndef QT_NO_CALENDARWIDGET
-#ifdef QTEST_ACCESSIBILITY
{
QCalendarWidget calendarWidget;
@@ -3939,17 +2745,12 @@ void tst_QAccessibility::calendarWidgetTest()
}
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
#endif // QT_NO_CALENDARWIDGET
}
void tst_QAccessibility::dockWidgetTest()
{
#ifndef QT_NO_DOCKWIDGET
-
-#ifdef QTEST_ACCESSIBILITY
// Set up a proper main window with two dock widgets
QMainWindow *mw = new QMainWindow();
QFrame *central = new QFrame(mw);
@@ -4017,61 +2818,11 @@ void tst_QAccessibility::dockWidgetTest()
delete dock2;
delete mw;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
#endif // QT_NO_DOCKWIDGET
}
-void tst_QAccessibility::pushButtonTest()
-{
-#if !defined(QT3_SUPPORT)
- qWarning( "Should never get here without Qt3Support");
- return ;
-#else
-#ifdef QTEST_ACCESSIBILITY
- // Set up a proper main window with two dock widgets
- QWidget *toplevel = createGUI();
- QObject *topRight = toplevel->findChild<QObject *>("topRight");
-
- toplevel->show();
-#if defined(Q_WS_X11)
- qt_x11_wait_for_window_manager(toplevel);
- QTest::qWait(100);
-#endif
- QPushButton *pb = qobject_cast<QPushButton*>(topRight->findChild<QPushButton *>("pbOk"));
- QPoint pt = pb->mapToGlobal(pb->geometry().topLeft());
- QRect rect(pt, pb->geometry().size());
- pt = rect.center();
-
- QAccessibleInterface *accToplevel = QAccessible::queryAccessibleInterface(toplevel);
- QAccessibleInterface *acc;
- QAccessibleInterface *acc2;
- int entry = accToplevel->childAt(pt.x(), pt.y());
- accToplevel->navigate(QAccessible::Child, entry, &acc);
- if (acc) {
- entry = acc->childAt(pt.x(), pt.y());
- acc->navigate(QAccessible::Child, entry, &acc2);
- delete acc;
- acc = acc2;
- }
- QCOMPARE(acc->role(0), QAccessible::PushButton);
- QCOMPARE(acc->rect(0), rect);
- QCOMPARE(acc->childAt(pt.x(), pt.y()), 0);
-
- delete acc;
- delete accToplevel;
- delete toplevel;
- QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-#endif //QT3_SUPPORT
-}
-
void tst_QAccessibility::comboBoxTest()
{
-#ifdef QTEST_ACCESSIBILITY
#if defined(Q_OS_WINCE)
if (!IsValidCEPlatform()) {
QSKIP("Test skipped on Windows Mobile test hardware", SkipAll);
@@ -4109,15 +2860,10 @@ void tst_QAccessibility::comboBoxTest()
delete w;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
-
}
void tst_QAccessibility::treeWidgetTest()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget *w = new QWidget;
QTreeWidget *tree = new QTreeWidget(w);
QHBoxLayout *l = new QHBoxLayout(w);
@@ -4175,14 +2921,10 @@ void tst_QAccessibility::treeWidgetTest()
delete w;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::labelTest()
{
-#ifdef QTEST_ACCESSIBILITY
QString text = "Hello World";
QLabel *label = new QLabel(text);
label->show();
@@ -4221,14 +2963,10 @@ void tst_QAccessibility::labelTest()
delete acc_label;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs accessibility support.", SkipAll);
-#endif
}
void tst_QAccessibility::accelerators()
{
-#ifdef QTEST_ACCESSIBILITY
QWidget *window = new QWidget;
QHBoxLayout *lay = new QHBoxLayout(window);
QLabel *label = new QLabel(tr("&Line edit"), window);
@@ -4252,6 +2990,10 @@ void tst_QAccessibility::accelerators()
QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A"));
label->setText(tr("Q &&A"));
QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QString());
+
+#if !defined(QT_NO_DEBUG) && !defined(Q_WS_MAC)
+ QTest::ignoreMessage(QtWarningMsg, "QKeySequence::mnemonic: \"Q &A&B\" contains multiple occurrences of '&'");
+#endif
label->setText(tr("Q &A&B"));
QCOMPARE(accLineEdit->text(QAccessible::Accelerator, 0), QKeySequence(Qt::ALT).toString(QKeySequence::NativeText) + QLatin1String("A"));
@@ -4261,9 +3003,6 @@ void tst_QAccessibility::accelerators()
QTest::qWait(100);
delete window;
QTestAccessibility::clearEvents();
-#else
- QSKIP("Test needs Qt >= 0x040000 and accessibility support.", SkipAll);
-#endif
}
diff --git a/tests/auto/qalgorithms/q3tl.h b/tests/auto/qalgorithms/q3tl.h
deleted file mode 100644
index c856cbf533..0000000000
--- a/tests/auto/qalgorithms/q3tl.h
+++ /dev/null
@@ -1,212 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt3Support module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
-**
-**
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef Q3TL_H
-#define Q3TL_H
-
-#include <QtCore/qalgorithms.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-QT_MODULE(Qt3SupportLight)
-
-template <typename T, typename LessThan>
-Q_OUTOFLINE_TEMPLATE void qHeapSortPushDown(T *heap, int first, int last, LessThan lessThan)
-{
- int r = first;
- while (r <= last / 2) {
- if (last == 2 * r) {
- // node r has only one child
- if (lessThan(heap[2 * r], heap[r]))
- qSwap(heap[r], heap[2 * r]);
- r = last;
- } else {
- // node r has two children
- if (lessThan(heap[2 * r], heap[r]) && !lessThan(heap[2 * r + 1], heap[2 * r])) {
- // swap with left child
- qSwap(heap[r], heap[2 * r]);
- r *= 2;
- } else if (lessThan(heap[2 * r + 1], heap[r])
- && lessThan(heap[2 * r + 1], heap[2 * r])) {
- // swap with right child
- qSwap(heap[r], heap[2 * r + 1]);
- r = 2 * r + 1;
- } else {
- r = last;
- }
- }
- }
-}
-
-template <typename BiIterator, typename T, typename LessThan>
-Q_OUTOFLINE_TEMPLATE void qHeapSortHelper(BiIterator begin, BiIterator end, const T & /* dummy */, LessThan lessThan)
-{
- BiIterator it = begin;
- uint n = 0;
- while (it != end) {
- ++n;
- ++it;
- }
- if (n == 0)
- return;
-
- // Create the heap
- BiIterator insert = begin;
- T *realheap = new T[n];
- T *heap = realheap - 1;
- int size = 0;
- for(; insert != end; ++insert) {
- heap[++size] = *insert;
- int i = size;
- while (i > 1 && lessThan(heap[i], heap[i / 2])) {
- qSwap(heap[i], heap[i / 2]);
- i /= 2;
- }
- }
-
- // Now do the sorting
- for (int i = n; i > 0; i--) {
- *begin++ = heap[1];
- if (i > 1) {
- heap[1] = heap[i];
- qHeapSortPushDown(heap, 1, i - 1, lessThan);
- }
- }
-
- delete[] realheap;
-}
-
-template <typename BiIterator, typename T>
-inline void qHeapSortHelper(BiIterator begin, BiIterator end, const T &dummy)
-{
- qHeapSortHelper(begin, end, dummy, qLess<T>());
-}
-
-template <typename BiIterator, typename LessThan>
-inline void qHeapSort(BiIterator begin, BiIterator end, LessThan lessThan)
-{
- if (begin != end)
- qHeapSortHelper(begin, end, *begin, lessThan);
-}
-
-template <typename BiIterator>
-inline void qHeapSort(BiIterator begin, BiIterator end)
-{
- if (begin != end)
- qHeapSortHelper(begin, end, *begin);
-}
-
-template <typename Container>
-inline void qHeapSort(Container &c)
-{
-#ifdef Q_CC_BOR
- // Work around Borland 5.5 optimizer bug
- c.detach();
-#endif
- if (!c.empty())
- qHeapSortHelper(c.begin(), c.end(), *c.begin());
-}
-
-
-template <typename BiIterator, typename LessThan>
-void qBubbleSort(BiIterator begin, BiIterator end, LessThan lessThan)
-{
- // Goto last element;
- BiIterator last = end;
-
- // empty list
- if (begin == end)
- return;
-
- --last;
- // only one element ?
- if (last == begin)
- return;
-
- // So we have at least two elements in here
- while (begin != last) {
- bool swapped = false;
- BiIterator swapPos = begin;
- BiIterator x = end;
- BiIterator y = x;
- y--;
- do {
- --x;
- --y;
- if (lessThan(*x, *y)) {
- swapped = true;
- qSwap(*x, *y);
- swapPos = y;
- }
- } while (y != begin);
- if (!swapped)
- return;
- begin = swapPos;
- ++begin;
- }
-}
-
-template <typename BiIterator, typename T>
-void qBubbleSortHelper(BiIterator begin, BiIterator end, T)
-{
- qBubbleSort(begin, end, qLess<T>());
-}
-
-template <typename BiIterator>
-void qBubbleSort(BiIterator begin, BiIterator end)
-{
- if (begin != end)
- qBubbleSortHelper(begin, end, *begin);
-}
-
-template <typename Container>
-inline void qBubbleSort(Container &c)
-{
- qBubbleSort(c.begin(), c.end());
-}
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // Q3TL_H
diff --git a/tests/auto/qalgorithms/tst_qalgorithms.cpp b/tests/auto/qalgorithms/tst_qalgorithms.cpp
index d0d8e9aead..75df1fea79 100644
--- a/tests/auto/qalgorithms/tst_qalgorithms.cpp
+++ b/tests/auto/qalgorithms/tst_qalgorithms.cpp
@@ -47,7 +47,6 @@
#include <sstream>
#include <algorithm>
#include <qalgorithms.h>
-#include "q3tl.h"
#include <QStringList>
#include <QString>
#include <QVector>
@@ -71,8 +70,6 @@ public slots:
void cleanup();
private slots:
- void qBubbleSort();
- void qHeapSort();
void test_qLowerBound_data();
void test_qLowerBound();
void test_qUpperBound_data();
@@ -100,13 +97,11 @@ private:
};
tst_QAlgorithms::tst_QAlgorithms()
-
{
}
tst_QAlgorithms::~tst_QAlgorithms()
{
-
}
void tst_QAlgorithms::init()
@@ -241,7 +236,8 @@ QList<ResultSet> testAlgorithm(Algorithm &algorithm, QStringList dataSetTypes,
foreach(QString dataSetType, dataSetTypes) {
QVector<DataType> container = generateData<DataType>(dataSetType, size);
results.append(testRun(container, algorithm, time));
- Q_ASSERT(isSorted(container));
+ if (!isSorted(container))
+ qWarning("%s: container is not sorted after test", Q_FUNC_INFO);
}
return results;
}
@@ -266,149 +262,6 @@ void testAlgorithm(Algorithm algorithm, QStringList &dataSetTypes)
}
}
#endif
-static bool userFunction1(char ch1, char ch2)
-{
- return (ch1 ^ 1) < (ch2 ^ 1);
-}
-
-bool userFunction2(const char &ch1, char ch2)
-{
- return (ch1 ^ 1) < (ch2 ^ 1);
-}
-
-static inline bool userFunction3(char ch1, const char &ch2)
-{
- return (ch1 ^ 1) < (ch2 ^ 1);
-}
-
-inline bool userFunction4(const char &ch1, const char &ch2)
-{
- return (ch1 ^ 1) < (ch2 ^ 1);
-}
-
-class UserFunctor1
-{
-public:
- UserFunctor1(int x = 1) : y(x) {}
-
- bool operator()(char ch1, char ch2)
- {
- return (ch1 ^ y) < (ch2 ^ y);
- }
-
- char y;
-};
-
-void tst_QAlgorithms::qHeapSort()
-{
- char array1[] = "3141592";
- ::qHeapSort((char *)array1, array1 + strlen(array1));
- QVERIFY(strcmp(array1, "1123459") == 0);
-
- ::qHeapSort((char *)array1, array1 + strlen(array1), qGreater<char>());
- QVERIFY(strcmp(array1, "9543211") == 0);
-
- ::qHeapSort((char *)array1, array1 + strlen(array1), qLess<char>());
- QVERIFY(strcmp(array1, "1123459") == 0);
- {
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction1);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction2);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction3);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), userFunction4);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- UserFunctor1 userFunctor1;
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), userFunctor1);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1());
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(1));
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(3));
- QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0);
- ::qHeapSort((char *)array2, array2 + strlen(array2), UserFunctor1(0));
- QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0);
- }
-}
-
-void tst_QAlgorithms::qBubbleSort()
-{
- char array1[] = "3141592";
- ::qBubbleSort((char *)array1, array1 + strlen(array1));
- QVERIFY(strcmp(array1, "1123459") == 0);
-
- ::qBubbleSort((char *)array1, array1 + strlen(array1), qGreater<char>());
- QVERIFY(strcmp(array1, "9543211") == 0);
-
- ::qBubbleSort((char *)array1, array1 + strlen(array1), qLess<char>());
- QVERIFY(strcmp(array1, "1123459") == 0);
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction1);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction2);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction3);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunction4);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- UserFunctor1 userFunctor1;
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), userFunctor1);
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- }
-
- {
- char array2[] = "0123456789@ABCDE";
- ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1());
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(1));
- QVERIFY(strcmp(array2, "1032547698A@CBED") == 0);
- ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(3));
- QVERIFY(strcmp(array2, "3210765498CBA@ED") == 0);
- ::qBubbleSort((char *)array2, array2 + strlen(array2), UserFunctor1(0));
- QVERIFY(strcmp(array2, "0123456789@ABCDE") == 0);
- }
-}
void tst_QAlgorithms::swap()
{
@@ -557,7 +410,7 @@ void tst_QAlgorithms::sortedList()
QList<int> list;
list << 4 << 3 << 6;
- ::qHeapSort(list.begin(), list.end());
+ ::qSort(list.begin(), list.end());
QCOMPARE(list.count(), 3);
QCOMPARE(list.at(0), 3);
@@ -878,26 +731,6 @@ void tst_QAlgorithms::convenienceAPI()
}
template <typename DataType>
-class HeapSortHelper
-{
-public:
- void operator()(QVector<DataType> list)
- {
- ::qHeapSort(list);
- }
-};
-
-template <typename DataType>
-class BubbleSortHelper
-{
-public:
- void operator()(QVector<DataType> list)
- {
- ::qBubbleSort(list);
- }
-};
-
-template <typename DataType>
class QuickSortHelper
{
public:
@@ -948,22 +781,14 @@ void tst_QAlgorithms::performance()
testAlgorithm<StlSortHelper<TestInt>, TestInt>(StlSortHelper<TestInt>(), dataSetTypes);
cout << endl << "std::stable_sort" << endl;
testAlgorithm<StlStableSortHelper<TestInt>, TestInt>(StlStableSortHelper<TestInt>(), dataSetTypes);
- cout << "Heap sort" << endl;
- testAlgorithm<HeapSortHelper<TestInt>, TestInt>(HeapSortHelper<TestInt>(), dataSetTypes);
- cout << endl << "Bubble sort" << endl;
- testAlgorithm<BubbleSortHelper<TestInt>, TestInt>(BubbleSortHelper<TestInt>(), dataSetTypes);
/*
cout << endl << "Sorting lists of ints" << endl;
- cout << "Heap sort" << endl;
- testAlgorithm<HeapSortHelper<int>, int>(HeapSortHelper<int>(), dataSetTypes);
cout << endl << "Quick sort" << endl;
testAlgorithm<QuickSortHelper<int>, int>(QuickSortHelper<int>(), dataSetTypes);
cout << endl << "std::sort" << endl;
testAlgorithm<StlSortHelper<int>, int>(StlSortHelper<int>(), dataSetTypes);
cout << endl << "std::stable_sort" << endl;
testAlgorithm<StlStableSortHelper<int>, int>(StlStableSortHelper<int>(), dataSetTypes);
- cout << endl << "Bubble sort" << endl;
- testAlgorithm<BubbleSortHelper<int>, int>(BubbleSortHelper<int>(), dataSetTypes);
*/
}
#endif
diff --git a/tests/auto/qapplication/modal/main.cpp b/tests/auto/qapplication/modal/main.cpp
index 2365991084..8ff6f330fd 100644
--- a/tests/auto/qapplication/modal/main.cpp
+++ b/tests/auto/qapplication/modal/main.cpp
@@ -49,5 +49,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
QApplication::setAttribute(Qt::AA_NativeWindows); //QTBUG-15774
base *b = new base();
+ Q_UNUSED(b);
return app.exec();
}
diff --git a/tests/auto/qatomicint/tst_qatomicint.cpp b/tests/auto/qatomicint/tst_qatomicint.cpp
index 717187a2a6..5ccb997290 100644
--- a/tests/auto/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/qatomicint/tst_qatomicint.cpp
@@ -116,8 +116,7 @@ tst_QAtomicInt::~tst_QAtomicInt()
void tst_QAtomicInt::warningFreeHelper()
{
- Q_ASSERT(false);
- // The code below is bogus, and shouldn't be run. We're looking for warnings, only.
+ qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only.");
QBasicAtomicInt i = Q_BASIC_ATOMIC_INITIALIZER(0);
diff --git a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
index af8fabc962..05f8294148 100644
--- a/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
+++ b/tests/auto/qatomicpointer/tst_qatomicpointer.cpp
@@ -98,8 +98,7 @@ struct WFHC
void tst_QAtomicPointer::warningFreeHelper()
{
- Q_ASSERT(false);
- // The code below is bogus, and shouldn't be run. We're looking for warnings, only.
+ qFatal("This code is bogus, and shouldn't be run. We're looking for compiler warnings only.");
QBasicAtomicPointer<WFHC> p = Q_BASIC_ATOMIC_INITIALIZER(0);
diff --git a/tests/auto/qauthenticator/qauthenticator.pro b/tests/auto/qauthenticator/qauthenticator.pro
index 05f83bc166..8ddb13b0df 100644
--- a/tests/auto/qauthenticator/qauthenticator.pro
+++ b/tests/auto/qauthenticator/qauthenticator.pro
@@ -1,5 +1,5 @@
load(qttest_p4)
requires(contains(QT_CONFIG,private_tests))
-QT = core network
+QT = core network-private
SOURCES += tst_qauthenticator.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\"
diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp
index 3e3cc739bf..5d6b84f827 100644
--- a/tests/auto/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/qbuffer/tst_qbuffer.cpp
@@ -309,8 +309,7 @@ void tst_QBuffer::seekTest()
// (see Task 184730)
{
char c;
- const int offset = 1;
- Q_ASSERT(offset > 0); // any positive integer will do
+ const int offset = 1; // any positive integer will do
const qint64 pos = buf.size() + offset;
QVERIFY(buf.seek(pos));
QCOMPARE(buf.pos(), pos);
diff --git a/tests/auto/qchar/tst_qchar.cpp b/tests/auto/qchar/tst_qchar.cpp
index 45dd7ebed1..911a30cc77 100644
--- a/tests/auto/qchar/tst_qchar.cpp
+++ b/tests/auto/qchar/tst_qchar.cpp
@@ -548,14 +548,14 @@ void tst_QChar::normalization_data()
QList<QByteArray> l = line.split(';');
- Q_ASSERT(l.size() == 5);
+ QCOMPARE(l.size(), 5);
QStringList columns;
for (int i = 0; i < 5; ++i) {
columns.append(QString());
QList<QByteArray> c = l.at(i).split(' ');
- Q_ASSERT(!c.isEmpty());
+ QVERIFY(!c.isEmpty());
for (int j = 0; j < c.size(); ++j) {
bool ok;
diff --git a/tests/auto/qcolor/tst_qcolor.cpp b/tests/auto/qcolor/tst_qcolor.cpp
index d42c26cbd6..b02537ec57 100644
--- a/tests/auto/qcolor/tst_qcolor.cpp
+++ b/tests/auto/qcolor/tst_qcolor.cpp
@@ -1506,7 +1506,6 @@ void tst_QColor::setallowX11ColorNames()
for (int i = 0; i < x11RgbTblSize; ++i) {
QString colorName = QLatin1String(x11RgbTbl[i].name);
QColor color;
- QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1());
color.setNamedColor(colorName);
QVERIFY(!color.isValid());
}
@@ -1528,7 +1527,6 @@ void tst_QColor::setallowX11ColorNames()
for (int i = 0; i < x11RgbTblSize; ++i) {
QString colorName = QLatin1String(x11RgbTbl[i].name);
QColor color;
- QTest::ignoreMessage(QtWarningMsg, QString("QColor::setNamedColor: Unknown color name '%1'").arg(colorName).toLatin1());
color.setNamedColor(colorName);
QVERIFY(!color.isValid());
}
diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro
index 754f06fd49..e36df030c2 100644
--- a/tests/auto/qcolumnview/qcolumnview.pro
+++ b/tests/auto/qcolumnview/qcolumnview.pro
@@ -1,4 +1,5 @@
CONFIG += qttest_p4
+QT += gui-private core-private
SOURCES += tst_qcolumnview.cpp
TARGET = tst_qcolumnview
diff --git a/tests/auto/qcombobox/qcombobox.pro b/tests/auto/qcombobox/qcombobox.pro
index 2ac5c7c53b..a8f0e6ad23 100644
--- a/tests/auto/qcombobox/qcombobox.pro
+++ b/tests/auto/qcombobox/qcombobox.pro
@@ -1,3 +1,4 @@
load(qttest_p4)
+QT += gui-private core-private
SOURCES += tst_qcombobox.cpp
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index d525068893..33a630076e 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -1230,21 +1230,17 @@ void tst_QComboBox::insertItem_data()
QTest::addColumn<int>("insertIndex");
QTest::addColumn<QString>("itemLabel");
QTest::addColumn<int>("expectedIndex");
- QTest::addColumn<bool>("testQt3Support");
QTest::addColumn<bool>("editable");
QStringList initialItems;
initialItems << "foo" << "bar";
for(int e = 0 ; e<2 ; e++) {
bool editable = (e==0);
- QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << false << editable;
- QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << false << editable;
- QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << false << editable;
- QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << false << editable;
- QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << false << editable;
-#if defined(QT3_SUPPORT)
- QTest::newRow("Qt3Support: Insert less then 0") << initialItems << -1 << "inserted" << 2 << true << editable;
-#endif
+ QTest::newRow("Insert less then 0") << initialItems << -1 << "inserted" << 0 << editable;
+ QTest::newRow("Insert at 0") << initialItems << 0 << "inserted" << 0 << editable;
+ QTest::newRow("Insert beyond count") << initialItems << 3 << "inserted" << 2 << editable;
+ QTest::newRow("Insert at count") << initialItems << 2 << "inserted" << 2 << editable;
+ QTest::newRow("Insert in the middle") << initialItems << 1 << "inserted" << 1 << editable;
}
}
@@ -1254,7 +1250,6 @@ void tst_QComboBox::insertItem()
QFETCH(int, insertIndex);
QFETCH(QString, itemLabel);
QFETCH(int, expectedIndex);
- QFETCH(bool, testQt3Support);
QFETCH(bool, editable);
testWidget->insertItems(0, initialItems);
@@ -1263,16 +1258,7 @@ void tst_QComboBox::insertItem()
testWidget->setEditable(true);
if (editable)
testWidget->setEditText("FOO");
-#if defined (QT3_SUPPORT)
- if (testQt3Support)
- testWidget->insertItem(itemLabel, insertIndex);
- else
- testWidget->insertItem(insertIndex, itemLabel);
-#else
- Q_UNUSED(testQt3Support);
testWidget->insertItem(insertIndex, itemLabel);
-#endif
-
QCOMPARE(testWidget->count(), initialItems.count() + 1);
QCOMPARE(testWidget->itemText(expectedIndex), itemLabel);
diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp
index 932c19ea54..b0d40d0d22 100644
--- a/tests/auto/qcompleter/tst_qcompleter.cpp
+++ b/tests/auto/qcompleter/tst_qcompleter.cpp
@@ -277,7 +277,9 @@ retry:
case 'L': row = completer->completionCount() - 1; break;
case 'F': row = 0; break;
default:
- Q_ASSERT(false);
+ QFAIL(qPrintable(QString(
+ "Problem with 'step' value in test data: %1 (only P, N, L and F are allowed)."
+ ).arg(step[i])));
}
completer->setCurrentRow(row);
}
@@ -1248,9 +1250,7 @@ public:
void tst_QCompleter::task189564_omitNonSelectableItems()
{
const QString prefix("a");
- Q_ASSERT(!prefix.isEmpty());
const int n = 5;
- Q_ASSERT(n > 0);
QStringList strings;
for (int i = 0; i < n; ++i)
@@ -1278,10 +1278,11 @@ public:
{
setEditable(true);
setInsertPolicy(NoInsert);
- Q_ASSERT(completer());
- completer()->setCompletionMode(QCompleter::PopupCompletion);
- completer()->setCompletionRole(Qt::DisplayRole);
- connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix()));
+ if (completer()) {
+ completer()->setCompletionMode(QCompleter::PopupCompletion);
+ completer()->setCompletionRole(Qt::DisplayRole);
+ connect(lineEdit(), SIGNAL(editingFinished()), SLOT(setCompletionPrefix()));
+ }
}
private slots:
void setCompletionPrefix() { completer()->setCompletionPrefix(lineEdit()->text()); }
@@ -1290,6 +1291,7 @@ private slots:
void tst_QCompleter::task246056_setCompletionPrefix()
{
task246056_ComboBox *comboBox = new task246056_ComboBox;
+ QVERIFY(comboBox->completer());
comboBox->addItem("");
comboBox->addItem("a1");
comboBox->addItem("a2");
diff --git a/tests/auto/qcopchannel/testSend/main.cpp b/tests/auto/qcopchannel/testSend/main.cpp
index 91628e501f..a56883be99 100644
--- a/tests/auto/qcopchannel/testSend/main.cpp
+++ b/tests/auto/qcopchannel/testSend/main.cpp
@@ -49,7 +49,11 @@ int main(int argc, char** argv)
#ifdef Q_WS_QWS
QApplication app(argc, argv);
QStringList args = app.arguments();
- Q_ASSERT(args.count() == 3 || args.count() == 4);
+ if (args.count() != 3 && args.count() != 4) {
+ fprintf(stdout,qPrintable(QString("Usage: %1 channel message [data]").arg(args.at(0))));
+ fflush(stdout);
+ return 1;
+ }
QString channelName = args.at(1);
QString msg = args.at(2);
QByteArray data;
diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro
index f696f195de..16fa265231 100644
--- a/tests/auto/qcssparser/qcssparser.pro
+++ b/tests/auto/qcssparser/qcssparser.pro
@@ -1,6 +1,6 @@
load(qttest_p4)
SOURCES += tst_qcssparser.cpp
-QT += xml
+QT += xml gui-private
requires(contains(QT_CONFIG,private_tests))
!symbian: {
diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index 86cca2daae..ddee2dd713 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -148,7 +148,7 @@ void tst_QCssParser::scanner_data()
}
-static char *tokenName(QCss::TokenType t)
+static const char *tokenName(QCss::TokenType t)
{
switch (t) {
case QCss::NONE: return "NONE";
diff --git a/tests/auto/qdatastream/gearflowers.svg b/tests/auto/qdatastream/gearflowers.svg
deleted file mode 100644
index 038e202d28..0000000000
--- a/tests/auto/qdatastream/gearflowers.svg
+++ /dev/null
@@ -1,8342 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
-"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
- width="1024pt"
- height="768pt"
- id="svg1061"
- sodipodi:version="0.32"
- inkscape:version="0.40"
- sodipodi:docbase="/home/xrostov/svg"
- sodipodi:docname="gearflowers.svg"
- xmlns="http://www.w3.org/2000/svg"
- xmlns:cc="http://web.resource.org/cc/"
- xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
- xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- inkscape:export-filename="/home/xrostov/svg/kde/gearflowers.png"
- inkscape:export-xdpi="72.000000"
- inkscape:export-ydpi="72.000000">
- <defs
- id="defs3">
- <linearGradient
- id="linearGradient21439">
- <stop
- style="stop-color:#f1f1dd;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop21440" />
- <stop
- style="stop-color:#e8e8d5;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop21441" />
- </linearGradient>
- <linearGradient
- id="linearGradient18861">
- <stop
- style="stop-color:#9afd4e;stop-opacity:0.67843139;"
- offset="0.0000000"
- id="stop18862" />
- <stop
- style="stop-color:#d7dfd2;stop-opacity:0.043715846;"
- offset="0.68571430"
- id="stop18863" />
- <stop
- style="stop-color:#d7dfd2;stop-opacity:0.33152175;"
- offset="0.93414968"
- id="stop18865" />
- <stop
- style="stop-color:#d7dfd2;stop-opacity:0.078431375;"
- offset="1.0000000"
- id="stop18864" />
- </linearGradient>
- <linearGradient
- id="linearGradient18234">
- <stop
- style="stop-color:#c5dad1;stop-opacity:0.80392158;"
- offset="0.0000000"
- id="stop18235" />
- <stop
- style="stop-color:#bfd7e2;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop18236" />
- </linearGradient>
- <linearGradient
- id="linearGradient16328">
- <stop
- style="stop-color:#aedced;stop-opacity:0.45405406;"
- offset="0.0000000"
- id="stop16329" />
- <stop
- style="stop-color:#59afd3;stop-opacity:0.49729729;"
- offset="1.0000000"
- id="stop16330" />
- </linearGradient>
- <linearGradient
- id="linearGradient16323">
- <stop
- style="stop-color:#ecf3f6;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop16324" />
- <stop
- style="stop-color:#97ceed;stop-opacity:0.38043478;"
- offset="1.0000000"
- id="stop16325" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient16311">
- <stop
- style="stop-color:#5783c3;stop-opacity:1;"
- offset="0"
- id="stop16312" />
- <stop
- style="stop-color:#5783c3;stop-opacity:0;"
- offset="1"
- id="stop16313" />
- </linearGradient>
- <linearGradient
- id="linearGradient16306">
- <stop
- style="stop-color:#3693ce;stop-opacity:0.0000000;"
- offset="0.0000000"
- id="stop16307" />
- <stop
- style="stop-color:#3693ce;stop-opacity:0.76502734;"
- offset="0.50000000"
- id="stop16310" />
- <stop
- style="stop-color:#3693ce;stop-opacity:0;"
- offset="1.0000000"
- id="stop16308" />
- </linearGradient>
- <linearGradient
- id="linearGradient12484">
- <stop
- style="stop-color:#6cafd9;stop-opacity:0.40000001;"
- offset="0.0000000"
- id="stop12485" />
- <stop
- style="stop-color:#6cc4b2;stop-opacity:1.0000000;"
- offset="0.39047620"
- id="stop12488" />
- <stop
- style="stop-color:#6cce9e;stop-opacity:0.89411765;"
- offset="0.58784580"
- id="stop12489" />
- <stop
- style="stop-color:#88e8a3;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop12486" />
- </linearGradient>
- <linearGradient
- id="linearGradient11858">
- <stop
- style="stop-color:#7f88ec;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop11859" />
- <stop
- style="stop-color:#1d73ec;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop11860" />
- </linearGradient>
- <linearGradient
- id="linearGradient9363">
- <stop
- style="stop-color:#2f3fec;stop-opacity:0.58823532;"
- offset="0.0000000"
- id="stop9364" />
- <stop
- style="stop-color:#6974ec;stop-opacity:0.038043477;"
- offset="1.0000000"
- id="stop9365" />
- </linearGradient>
- <linearGradient
- id="linearGradient8737">
- <stop
- style="stop-color:#3186ec;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop8738" />
- <stop
- style="stop-color:#73a4df;stop-opacity:0.11413044;"
- offset="1.0000000"
- id="stop8739" />
- </linearGradient>
- <linearGradient
- id="linearGradient6847">
- <stop
- style="stop-color:#353b3d;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop6848" />
- <stop
- style="stop-color:#7f9bbe;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop6849" />
- </linearGradient>
- <linearGradient
- id="linearGradient4134">
- <stop
- style="stop-color:#9afd4e;stop-opacity:0.67843139;"
- offset="0.0000000"
- id="stop4135" />
- <stop
- style="stop-color:#d7dfd2;stop-opacity:0.043715846;"
- offset="0.68571430"
- id="stop16958" />
- <stop
- style="stop-color:#d7dfd2;stop-opacity:0.55737704;"
- offset="1.0000000"
- id="stop4136" />
- </linearGradient>
- <linearGradient
- id="linearGradient3347">
- <stop
- style="stop-color:#e9e9d6;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop3348" />
- <stop
- style="stop-color:#ffffea;stop-opacity:0;"
- offset="1"
- id="stop3349" />
- </linearGradient>
- <linearGradient
- id="linearGradient2582">
- <stop
- style="stop-color:#3ba80c;stop-opacity:0.26630434;"
- offset="0.0000000"
- id="stop2583" />
- <stop
- style="stop-color:#076253;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop2584" />
- </linearGradient>
- <linearGradient
- id="linearGradient15803">
- <stop
- style="stop-color:#a4e019;stop-opacity:0.0000000;"
- offset="0.0000000"
- id="stop15804" />
- <stop
- style="stop-color:#b4e072;stop-opacity:0.88043481;"
- offset="0.50000000"
- id="stop15807" />
- <stop
- style="stop-color:#a5e078;stop-opacity:0;"
- offset="1"
- id="stop15805" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient14553">
- <stop
- style="stop-color:#e4e4df;stop-opacity:1;"
- offset="0"
- id="stop14554" />
- <stop
- style="stop-color:#e4e4df;stop-opacity:0;"
- offset="1"
- id="stop14555" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient13927">
- <stop
- style="stop-color:#ffffff;stop-opacity:1;"
- offset="0"
- id="stop13928" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0;"
- offset="1"
- id="stop13929" />
- </linearGradient>
- <linearGradient
- id="linearGradient11439">
- <stop
- style="stop-color:#0d0ca8;stop-opacity:0.58039218;"
- offset="0.0000000"
- id="stop11440" />
- <stop
- style="stop-color:#075662;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop11441" />
- </linearGradient>
- <linearGradient
- id="linearGradient10815">
- <stop
- style="stop-color:#076232;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop10816" />
- <stop
- style="stop-color:#080762;stop-opacity:0;"
- offset="1"
- id="stop10817" />
- </linearGradient>
- <linearGradient
- id="linearGradient10191">
- <stop
- style="stop-color:#038906;stop-opacity:0.46739131;"
- offset="0.0000000"
- id="stop10192" />
- <stop
- style="stop-color:#0b0a8d;stop-opacity:0.065217391;"
- offset="1.0000000"
- id="stop10193" />
- </linearGradient>
- <linearGradient
- id="linearGradient9528">
- <stop
- style="stop-color:#080762;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop9529" />
- <stop
- style="stop-color:#080762;stop-opacity:0;"
- offset="1"
- id="stop9530" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient7645">
- <stop
- style="stop-color:#3693ce;stop-opacity:1;"
- offset="0"
- id="stop7646" />
- <stop
- style="stop-color:#3693ce;stop-opacity:0;"
- offset="1"
- id="stop7647" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient7625">
- <stop
- style="stop-color:#b4d4e8;stop-opacity:1;"
- offset="0"
- id="stop7626" />
- <stop
- style="stop-color:#b4d4e8;stop-opacity:0;"
- offset="1"
- id="stop7627" />
- </linearGradient>
- <linearGradient
- id="linearGradient7618">
- <stop
- style="stop-color:#6cafdc;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop7619" />
- <stop
- style="stop-color:#6cafdc;stop-opacity:0;"
- offset="1"
- id="stop7620" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient6992">
- <stop
- style="stop-color:#6cafdc;stop-opacity:1;"
- offset="0"
- id="stop6993" />
- <stop
- style="stop-color:#6cafdc;stop-opacity:0;"
- offset="1"
- id="stop6994" />
- </linearGradient>
- <linearGradient
- id="linearGradient5124">
- <stop
- style="stop-color:#0f7cc4;stop-opacity:0.0000000;"
- offset="0.0000000"
- id="stop5125" />
- <stop
- style="stop-color:#3f7294;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop5126" />
- </linearGradient>
- <linearGradient
- id="linearGradient4493">
- <stop
- style="stop-color:#6cafdc;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop4494" />
- <stop
- style="stop-color:#5b94ba;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop4495" />
- </linearGradient>
- <linearGradient
- id="linearGradient3867">
- <stop
- style="stop-color:#2270c8;stop-opacity:0.63586956;"
- offset="0.0000000"
- id="stop3868" />
- <stop
- style="stop-color:#216bbe;stop-opacity:0.64313728;"
- offset="0.42825395"
- id="stop3870" />
- <stop
- style="stop-color:#0772eb;stop-opacity:0.53725493;"
- offset="0.91768706"
- id="stop3871" />
- <stop
- style="stop-color:#3d8feb;stop-opacity:0.77717394;"
- offset="1.0000000"
- id="stop3869" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient3236">
- <stop
- style="stop-color:#b2d9ef;stop-opacity:1;"
- offset="0"
- id="stop3237" />
- <stop
- style="stop-color:#b2d9ef;stop-opacity:0;"
- offset="1"
- id="stop3238" />
- </linearGradient>
- <linearGradient
- id="linearGradient2610">
- <stop
- style="stop-color:#2984eb;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop2611" />
- <stop
- style="stop-color:#2984eb;stop-opacity:0;"
- offset="1"
- id="stop2612" />
- </linearGradient>
- <linearGradient
- id="linearGradient32557">
- <stop
- style="stop-color:#d5e9d7;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop32558" />
- <stop
- style="stop-color:#ffffff;stop-opacity:0.45108697;"
- offset="1.0000000"
- id="stop32559" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient31654">
- <stop
- style="stop-color:#9cf257;stop-opacity:1;"
- offset="0"
- id="stop31655" />
- <stop
- style="stop-color:#9cf257;stop-opacity:0;"
- offset="1"
- id="stop31656" />
- </linearGradient>
- <linearGradient
- id="linearGradient29920">
- <stop
- style="stop-color:#86f721;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop29921" />
- <stop
- style="stop-color:#d8f2c1;stop-opacity:0;"
- offset="1"
- id="stop29922" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient29210">
- <stop
- style="stop-color:#ffffea;stop-opacity:1;"
- offset="0"
- id="stop29211" />
- <stop
- style="stop-color:#ffffea;stop-opacity:0;"
- offset="1"
- id="stop29212" />
- </linearGradient>
- <linearGradient
- id="linearGradient29207">
- <stop
- style="stop-color:#eb552f;stop-opacity:0.77254903;"
- offset="0.0000000"
- id="stop29208" />
- <stop
- style="stop-color:#d64e2b;stop-opacity:0;"
- offset="1"
- id="stop29209" />
- </linearGradient>
- <linearGradient
- id="linearGradient27896">
- <stop
- style="stop-color:#372820;stop-opacity:0.86956519;"
- offset="0.0000000"
- id="stop27897" />
- <stop
- style="stop-color:#0f0503;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop27898" />
- </linearGradient>
- <linearGradient
- id="linearGradient26575">
- <stop
- style="stop-color:#f45a30;stop-opacity:0.86956519;"
- offset="0.0000000"
- id="stop26576" />
- <stop
- style="stop-color:#d64e2b;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop26577" />
- </linearGradient>
- <linearGradient
- id="linearGradient24703">
- <stop
- style="stop-color:#aff274;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop24704" />
- <stop
- style="stop-color:#f1f2f0;stop-opacity:0.32608697;"
- offset="1.0000000"
- id="stop24705" />
- </linearGradient>
- <linearGradient
- id="linearGradient22651">
- <stop
- style="stop-color:#1add6a;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop22652" />
- <stop
- style="stop-color:#1add6a;stop-opacity:0.54347825;"
- offset="1.0000000"
- id="stop22653" />
- </linearGradient>
- <linearGradient
- id="linearGradient19525">
- <stop
- style="stop-color:#3de58d;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop19526" />
- <stop
- style="stop-color:#3de5c4;stop-opacity:0.49803922;"
- offset="0.50000000"
- id="stop19528" />
- <stop
- style="stop-color:#3de58d;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop19527" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient19517">
- <stop
- style="stop-color:#66e5a2;stop-opacity:1;"
- offset="0"
- id="stop19518" />
- <stop
- style="stop-color:#66e5a2;stop-opacity:0;"
- offset="1"
- id="stop19519" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient18127">
- <stop
- style="stop-color:#ce0329;stop-opacity:1;"
- offset="0"
- id="stop18128" />
- <stop
- style="stop-color:#ce0329;stop-opacity:0;"
- offset="1"
- id="stop18129" />
- </linearGradient>
- <linearGradient
- id="linearGradient16187">
- <stop
- style="stop-color:#29e57b;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop16188" />
- <stop
- style="stop-color:#29e57b;stop-opacity:0.45652175;"
- offset="1.0000000"
- id="stop16189" />
- </linearGradient>
- <linearGradient
- id="linearGradient16183">
- <stop
- style="stop-color:#29e59a;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop16184" />
- <stop
- style="stop-color:#29d3e5;stop-opacity:0.45652175;"
- offset="1.0000000"
- id="stop16185" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient16179">
- <stop
- style="stop-color:#29e582;stop-opacity:1;"
- offset="0"
- id="stop16180" />
- <stop
- style="stop-color:#29e582;stop-opacity:0;"
- offset="1"
- id="stop16181" />
- </linearGradient>
- <linearGradient
- id="linearGradient16170">
- <stop
- style="stop-color:#29e58e;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop16171" />
- <stop
- style="stop-color:#45a2e5;stop-opacity:0.94565219;"
- offset="0.50000000"
- id="stop16174" />
- <stop
- style="stop-color:#29e58e;stop-opacity:0.99456519;"
- offset="1.0000000"
- id="stop16172" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient11111">
- <stop
- style="stop-color:#5794d8;stop-opacity:1;"
- offset="0"
- id="stop11112" />
- <stop
- style="stop-color:#5794d8;stop-opacity:0;"
- offset="1"
- id="stop11113" />
- </linearGradient>
- <linearGradient
- id="linearGradient11099">
- <stop
- style="stop-color:#589eea;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop11100" />
- <stop
- style="stop-color:#79afea;stop-opacity:0;"
- offset="1"
- id="stop11101" />
- </linearGradient>
- <linearGradient
- id="linearGradient11083">
- <stop
- style="stop-color:#a7b5ea;stop-opacity:0.043478262;"
- offset="0.0000000"
- id="stop11084" />
- <stop
- style="stop-color:#5146ea;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop11085" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- id="linearGradient4818">
- <stop
- style="stop-color:#e9390d;stop-opacity:1;"
- offset="0"
- id="stop4819" />
- <stop
- style="stop-color:#e9390d;stop-opacity:0;"
- offset="1"
- id="stop4820" />
- </linearGradient>
- <linearGradient
- id="linearGradient4190">
- <stop
- style="stop-color:#86ed18;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop4191" />
- <stop
- style="stop-color:#bcecbf;stop-opacity:0.0000000;"
- offset="1.0000000"
- id="stop4192" />
- </linearGradient>
- <linearGradient
- id="linearGradient3564">
- <stop
- style="stop-color:#000000;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop3565" />
- <stop
- style="stop-color:#000000;stop-opacity:0;"
- offset="1"
- id="stop3566" />
- </linearGradient>
- <linearGradient
- id="linearGradient1695">
- <stop
- style="stop-color:#b17b1b;stop-opacity:1.0000000;"
- offset="0.0000000"
- id="stop1696" />
- <stop
- style="stop-color:#583d0d;stop-opacity:1.0000000;"
- offset="0.50000000"
- id="stop1699" />
- <stop
- style="stop-color:#c7922e;stop-opacity:1.0000000;"
- offset="1.0000000"
- id="stop1697" />
- </linearGradient>
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient1695"
- id="linearGradient1698"
- gradientTransform="scale(1.666753,0.599969)"
- x1="306.40466"
- y1="742.39771"
- x2="288.73209"
- y2="703.21155"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient3564"
- id="linearGradient3567"
- gradientTransform="scale(1.081233,0.924870)"
- x1="499.80753"
- y1="435.86755"
- x2="550.16528"
- y2="495.51517"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4190"
- id="linearGradient4193"
- gradientTransform="scale(1.040888,0.960718)"
- x1="709.13391"
- y1="445.11514"
- x2="525.49945"
- y2="652.39642"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient4818"
- id="linearGradient4821"
- gradientTransform="matrix(1.310266,0.000000,0.000000,0.857544,-19.69210,-35.84892)"
- x1="442.46298"
- y1="540.10565"
- x2="485.50449"
- y2="578.96753"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient11086"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient11102"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient11114"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16170"
- id="linearGradient16173"
- gradientTransform="scale(1.266827,0.789374)"
- x1="338.52740"
- y1="497.77591"
- x2="397.40027"
- y2="626.40479"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16170"
- id="linearGradient16178"
- gradientTransform="scale(0.876284,1.141182)"
- x1="457.80389"
- y1="352.55243"
- x2="507.93503"
- y2="370.55652"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16179"
- id="linearGradient16182"
- gradientTransform="scale(0.754458,1.325456)"
- x1="439.42288"
- y1="318.50616"
- x2="555.40745"
- y2="318.50616"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16183"
- id="radialGradient16186"
- gradientTransform="scale(0.970016,1.030911)"
- cx="424.20871"
- cy="485.59210"
- fx="424.20871"
- fy="485.59210"
- r="34.210431"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16187"
- id="radialGradient16191"
- gradientTransform="scale(1.503775,0.664993)"
- cx="301.35504"
- cy="785.52722"
- fx="301.35504"
- fy="785.52722"
- r="51.984039"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient18127"
- id="linearGradient18130"
- gradientTransform="scale(1.279830,0.781354)"
- x1="448.08412"
- y1="529.98144"
- x2="463.89505"
- y2="529.98144"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient18810"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient18811"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient18812"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient18829"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient18830"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient18831"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient18844"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient18845"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient18846"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient18858"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient18859"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient18860"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11083"
- id="radialGradient18872"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(0.980331,1.020064)"
- cx="433.95916"
- cy="440.16448"
- fx="433.95916"
- fy="440.16448"
- r="149.47448" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11111"
- id="radialGradient18873"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.060653,0.942816)"
- cx="482.54009"
- cy="581.81309"
- fx="482.54009"
- fy="581.81309"
- r="27.273221" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient11099"
- id="radialGradient18874"
- gradientUnits="userSpaceOnUse"
- gradientTransform="scale(1.077813,0.927805)"
- cx="407.24873"
- cy="602.51922"
- fx="407.24873"
- fy="602.51922"
- r="25.687024" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient19517"
- id="linearGradient19520"
- gradientTransform="scale(1.214521,0.823370)"
- x1="169.38230"
- y1="829.35319"
- x2="354.75676"
- y2="829.35319"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient19525"
- id="linearGradient19524"
- gradientTransform="scale(1.077049,0.928463)"
- x1="214.43430"
- y1="925.64703"
- x2="314.95380"
- y2="797.13611"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16183"
- id="linearGradient20153"
- gradientTransform="scale(0.959947,1.041724)"
- x1="123.61769"
- y1="762.71704"
- x2="297.13574"
- y2="762.71704"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16170"
- id="linearGradient20778"
- gradientTransform="scale(1.127960,0.886557)"
- x1="100.04546"
- y1="810.50677"
- x2="140.80148"
- y2="896.01904"
- gradientUnits="userSpaceOnUse" />
- <linearGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16179"
- id="linearGradient21403"
- gradientTransform="scale(1.042594,0.959147)"
- x1="60.617191"
- y1="689.21771"
- x2="213.33556"
- y2="689.21771"
- gradientUnits="userSpaceOnUse" />
- <radialGradient
- inkscape:collect="always"
- xlink:href="#linearGradient16170"
- id="radialGradient22029"
- gradientTransform="scale(0.851142,1.174892)"
- cx="235.80563"
- cy="607.92432"
- fx="235.80563"
- fy="607.92432"
- r="154.82706"
- gradientUnits="u