summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules2
-rw-r--r--.qmake.conf2
-rw-r--r--examples/qml/doc/src/qml-extending.qdoc2
-rw-r--r--examples/qml/qmlextensionplugins/plugin.cpp2
-rw-r--r--examples/qml/referenceexamples/binding/happybirthdaysong.cpp2
-rw-r--r--examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp2
-rw-r--r--examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc1
-rw-r--r--examples/quick/customitems/flipable/doc/src/flipable.qdoc1
-rw-r--r--examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc1
-rw-r--r--examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc2
-rw-r--r--examples/quick/demos/photosurface/photosurface.qml46
-rw-r--r--examples/quick/embeddedinwidgets/main.cpp11
-rw-r--r--examples/quick/imageprovider/doc/src/imageprovider.qdoc1
-rw-r--r--examples/quick/imageresponseprovider/ImageResponseProviderCore/qmldir2
-rw-r--r--examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc37
-rw-r--r--examples/quick/imageresponseprovider/imageresponseprovider-example.qml48
-rw-r--r--examples/quick/imageresponseprovider/imageresponseprovider.cpp123
-rw-r--r--examples/quick/imageresponseprovider/imageresponseprovider.pro15
-rw-r--r--examples/quick/imageresponseprovider/imageresponseprovider.qmlproject14
-rw-r--r--examples/quick/mousearea/mousearea-wheel-example.qml7
-rw-r--r--examples/quick/quick.pro1
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/main.cpp8
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp24
-rw-r--r--examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h5
-rw-r--r--examples/quick/quickwidgets/quickwidget/main.cpp17
-rw-r--r--examples/quick/rendercontrol/window_multithreaded.cpp2
-rw-r--r--examples/quick/rendercontrol/window_singlethreaded.cpp2
-rw-r--r--examples/quick/scenegraph/openglunderqml/squircle.cpp13
-rw-r--r--examples/quick/scenegraph/openglunderqml/squircle.h2
-rw-r--r--examples/quick/scenegraph/textureinthread/threadrenderer.cpp10
-rw-r--r--examples/quick/scenegraph/threadedanimation/spinner.cpp4
-rw-r--r--examples/quick/scenegraph/twotextureproviders/xorblender.cpp4
-rw-r--r--examples/quick/shared/shared.h4
-rw-r--r--examples/quick/text/doc/src/text.qdoc2
-rw-r--r--examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc2
-rw-r--r--examples/quick/touchinteraction/doc/src/touchinteraction.qdoc10
-rw-r--r--[-rwxr-xr-x]examples/quick/tutorials/samegame/samegame4/content/samegame.js0
-rw-r--r--qtdeclarative.pro7
-rw-r--r--src/3rdparty/masm/assembler/MacroAssemblerMIPS.h32
-rw-r--r--src/3rdparty/masm/disassembler/Mips32Disassembler.cpp56
-rw-r--r--src/3rdparty/masm/disassembler/mips32/Mips32Opcode.cpp620
-rw-r--r--src/3rdparty/masm/disassembler/mips32/Mips32Opcode.h78
-rw-r--r--src/3rdparty/masm/masm-defs.pri1
-rw-r--r--src/3rdparty/masm/masm.pri3
-rw-r--r--src/3rdparty/masm/stubs/Options.cpp2
-rw-r--r--src/3rdparty/masm/wtf/FilePrintStream.cpp3
-rw-r--r--src/3rdparty/masm/wtf/Platform.h2
-rw-r--r--src/imports/builtins.qmltypes1605
-rw-r--r--src/imports/folderlistmodel/fileinfothread.cpp3
-rw-r--r--src/imports/folderlistmodel/fileinfothread_p.h11
-rw-r--r--src/imports/folderlistmodel/fileproperty_p.h11
-rw-r--r--src/imports/folderlistmodel/plugins.qmltypes273
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp16
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.h3
-rw-r--r--src/imports/imports.pro33
-rw-r--r--src/imports/localstorage/plugin.cpp44
-rw-r--r--src/imports/localstorage/plugins.qmltypes3
-rw-r--r--src/imports/models/models.pro2
-rw-r--r--src/imports/models/plugins.qmltypes54
-rw-r--r--src/imports/particles/plugins.qmltypes207
-rw-r--r--src/imports/qtqml/plugins.qmltypes222
-rw-r--r--src/imports/qtqml/qmldir2
-rw-r--r--src/imports/qtqml/qtqml.pro14
-rw-r--r--src/imports/qtquick2/plugins.qmltypes2083
-rw-r--r--src/imports/qtquick2/qtquick2.pro1
-rw-r--r--src/imports/settings/plugins.qmltypes3
-rw-r--r--src/imports/settings/qqmlsettings_p.h11
-rw-r--r--src/imports/statemachine/plugins.qmltypes12
-rw-r--r--src/imports/testlib/TestCase.qml16
-rw-r--r--src/imports/testlib/plugins.qmltypes21
-rw-r--r--src/imports/window/plugins.qmltypes19
-rw-r--r--src/imports/xmllistmodel/plugins.qmltypes268
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp4
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel_p.h11
-rw-r--r--src/particles/qquickage_p.h11
-rw-r--r--src/particles/qquickangledirection_p.h11
-rw-r--r--src/particles/qquickcumulativedirection_p.h11
-rw-r--r--src/particles/qquickcustomaffector_p.h11
-rw-r--r--src/particles/qquickcustomparticle.cpp4
-rw-r--r--src/particles/qquickcustomparticle_p.h11
-rw-r--r--src/particles/qquickdirection_p.h11
-rw-r--r--src/particles/qquickellipseextruder_p.h11
-rw-r--r--src/particles/qquickfriction_p.h11
-rw-r--r--src/particles/qquickgravity_p.h11
-rw-r--r--src/particles/qquickgroupgoal_p.h11
-rw-r--r--src/particles/qquickimageparticle.cpp4
-rw-r--r--src/particles/qquickimageparticle_p.h15
-rw-r--r--src/particles/qquickitemparticle_p.h11
-rw-r--r--src/particles/qquicklineextruder_p.h11
-rw-r--r--src/particles/qquickmaskextruder_p.h11
-rw-r--r--src/particles/qquickparticleaffector_p.h11
-rw-r--r--src/particles/qquickparticleemitter_p.h13
-rw-r--r--src/particles/qquickparticleextruder_p.h11
-rw-r--r--src/particles/qquickparticlegroup_p.h11
-rw-r--r--src/particles/qquickparticlepainter_p.h11
-rw-r--r--src/particles/qquickparticlesmodule_p.h11
-rw-r--r--src/particles/qquickparticlesystem.cpp5
-rw-r--r--src/particles/qquickparticlesystem_p.h11
-rw-r--r--src/particles/qquickpointattractor_p.h15
-rw-r--r--src/particles/qquickpointdirection_p.h11
-rw-r--r--src/particles/qquickrectangleextruder_p.h11
-rw-r--r--src/particles/qquickspritegoal_p.h11
-rw-r--r--src/particles/qquicktargetdirection_p.h11
-rw-r--r--src/particles/qquicktrailemitter_p.h13
-rw-r--r--src/particles/qquickturbulence.cpp10
-rw-r--r--src/particles/qquickturbulence_p.h11
-rw-r--r--src/particles/qquickv4particledata.cpp7
-rw-r--r--src/particles/qquickv4particledata_p.h13
-rw-r--r--src/particles/qquickwander_p.h13
-rw-r--r--src/particles/qtquickparticlesglobal_p.h11
-rw-r--r--src/plugins/plugins.pro2
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.cpp (renamed from src/qml/debugger/qdebugmessageservice.cpp)62
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qdebugmessageservice.h (renamed from src/qml/debugger/qdebugmessageservice_p.h)21
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qmldbg_debugger.pro34
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservice.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.cpp60
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmldebuggerservicefactory.h (renamed from src/qml/jsruntime/qv4qmlextensions_p.h)27
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.cpp (renamed from src/qml/debugger/qqmlenginedebugservice.cpp)130
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlenginedebugservice.h (renamed from src/qml/debugger/qqmlenginedebugservice_p.h)37
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.cpp804
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlnativedebugservice.h (renamed from src/qml/debugger/qv4debugservice_p.h)73
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.cpp (renamed from src/qml/qml/qqmlwatcher.cpp)6
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qqmlwatcher.h (renamed from src/qml/qml/qqmlwatcher_p.h)6
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.cpp474
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4datacollector.h180
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.cpp253
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4debuggeragent.h97
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.cpp931
-rw-r--r--src/plugins/qmltooling/qmldbg_debugger/qv4debugservice.h128
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstracttool.cpp (renamed from src/plugins/qmltooling/shared/abstracttool.cpp)4
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstracttool.h (renamed from src/plugins/qmltooling/shared/abstracttool.h)3
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.cpp (renamed from src/plugins/qmltooling/shared/abstractviewinspector.cpp)21
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/abstractviewinspector.h (renamed from src/plugins/qmltooling/shared/abstractviewinspector.h)12
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/highlight.cpp (renamed from src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp)6
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/highlight.h (renamed from src/plugins/qmltooling/qmldbg_qtquick2/highlight.h)5
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/inspecttool.cpp (renamed from src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.cpp)13
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/inspecttool.h (renamed from src/plugins/qmltooling/qmldbg_qtquick2/inspecttool.h)10
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro27
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.cpp127
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservice.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qqmlinspectorservicefactory.h (renamed from src/qml/debugger/qqmlinspectorinterface_p.h)30
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.cpp (renamed from src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp)14
-rw-r--r--src/plugins/qmltooling/qmldbg_inspector/qquickviewinspector.h (renamed from src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h)7
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.cpp157
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qlocalclientconnection.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qlocalclientconnectionfactory.h52
-rw-r--r--src/plugins/qmltooling/qmldbg_local/qmldbg_local.pro20
-rw-r--r--src/plugins/qmltooling/qmldbg_native/qmldbg_native.pro12
-rw-r--r--src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.cpp383
-rw-r--r--src/plugins/qmltooling/qmldbg_native/qqmlnativedebugconnector.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qmldbg_profiler.pro28
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.cpp (renamed from src/qml/debugger/qqmlenginecontrolservice.cpp)18
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlenginecontrolservice.h (renamed from src/qml/debugger/qqmlenginecontrolservice_p.h)8
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.cpp123
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofileradapter.h (renamed from src/qml/debugger/qqmlconfigurabledebugservice_p_p.h)31
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp (renamed from src/qml/debugger/qqmlprofilerservice.cpp)183
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.h (renamed from src/qml/debugger/qqmlprofilerservice_p.h)28
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.cpp51
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservicefactory.h62
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.cpp (renamed from src/qml/debugger/qv4profileradapter.cpp)90
-rw-r--r--src/plugins/qmltooling/qmldbg_profiler/qv4profileradapter.h (renamed from src/qml/debugger/qv4profileradapter_p.h)15
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro27
-rw-r--r--src/plugins/qmltooling/qmldbg_server/qmldbg_server.pro22
-rw-r--r--src/plugins/qmltooling/qmldbg_server/qqmldebugserver.cpp693
-rw-r--r--src/plugins/qmltooling/qmldbg_server/qqmldebugserver.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_server/qqmldebugserverfactory.h65
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pri14
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro18
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp196
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h77
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.json3
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnectionfactory.h52
-rw-r--r--src/plugins/qmltooling/qmltooling.pro15
-rw-r--r--src/plugins/qmltooling/shared/qqmlconfigurabledebugservice.h106
-rw-r--r--src/plugins/qmltooling/shared/qqmldebugserver.h62
-rw-r--r--src/plugins/qmltooling/shared/qqmldebugserverconnection.h (renamed from src/qml/debugger/qqmldebugserverconnection_p.h)26
-rw-r--r--src/qml/Qt5QmlConfigExtras.cmake.in5
-rw-r--r--src/qml/animations/qabstractanimationjob_p.h11
-rw-r--r--src/qml/animations/qanimationgroupjob_p.h11
-rw-r--r--src/qml/animations/qanimationjobutil_p.h11
-rw-r--r--src/qml/animations/qcontinuinganimationgroupjob_p.h11
-rw-r--r--src/qml/animations/qparallelanimationgroupjob_p.h11
-rw-r--r--src/qml/animations/qpauseanimationjob_p.h11
-rw-r--r--src/qml/animations/qsequentialanimationgroupjob_p.h11
-rw-r--r--src/qml/compiler/qqmlirbuilder.cpp37
-rw-r--r--src/qml/compiler/qqmlirbuilder_p.h16
-rw-r--r--src/qml/compiler/qqmltypecompiler.cpp154
-rw-r--r--src/qml/compiler/qqmltypecompiler_p.h20
-rw-r--r--src/qml/compiler/qv4codegen.cpp3
-rw-r--r--src/qml/compiler/qv4codegen_p.h11
-rw-r--r--src/qml/compiler/qv4compileddata.cpp2
-rw-r--r--src/qml/compiler/qv4compileddata_p.h11
-rw-r--r--src/qml/compiler/qv4compiler.cpp7
-rw-r--r--src/qml/compiler/qv4compiler_p.h11
-rw-r--r--src/qml/compiler/qv4instr_moth_p.h105
-rw-r--r--src/qml/compiler/qv4isel_moth.cpp110
-rw-r--r--src/qml/compiler/qv4isel_moth_p.h19
-rw-r--r--src/qml/compiler/qv4isel_p.cpp55
-rw-r--r--src/qml/compiler/qv4isel_p.h19
-rw-r--r--src/qml/compiler/qv4isel_util_p.h11
-rw-r--r--src/qml/compiler/qv4jsir.cpp24
-rw-r--r--src/qml/compiler/qv4jsir_p.h65
-rw-r--r--src/qml/compiler/qv4ssa.cpp165
-rw-r--r--src/qml/compiler/qv4ssa_p.h11
-rw-r--r--src/qml/debugger/debugger.pri31
-rw-r--r--src/qml/debugger/qqmlconfigurabledebugservice.cpp88
-rw-r--r--src/qml/debugger/qqmldebug.cpp122
-rw-r--r--src/qml/debugger/qqmldebug.h2
-rw-r--r--src/qml/debugger/qqmldebugconnector.cpp160
-rw-r--r--src/qml/debugger/qqmldebugconnector_p.h98
-rw-r--r--src/qml/debugger/qqmldebugpluginmanager_p.h95
-rw-r--r--src/qml/debugger/qqmldebugserver.cpp787
-rw-r--r--src/qml/debugger/qqmldebugserver_p.h104
-rw-r--r--src/qml/debugger/qqmldebugservice.cpp252
-rw-r--r--src/qml/debugger/qqmldebugservice_p.h42
-rw-r--r--src/qml/debugger/qqmldebugservicefactory_p.h (renamed from src/qml/debugger/qqmldebugservice_p_p.h)24
-rw-r--r--src/qml/debugger/qqmldebugserviceinterfaces.cpp44
-rw-r--r--src/qml/debugger/qqmldebugserviceinterfaces_p.h146
-rw-r--r--src/qml/debugger/qqmlinspectorservice.cpp181
-rw-r--r--src/qml/debugger/qqmlprofiler.cpp85
-rw-r--r--src/qml/debugger/qqmlprofiler_p.h37
-rw-r--r--src/qml/debugger/qv4debugservice.cpp1265
-rw-r--r--src/qml/doc/qtqml.qdocconf2
-rw-r--r--src/qml/doc/snippets/qml/qtBinding.2.qml2
-rw-r--r--src/qml/doc/src/cppintegration/definetypes.qdoc3
-rw-r--r--src/qml/doc/src/cppintegration/exposecppattributes.qdoc4
-rw-r--r--src/qml/doc/src/external-resources.qdoc7
-rw-r--r--src/qml/doc/src/javascript/hostenvironment.qdoc2
-rw-r--r--src/qml/doc/src/javascript/qmlglobalobject.qdoc2
-rw-r--r--src/qml/doc/src/javascript/resources.qdoc14
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/basics.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/objectattributes.qdoc3
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/propertybinding.qdoc2
-rw-r--r--src/qml/doc/src/qmllanguageref/syntax/signals.qdoc4
-rw-r--r--src/qml/doc/src/qmllanguageref/typesystem/basictypes.qdoc2
-rw-r--r--src/qml/jit/qv4assembler.cpp24
-rw-r--r--src/qml/jit/qv4assembler_p.h57
-rw-r--r--src/qml/jit/qv4binop.cpp63
-rw-r--r--src/qml/jit/qv4binop_p.h11
-rw-r--r--src/qml/jit/qv4isel_masm.cpp222
-rw-r--r--src/qml/jit/qv4isel_masm_p.h19
-rw-r--r--src/qml/jit/qv4regalloc.cpp47
-rw-r--r--src/qml/jit/qv4regalloc_p.h11
-rw-r--r--src/qml/jit/qv4registerinfo_p.h11
-rw-r--r--src/qml/jit/qv4targetplatform_p.h76
-rw-r--r--src/qml/jit/qv4unop_p.h11
-rw-r--r--src/qml/jsapi/qjsengine.cpp139
-rw-r--r--src/qml/jsapi/qjsengine.h16
-rw-r--r--src/qml/jsapi/qjsvalue.cpp33
-rw-r--r--src/qml/jsapi/qjsvalue_p.h2
-rw-r--r--src/qml/jsapi/qjsvalueiterator.cpp39
-rw-r--r--src/qml/jsapi/qjsvalueiterator_p.h21
-rw-r--r--src/qml/jsruntime/jsruntime.pri6
-rw-r--r--src/qml/jsruntime/qv4alloca_p.h11
-rw-r--r--src/qml/jsruntime/qv4argumentsobject.cpp62
-rw-r--r--src/qml/jsruntime/qv4argumentsobject_p.h24
-rw-r--r--src/qml/jsruntime/qv4arraybuffer.cpp27
-rw-r--r--src/qml/jsruntime/qv4arraybuffer_p.h20
-rw-r--r--src/qml/jsruntime/qv4arraydata.cpp139
-rw-r--r--src/qml/jsruntime/qv4arraydata_p.h64
-rw-r--r--src/qml/jsruntime/qv4arrayobject.cpp37
-rw-r--r--src/qml/jsruntime/qv4arrayobject_p.h15
-rw-r--r--src/qml/jsruntime/qv4booleanobject.cpp19
-rw-r--r--src/qml/jsruntime/qv4booleanobject_p.h15
-rw-r--r--src/qml/jsruntime/qv4context.cpp403
-rw-r--r--src/qml/jsruntime/qv4context_p.h83
-rw-r--r--src/qml/jsruntime/qv4dataview.cpp44
-rw-r--r--src/qml/jsruntime/qv4dataview_p.h20
-rw-r--r--src/qml/jsruntime/qv4dateobject.cpp175
-rw-r--r--src/qml/jsruntime/qv4dateobject_p.h41
-rw-r--r--src/qml/jsruntime/qv4debugging.cpp645
-rw-r--r--src/qml/jsruntime/qv4debugging_p.h140
-rw-r--r--src/qml/jsruntime/qv4engine.cpp826
-rw-r--r--src/qml/jsruntime/qv4engine_p.h382
-rw-r--r--src/qml/jsruntime/qv4errorobject.cpp214
-rw-r--r--src/qml/jsruntime/qv4errorobject_p.h124
-rw-r--r--src/qml/jsruntime/qv4executableallocator_p.h11
-rw-r--r--src/qml/jsruntime/qv4function.cpp35
-rw-r--r--src/qml/jsruntime/qv4function_p.h18
-rw-r--r--src/qml/jsruntime/qv4functionobject.cpp261
-rw-r--r--src/qml/jsruntime/qv4functionobject_p.h87
-rw-r--r--src/qml/jsruntime/qv4global_p.h18
-rw-r--r--src/qml/jsruntime/qv4globalobject.cpp87
-rw-r--r--src/qml/jsruntime/qv4globalobject_p.h15
-rw-r--r--src/qml/jsruntime/qv4identifier_p.h11
-rw-r--r--src/qml/jsruntime/qv4identifiertable.cpp16
-rw-r--r--src/qml/jsruntime/qv4identifiertable_p.h17
-rw-r--r--src/qml/jsruntime/qv4include.cpp35
-rw-r--r--src/qml/jsruntime/qv4include_p.h8
-rw-r--r--src/qml/jsruntime/qv4internalclass.cpp87
-rw-r--r--src/qml/jsruntime/qv4internalclass_p.h14
-rw-r--r--src/qml/jsruntime/qv4jsonobject.cpp162
-rw-r--r--src/qml/jsruntime/qv4jsonobject_p.h65
-rw-r--r--src/qml/jsruntime/qv4lookup.cpp161
-rw-r--r--src/qml/jsruntime/qv4lookup_p.h31
-rw-r--r--src/qml/jsruntime/qv4managed.cpp30
-rw-r--r--src/qml/jsruntime/qv4managed_p.h134
-rw-r--r--src/qml/jsruntime/qv4math_p.h11
-rw-r--r--src/qml/jsruntime/qv4mathobject.cpp14
-rw-r--r--src/qml/jsruntime/qv4mathobject_p.h13
-rw-r--r--src/qml/jsruntime/qv4memberdata.cpp31
-rw-r--r--src/qml/jsruntime/qv4memberdata_p.h14
-rw-r--r--src/qml/jsruntime/qv4numberobject.cpp21
-rw-r--r--src/qml/jsruntime/qv4numberobject_p.h15
-rw-r--r--src/qml/jsruntime/qv4object.cpp376
-rw-r--r--src/qml/jsruntime/qv4object_p.h199
-rw-r--r--src/qml/jsruntime/qv4objectiterator.cpp47
-rw-r--r--src/qml/jsruntime/qv4objectiterator_p.h24
-rw-r--r--src/qml/jsruntime/qv4objectproto.cpp78
-rw-r--r--src/qml/jsruntime/qv4objectproto_p.h15
-rw-r--r--src/qml/jsruntime/qv4persistent.cpp95
-rw-r--r--src/qml/jsruntime/qv4persistent_p.h39
-rw-r--r--src/qml/jsruntime/qv4profiling.cpp47
-rw-r--r--src/qml/jsruntime/qv4profiling_p.h22
-rw-r--r--src/qml/jsruntime/qv4property_p.h24
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp320
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper_p.h45
-rw-r--r--src/qml/jsruntime/qv4regexp.cpp25
-rw-r--r--src/qml/jsruntime/qv4regexp_p.h14
-rw-r--r--src/qml/jsruntime/qv4regexpobject.cpp117
-rw-r--r--src/qml/jsruntime/qv4regexpobject_p.h50
-rw-r--r--src/qml/jsruntime/qv4runtime.cpp328
-rw-r--r--src/qml/jsruntime/qv4runtime_p.h47
-rw-r--r--src/qml/jsruntime/qv4scopedvalue_p.h205
-rw-r--r--src/qml/jsruntime/qv4script.cpp164
-rw-r--r--src/qml/jsruntime/qv4script_p.h61
-rw-r--r--src/qml/jsruntime/qv4sequenceobject.cpp51
-rw-r--r--src/qml/jsruntime/qv4sequenceobject_p.h5
-rw-r--r--src/qml/jsruntime/qv4serialize.cpp22
-rw-r--r--src/qml/jsruntime/qv4serialize_p.h2
-rw-r--r--src/qml/jsruntime/qv4sparsearray.cpp11
-rw-r--r--src/qml/jsruntime/qv4sparsearray_p.h23
-rw-r--r--src/qml/jsruntime/qv4string.cpp4
-rw-r--r--src/qml/jsruntime/qv4string_p.h25
-rw-r--r--src/qml/jsruntime/qv4stringobject.cpp100
-rw-r--r--src/qml/jsruntime/qv4stringobject_p.h39
-rw-r--r--src/qml/jsruntime/qv4typedarray.cpp57
-rw-r--r--src/qml/jsruntime/qv4typedarray_p.h30
-rw-r--r--src/qml/jsruntime/qv4util_p.h11
-rw-r--r--src/qml/jsruntime/qv4value.cpp78
-rw-r--r--src/qml/jsruntime/qv4value_inl_p.h293
-rw-r--r--src/qml/jsruntime/qv4value_p.h472
-rw-r--r--src/qml/jsruntime/qv4variantobject.cpp15
-rw-r--r--src/qml/jsruntime/qv4variantobject_p.h9
-rw-r--r--src/qml/jsruntime/qv4vme_moth.cpp83
-rw-r--r--src/qml/jsruntime/qv4vme_moth_p.h11
-rw-r--r--src/qml/memory/memory.pri14
-rw-r--r--src/qml/memory/qv4heap_p.h140
-rw-r--r--src/qml/memory/qv4mm.cpp (renamed from src/qml/jsruntime/qv4mm.cpp)181
-rw-r--r--src/qml/memory/qv4mm_p.h (renamed from src/qml/jsruntime/qv4mm_p.h)188
-rw-r--r--src/qml/parser/qqmljs.g19
-rw-r--r--src/qml/parser/qqmljsast_p.h8
-rw-r--r--src/qml/parser/qqmljsglobal_p.h11
-rw-r--r--src/qml/parser/qqmljsmemorypool_p.h24
-rw-r--r--src/qml/qml.pro4
-rw-r--r--src/qml/qml/ftw/ftw.pri2
-rw-r--r--src/qml/qml/ftw/qqmlpool_p.h270
-rw-r--r--src/qml/qml/ftw/qqmlrefcount_p.h25
-rw-r--r--src/qml/qml/ftw/qqmlthread.cpp27
-rw-r--r--src/qml/qml/ftw/qqmlthread_p.h2
-rw-r--r--src/qml/qml/qml.pri4
-rw-r--r--src/qml/qml/qqmlabstractbinding.cpp170
-rw-r--r--src/qml/qml/qqmlabstractbinding_p.h140
-rw-r--r--src/qml/qml/qqmlabstractexpression.cpp93
-rw-r--r--src/qml/qml/qqmlabstractexpression_p.h116
-rw-r--r--src/qml/qml/qqmlaccessors_p.h11
-rw-r--r--src/qml/qml/qqmlbinding.cpp434
-rw-r--r--src/qml/qml/qqmlbinding_p.h65
-rw-r--r--src/qml/qml/qqmlboundsignal.cpp318
-rw-r--r--src/qml/qml/qqmlboundsignal_p.h78
-rw-r--r--src/qml/qml/qqmlcomponent.cpp132
-rw-r--r--src/qml/qml/qqmlcomponent.h5
-rw-r--r--src/qml/qml/qqmlcomponent_p.h2
-rw-r--r--src/qml/qml/qqmlcomponentattached_p.h11
-rw-r--r--src/qml/qml/qqmlcontext.cpp11
-rw-r--r--src/qml/qml/qqmlcontext.h1
-rw-r--r--src/qml/qml/qqmlcontext_p.h6
-rw-r--r--src/qml/qml/qqmlcontextwrapper.cpp203
-rw-r--r--src/qml/qml/qqmlcontextwrapper_p.h36
-rw-r--r--src/qml/qml/qqmlcustomparser.cpp31
-rw-r--r--src/qml/qml/qqmlcustomparser_p.h18
-rw-r--r--src/qml/qml/qqmldata_p.h20
-rw-r--r--src/qml/qml/qqmldirparser.cpp30
-rw-r--r--src/qml/qml/qqmlengine.cpp161
-rw-r--r--src/qml/qml/qqmlengine.h4
-rw-r--r--src/qml/qml/qqmlengine_p.h34
-rw-r--r--src/qml/qml/qqmlexpression.cpp34
-rw-r--r--src/qml/qml/qqmlexpression_p.h12
-rw-r--r--src/qml/qml/qqmlfileselector.cpp6
-rw-r--r--src/qml/qml/qqmlfileselector_p.h2
-rw-r--r--src/qml/qml/qqmlglobal.cpp62
-rw-r--r--src/qml/qml/qqmlglobal_p.h41
-rw-r--r--src/qml/qml/qqmlimport.cpp85
-rw-r--r--src/qml/qml/qqmlimport_p.h2
-rw-r--r--src/qml/qml/qqmlinfo.cpp28
-rw-r--r--src/qml/qml/qqmljavascriptexpression.cpp172
-rw-r--r--src/qml/qml/qqmljavascriptexpression_p.h101
-rw-r--r--src/qml/qml/qqmllistwrapper.cpp23
-rw-r--r--src/qml/qml/qqmllistwrapper_p.h10
-rw-r--r--src/qml/qml/qqmllocale.cpp34
-rw-r--r--src/qml/qml/qqmllocale_p.h30
-rw-r--r--src/qml/qml/qqmlmemoryprofiler.cpp4
-rw-r--r--src/qml/qml/qqmlmemoryprofiler_p.h11
-rw-r--r--src/qml/qml/qqmlmetatype.cpp153
-rw-r--r--src/qml/qml/qqmlmetatype_p.h23
-rw-r--r--src/qml/qml/qqmlnotifier_p.h23
-rw-r--r--src/qml/qml/qqmlobjectcreator.cpp111
-rw-r--r--src/qml/qml/qqmlobjectcreator_p.h17
-rw-r--r--src/qml/qml/qqmlopenmetaobject.cpp55
-rw-r--r--src/qml/qml/qqmlopenmetaobject_p.h16
-rw-r--r--src/qml/qml/qqmlplatform_p.h11
-rw-r--r--src/qml/qml/qqmlproperty.cpp474
-rw-r--r--src/qml/qml/qqmlproperty_p.h38
-rw-r--r--src/qml/qml/qqmlpropertycache.cpp166
-rw-r--r--src/qml/qml/qqmlpropertycache_p.h25
-rw-r--r--src/qml/qml/qqmlpropertyvalueinterceptor_p.h2
-rw-r--r--src/qml/qml/qqmlproxymetaobject.cpp6
-rw-r--r--src/qml/qml/qqmlproxymetaobject_p.h2
-rw-r--r--src/qml/qml/qqmlscriptstring_p.h11
-rw-r--r--src/qml/qml/qqmltypeloader.cpp201
-rw-r--r--src/qml/qml/qqmltypeloader_p.h15
-rw-r--r--src/qml/qml/qqmltypenamecache.cpp2
-rw-r--r--src/qml/qml/qqmltypenotavailable_p.h11
-rw-r--r--src/qml/qml/qqmltypewrapper.cpp29
-rw-r--r--src/qml/qml/qqmltypewrapper_p.h6
-rw-r--r--src/qml/qml/qqmlvaluetype.cpp4
-rw-r--r--src/qml/qml/qqmlvaluetype_p.h2
-rw-r--r--src/qml/qml/qqmlvaluetypeproxybinding.cpp97
-rw-r--r--src/qml/qml/qqmlvaluetypeproxybinding_p.h20
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper.cpp105
-rw-r--r--src/qml/qml/qqmlvaluetypewrapper_p.h7
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp1202
-rw-r--r--src/qml/qml/qqmlvmemetaobject_p.h124
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp305
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp176
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions_p.h13
-rw-r--r--src/qml/qml/v8/qv4domerrors.cpp2
-rw-r--r--src/qml/qml/v8/qv4sqlerrors.cpp2
-rw-r--r--src/qml/qml/v8/qv8engine.cpp86
-rw-r--r--src/qml/qml/v8/qv8engine_p.h27
-rw-r--r--src/qml/types/qqmlbind.cpp137
-rw-r--r--src/qml/types/qqmlbind_p.h11
-rw-r--r--src/qml/types/qqmlconnections.cpp2
-rw-r--r--src/qml/types/qqmlconnections_p.h11
-rw-r--r--src/qml/types/qqmldelegatemodel.cpp65
-rw-r--r--src/qml/types/qqmldelegatemodel_p.h13
-rw-r--r--src/qml/types/qqmldelegatemodel_p_p.h9
-rw-r--r--src/qml/types/qqmlinstantiator.cpp4
-rw-r--r--src/qml/types/qqmlinstantiator_p.h11
-rw-r--r--src/qml/types/qqmlitemmodels.qdoc40
-rw-r--r--src/qml/types/qqmlitemselectionmodel.qdoc4
-rw-r--r--src/qml/types/qqmllistmodel.cpp214
-rw-r--r--src/qml/types/qqmllistmodel_p.h17
-rw-r--r--src/qml/types/qqmllistmodel_p_p.h77
-rw-r--r--src/qml/types/qqmlmodelsmodule.cpp1
-rw-r--r--src/qml/types/qqmlmodelsmodule_p.h11
-rw-r--r--src/qml/types/qqmlobjectmodel.cpp204
-rw-r--r--src/qml/types/qqmlobjectmodel_p.h26
-rw-r--r--src/qml/types/qqmltimer_p.h11
-rw-r--r--src/qml/types/qquickpackage_p.h11
-rw-r--r--src/qml/types/qquickworkerscript.cpp28
-rw-r--r--src/qml/util/qqmladaptormodel.cpp23
-rw-r--r--src/qml/util/qqmladaptormodel_p.h11
-rw-r--r--src/qml/util/qqmllistaccessor_p.h11
-rw-r--r--src/qml/util/qqmllistcompositor_p.h12
-rw-r--r--src/qml/util/qqmlpropertymap.cpp3
-rw-r--r--src/qmldevtools/qmldevtools.pro1
-rw-r--r--src/qmldevtools/qtqmldevtoolsglobal_p.h17
-rw-r--r--src/qmltest/qmltest.pro4
-rw-r--r--src/qmltest/qtestoptions_p.h11
-rw-r--r--src/qmltest/quicktest.cpp2
-rw-r--r--src/qmltest/quicktest.h11
-rw-r--r--src/qmltest/quicktestevent.cpp45
-rw-r--r--src/qmltest/quicktestevent_p.h14
-rw-r--r--src/qmltest/quicktestresult.cpp21
-rw-r--r--src/qmltest/quicktestresult_p.h13
-rw-r--r--src/quick/accessible/qaccessiblequickitem.cpp9
-rw-r--r--src/quick/accessible/qaccessiblequickitem_p.h11
-rw-r--r--src/quick/accessible/qaccessiblequickview_p.h11
-rw-r--r--src/quick/accessible/qquickaccessiblefactory_p.h11
-rw-r--r--src/quick/designer/designer.pri25
-rw-r--r--src/quick/designer/qqmldesignermetaobject.cpp340
-rw-r--r--src/quick/designer/qqmldesignermetaobject_p.h105
-rw-r--r--src/quick/designer/qquickdesignercustomobjectdata.cpp286
-rw-r--r--src/quick/designer/qquickdesignercustomobjectdata_p.h100
-rw-r--r--src/quick/designer/qquickdesignersupport.cpp (renamed from src/quick/designer/designersupport.cpp)96
-rw-r--r--src/quick/designer/qquickdesignersupport_p.h (renamed from src/quick/designer/designersupport.h)22
-rw-r--r--src/quick/designer/qquickdesignersupportitems.cpp320
-rw-r--r--src/quick/designer/qquickdesignersupportitems_p.h (renamed from src/qml/debugger/qqmlconfigurabledebugservice_p.h)50
-rw-r--r--src/quick/designer/qquickdesignersupportmetainfo.cpp (renamed from src/qml/qml/ftw/qqmlpool.cpp)63
-rw-r--r--src/quick/designer/qquickdesignersupportmetainfo_p.h64
-rw-r--r--src/quick/designer/qquickdesignersupportproperties.cpp233
-rw-r--r--src/quick/designer/qquickdesignersupportproperties_p.h98
-rw-r--r--src/quick/designer/qquickdesignersupportpropertychanges.cpp135
-rw-r--r--src/quick/designer/qquickdesignersupportpropertychanges_p.h70
-rw-r--r--src/quick/designer/qquickdesignersupportstates.cpp119
-rw-r--r--src/quick/designer/qquickdesignersupportstates_p.h76
-rw-r--r--src/quick/designer/qquickdesignerwindowmanager.cpp (renamed from src/quick/designer/designerwindowmanager.cpp)25
-rw-r--r--src/quick/designer/qquickdesignerwindowmanager_p.h (renamed from src/quick/designer/designerwindowmanager_p.h)4
-rw-r--r--src/quick/doc/qtquick.qdocconf2
-rw-r--r--src/quick/doc/src/concepts/effects/sprites.qdoc7
-rw-r--r--src/quick/doc/src/concepts/effects/transformations.qdoc2
-rw-r--r--src/quick/doc/src/concepts/input/textinput.qdoc7
-rw-r--r--src/quick/doc/src/concepts/modelviewsdata/modelview.qdoc17
-rw-r--r--src/quick/doc/src/concepts/positioning/anchors.qdoc2
-rw-r--r--src/quick/doc/src/concepts/positioning/layouts.qdoc3
-rw-r--r--src/quick/doc/src/concepts/statesanimations/animations.qdoc30
-rw-r--r--src/quick/doc/src/concepts/statesanimations/states.qdoc3
-rw-r--r--src/quick/doc/src/concepts/visualcanvas/scenegraph.qdoc6
-rw-r--r--src/quick/doc/src/examples.qdoc2
-rw-r--r--src/quick/items/context2d/qquickcanvascontext_p.h11
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp21
-rw-r--r--src/quick/items/context2d/qquickcanvasitem_p.h15
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp81
-rw-r--r--src/quick/items/context2d/qquickcontext2d_p.h13
-rw-r--r--src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h11
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture_p.h11
-rw-r--r--src/quick/items/context2d/qquickcontext2dtile_p.h11
-rw-r--r--src/quick/items/items.pri1
-rw-r--r--src/quick/items/qquickaccessibleattached_p.h11
-rw-r--r--src/quick/items/qquickanchors.cpp28
-rw-r--r--src/quick/items/qquickanchors_p.h11
-rw-r--r--src/quick/items/qquickanimatedimage_p.h11
-rw-r--r--src/quick/items/qquickanimatedsprite_p.h13
-rw-r--r--src/quick/items/qquickborderimage_p.h13
-rw-r--r--src/quick/items/qquickclipnode_p.h11
-rw-r--r--src/quick/items/qquickdrag.cpp1
-rw-r--r--src/quick/items/qquickdrag_p.h14
-rw-r--r--src/quick/items/qquickdroparea.cpp4
-rw-r--r--src/quick/items/qquickdroparea_p.h14
-rw-r--r--src/quick/items/qquickevents.cpp5
-rw-r--r--src/quick/items/qquickflickable.cpp47
-rw-r--r--src/quick/items/qquickflickable_p.h13
-rw-r--r--src/quick/items/qquickflickable_p_p.h1
-rw-r--r--src/quick/items/qquickflickablebehavior_p.h11
-rw-r--r--src/quick/items/qquickflipable.cpp17
-rw-r--r--src/quick/items/qquickflipable_p.h13
-rw-r--r--src/quick/items/qquickfocusscope_p.h11
-rw-r--r--src/quick/items/qquickframebufferobject.cpp31
-rw-r--r--src/quick/items/qquickframebufferobject.h5
-rw-r--r--src/quick/items/qquickgridview.cpp14
-rw-r--r--src/quick/items/qquickgridview_p.h15
-rw-r--r--src/quick/items/qquickimage.cpp5
-rw-r--r--src/quick/items/qquickimage_p.h19
-rw-r--r--src/quick/items/qquickimagebase.cpp70
-rw-r--r--src/quick/items/qquickimagebase_p.h13
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p.h11
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p_p.h2
-rw-r--r--src/quick/items/qquickitem.cpp329
-rw-r--r--src/quick/items/qquickitem.h2
-rw-r--r--src/quick/items/qquickitem_p.h50
-rw-r--r--src/quick/items/qquickitemanimation_p.h13
-rw-r--r--src/quick/items/qquickitemchangelistener_p.h8
-rw-r--r--src/quick/items/qquickitemsmodule.cpp21
-rw-r--r--src/quick/items/qquickitemsmodule_p.h11
-rw-r--r--src/quick/items/qquickitemview.cpp119
-rw-r--r--src/quick/items/qquickitemview_p.h24
-rw-r--r--src/quick/items/qquickitemview_p_p.h23
-rw-r--r--src/quick/items/qquickitemviewtransition.cpp1
-rw-r--r--src/quick/items/qquickitemviewtransition_p.h23
-rw-r--r--src/quick/items/qquicklistview.cpp166
-rw-r--r--src/quick/items/qquicklistview_p.h25
-rw-r--r--src/quick/items/qquickloader.cpp9
-rw-r--r--src/quick/items/qquickloader_p.h13
-rw-r--r--src/quick/items/qquickloader_p_p.h3
-rw-r--r--src/quick/items/qquickmousearea.cpp1
-rw-r--r--src/quick/items/qquickmousearea_p.h11
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp14
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h12
-rw-r--r--src/quick/items/qquickopenglinfo_p.h3
-rw-r--r--src/quick/items/qquickpainteditem.cpp126
-rw-r--r--src/quick/items/qquickpainteditem.h8
-rw-r--r--src/quick/items/qquickpainteditem_p.h14
-rw-r--r--src/quick/items/qquickpathview.cpp169
-rw-r--r--src/quick/items/qquickpathview_p.h18
-rw-r--r--src/quick/items/qquickpathview_p_p.h5
-rw-r--r--src/quick/items/qquickpincharea_p.h13
-rw-r--r--src/quick/items/qquickpositioners.cpp319
-rw-r--r--src/quick/items/qquickpositioners_p.h57
-rw-r--r--src/quick/items/qquickpositioners_p_p.h23
-rw-r--r--src/quick/items/qquickrectangle_p.h15
-rw-r--r--src/quick/items/qquickrendercontrol.cpp20
-rw-r--r--src/quick/items/qquickrendercontrol_p.h1
-rw-r--r--src/quick/items/qquickrepeater.cpp47
-rw-r--r--src/quick/items/qquickrepeater_p.h11
-rw-r--r--src/quick/items/qquickscalegrid_p_p.h12
-rw-r--r--src/quick/items/qquickscreen_p.h11
-rw-r--r--src/quick/items/qquickshadereffect_p.h15
-rw-r--r--src/quick/items/qquickshadereffectmesh_p.h11
-rw-r--r--src/quick/items/qquickshadereffectnode.cpp6
-rw-r--r--src/quick/items/qquickshadereffectnode_p.h11
-rw-r--r--src/quick/items/qquickshadereffectsource.cpp34
-rw-r--r--src/quick/items/qquickshadereffectsource_p.h27
-rw-r--r--src/quick/items/qquicksprite_p.h11
-rw-r--r--src/quick/items/qquickspriteengine_p.h11
-rw-r--r--src/quick/items/qquickspritesequence_p.h11
-rw-r--r--src/quick/items/qquickstateoperations.cpp201
-rw-r--r--src/quick/items/qquickstateoperations_p.h19
-rw-r--r--src/quick/items/qquicktext.cpp438
-rw-r--r--src/quick/items/qquicktext_p.h62
-rw-r--r--src/quick/items/qquicktext_p_p.h61
-rw-r--r--src/quick/items/qquicktextcontrol.cpp22
-rw-r--r--src/quick/items/qquicktextcontrol_p_p.h3
-rw-r--r--src/quick/items/qquicktextdocument.cpp148
-rw-r--r--src/quick/items/qquicktextdocument_p.h101
-rw-r--r--src/quick/items/qquicktextedit.cpp303
-rw-r--r--src/quick/items/qquicktextedit_p.h66
-rw-r--r--src/quick/items/qquicktextedit_p_p.h35
-rw-r--r--src/quick/items/qquicktextinput.cpp479
-rw-r--r--src/quick/items/qquicktextinput_p.h96
-rw-r--r--src/quick/items/qquicktextinput_p_p.h28
-rw-r--r--src/quick/items/qquicktextnode.cpp45
-rw-r--r--src/quick/items/qquicktextnode_p.h15
-rw-r--r--src/quick/items/qquicktextnodeengine.cpp5
-rw-r--r--src/quick/items/qquicktextnodeengine_p.h13
-rw-r--r--src/quick/items/qquicktranslate_p.h11
-rw-r--r--src/quick/items/qquickview.cpp33
-rw-r--r--src/quick/items/qquickview.h3
-rw-r--r--src/quick/items/qquickview_p.h23
-rw-r--r--src/quick/items/qquickwindow.cpp178
-rw-r--r--src/quick/items/qquickwindow.h8
-rw-r--r--src/quick/items/qquickwindow_p.h2
-rw-r--r--src/quick/items/qquickwindowattached_p.h11
-rw-r--r--src/quick/items/qquickwindowmodule_p.h11
-rw-r--r--src/quick/qtquick2.cpp16
-rw-r--r--src/quick/qtquick2_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgabstractrenderer_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp87
-rw-r--r--src/quick/scenegraph/coreapi/qsgbatchrenderer_p.h35
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterialshader_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater.cpp18
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater_p.h11
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer.cpp11
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer_p.h11
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer.cpp4
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer_p.h14
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp105
-rw-r--r--src/quick/scenegraph/qsgcontext_p.h21
-rw-r--r--src/quick/scenegraph/qsgcontextplugin_p.h11
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h11
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.cpp13
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.h11
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p_p.h11
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode.cpp5
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode_p.h11
-rw-r--r--src/quick/scenegraph/qsgdefaultlayer.cpp25
-rw-r--r--src/quick/scenegraph/qsgdefaultlayer_p.h21
-rw-r--r--src/quick/scenegraph/qsgdefaultrectanglenode_p.h11
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode.cpp6
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp11
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.h11
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h11
-rw-r--r--src/quick/scenegraph/qsgrenderloop.cpp35
-rw-r--r--src/quick/scenegraph/qsgrenderloop_p.h13
-rw-r--r--src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp655
-rw-r--r--src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h124
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop.cpp65
-rw-r--r--src/quick/scenegraph/qsgthreadedrenderloop_p.h12
-rw-r--r--src/quick/scenegraph/qsgwindowsrenderloop.cpp3
-rw-r--r--src/quick/scenegraph/qsgwindowsrenderloop_p.h11
-rw-r--r--src/quick/scenegraph/scenegraph.pri2
-rw-r--r--src/quick/scenegraph/shaders/rendernode_core.frag4
-rw-r--r--src/quick/scenegraph/shaders/styledtext_core.frag6
-rw-r--r--src/quick/scenegraph/util/qsgareaallocator_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgatlastexture.cpp22
-rw-r--r--src/quick/scenegraph/util/qsgatlastexture_p.h14
-rw-r--r--src/quick/scenegraph/util/qsgdefaultpainternode.cpp62
-rw-r--r--src/quick/scenegraph/util/qsgdefaultpainternode_p.h40
-rw-r--r--src/quick/scenegraph/util/qsgdepthstencilbuffer_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil.cpp21
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgengine.cpp15
-rw-r--r--src/quick/scenegraph/util/qsgengine.h3
-rw-r--r--src/quick/scenegraph/util/qsgengine_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgshadersourcebuilder.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgshadersourcebuilder_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgtexture_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial_p.h11
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider.cpp4
-rw-r--r--src/quick/util/qquickanimation.cpp49
-rw-r--r--src/quick/util/qquickanimation_p.h15
-rw-r--r--src/quick/util/qquickanimation_p_p.h4
-rw-r--r--src/quick/util/qquickanimationcontroller_p.h11
-rw-r--r--src/quick/util/qquickanimator.cpp2
-rw-r--r--src/quick/util/qquickanimator_p.h14
-rw-r--r--src/quick/util/qquickanimator_p_p.h11
-rw-r--r--src/quick/util/qquickanimatorcontroller.cpp9
-rw-r--r--src/quick/util/qquickanimatorcontroller_p.h11
-rw-r--r--src/quick/util/qquickanimatorjob.cpp7
-rw-r--r--src/quick/util/qquickanimatorjob_p.h49
-rw-r--r--src/quick/util/qquickapplication_p.h11
-rw-r--r--src/quick/util/qquickbehavior_p.h11
-rw-r--r--src/quick/util/qquickfontloader.cpp58
-rw-r--r--src/quick/util/qquickfontloader_p.h13
-rw-r--r--src/quick/util/qquickfontmetrics.cpp3
-rw-r--r--src/quick/util/qquickfontmetrics_p.h11
-rw-r--r--src/quick/util/qquickglobal.cpp277
-rw-r--r--src/quick/util/qquickimageprovider.cpp131
-rw-r--r--src/quick/util/qquickimageprovider.h32
-rw-r--r--src/quick/util/qquickpath_p.h13
-rw-r--r--src/quick/util/qquickpathinterpolator_p.h11
-rw-r--r--src/quick/util/qquickpixmapcache.cpp245
-rw-r--r--src/quick/util/qquickpixmapcache_p.h11
-rw-r--r--src/quick/util/qquickprofiler.cpp24
-rw-r--r--src/quick/util/qquickprofiler_p.h2
-rw-r--r--src/quick/util/qquickpropertychanges.cpp34
-rw-r--r--src/quick/util/qquickpropertychanges_p.h11
-rw-r--r--src/quick/util/qquickshortcut.cpp31
-rw-r--r--src/quick/util/qquickshortcut_p.h5
-rw-r--r--src/quick/util/qquicksmoothedanimation_p.h13
-rw-r--r--src/quick/util/qquickspringanimation_p.h11
-rw-r--r--src/quick/util/qquickstate.cpp49
-rw-r--r--src/quick/util/qquickstate_p.h23
-rw-r--r--src/quick/util/qquickstate_p_p.h10
-rw-r--r--src/quick/util/qquickstatechangescript.cpp2
-rw-r--r--src/quick/util/qquickstatechangescript_p.h13
-rw-r--r--src/quick/util/qquickstategroup_p.h11
-rw-r--r--src/quick/util/qquickstyledtext.cpp4
-rw-r--r--src/quick/util/qquickstyledtext_p.h11
-rw-r--r--src/quick/util/qquicksvgparser_p.h11
-rw-r--r--src/quick/util/qquicksystempalette_p.h13
-rw-r--r--src/quick/util/qquicktextmetrics.cpp2
-rw-r--r--src/quick/util/qquicktextmetrics_p.h11
-rw-r--r--src/quick/util/qquicktimeline.cpp2
-rw-r--r--src/quick/util/qquicktransition.cpp2
-rw-r--r--src/quick/util/qquicktransition_p.h11
-rw-r--r--src/quick/util/qquicktransitionmanager.cpp28
-rw-r--r--src/quick/util/qquicktransitionmanager_p_p.h6
-rw-r--r--src/quick/util/qquickutilmodule.cpp10
-rw-r--r--src/quick/util/qquickutilmodule_p.h11
-rw-r--r--src/quick/util/qquickvalidator.cpp221
-rw-r--r--src/quick/util/qquickvalidator_p.h (renamed from src/qml/debugger/qqmlinspectorservice_p.h)65
-rw-r--r--src/quick/util/qquickvaluetypes.cpp10
-rw-r--r--src/quick/util/qquickvaluetypes_p.h26
-rw-r--r--src/quick/util/util.pri6
-rw-r--r--src/quickwidgets/qquickwidget.cpp109
-rw-r--r--src/quickwidgets/qquickwidget.h3
-rw-r--r--src/quickwidgets/qquickwidget_p.h13
-rw-r--r--sync.profile2
-rw-r--r--tests/auto/bic/data/QtQuick.5.0.0.linux-gcc-amd64.txt4
-rw-r--r--tests/auto/bic/data/QtQuick.5.1.0.linux-gcc-amd64.txt4
-rw-r--r--tests/auto/bic/data/QtQuick.5.2.0.linux-gcc-amd64.txt4
-rw-r--r--tests/auto/bic/data/QtQuick.5.3.0.linux-gcc-amd64.txt5
-rw-r--r--tests/auto/bic/data/QtQuick.5.4.0.linux-gcc-amd64.txt5
-rw-r--r--tests/auto/bic/data/QtQuickWidgets.5.3.0.linux-gcc-amd64.txt4
-rw-r--r--tests/auto/bic/data/QtQuickWidgets.5.4.0.linux-gcc-amd64.txt5
-rw-r--r--tests/auto/cmake/CMakeLists.txt2
-rw-r--r--tests/auto/cmake/test_plugins/CMakeLists.txt16
-rw-r--r--tests/auto/particles/qquickpointattractor/tst_qquickpointattractor.cpp2
-rw-r--r--tests/auto/qml/animation/qpauseanimationjob/tst_qpauseanimationjob.cpp86
-rw-r--r--tests/auto/qml/animation/qsequentialanimationgroupjob/BLACKLIST2
-rw-r--r--tests/auto/qml/animation/qsequentialanimationgroupjob/tst_qsequentialanimationgroupjob.cpp6
-rw-r--r--tests/auto/qml/debugger/debugger.pro4
-rw-r--r--tests/auto/qml/debugger/qdebugmessageservice/tst_qdebugmessageservice.cpp2
-rw-r--r--tests/auto/qml/debugger/qpacketprotocol/tst_qpacketprotocol.cpp2
-rw-r--r--tests/auto/qml/debugger/qqmldebugclient/tst_qqmldebugclient.cpp45
-rw-r--r--tests/auto/qml/debugger/qqmldebuggingenabler/qqmldebuggingenabler/tst_qqmldebuggingenabler.cpp2
-rw-r--r--tests/auto/qml/debugger/qqmldebugjs/tst_qqmldebugjs.cpp96
-rw-r--r--tests/auto/qml/debugger/qqmldebuglocal/qqmldebuglocal.pro16
-rw-r--r--tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp146
-rw-r--r--tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.pro0
-rw-r--r--tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp94
-rw-r--r--tests/auto/qml/debugger/qqmlenginecontrol/tst_qqmlenginecontrol.cpp42
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebuginspectorintegrationtest/tst_qqmlenginedebuginspectorintegration.cpp26
-rw-r--r--tests/auto/qml/debugger/qqmlenginedebugservice/tst_qqmlenginedebugservice.cpp19
-rw-r--r--tests/auto/qml/debugger/qqmlinspector/tst_qqmlinspector.cpp45
-rw-r--r--tests/auto/qml/debugger/qqmlnativeconnector/qqmlnativeconnector.pro6
-rw-r--r--tests/auto/qml/debugger/qqmlnativeconnector/tst_qqmlnativeconnector.cpp126
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/data/timer.qml14
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/qqmlprofilerservice.pro3
-rw-r--r--tests/auto/qml/debugger/qqmlprofilerservice/tst_qqmlprofilerservice.cpp116
-rw-r--r--tests/auto/qml/debugger/shared/debugutil.cpp2
-rw-r--r--tests/auto/qml/debugger/shared/debugutil_p.h11
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugclient.cpp61
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugclient.h1
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugtestservice.cpp8
-rw-r--r--tests/auto/qml/debugger/shared/qqmldebugtestservice.h3
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma/Date/15.9.1.13-1.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma/ExecutionContexts/10.1.3-2.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma/README0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/README0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/constructor-001.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/function-001.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-001.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-002.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-003-n.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-004-n.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-005-n.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_2/extensions/instanceof-006.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/15.4.4.11-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/15.4.5.1-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-322135-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-322135-02.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-322135-03.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-322135-04.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-387501.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-421325.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Array/regress-430717.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Date/15.9.1.2-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Date/15.9.3.2-1.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Date/15.9.4.3.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Date/15.9.5.5-02.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/ExecutionContexts/10.6.1-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/ExecutionContexts/regress-448595-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.10-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.10-02.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.10-03.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.7.1-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.7.2-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Expressions/11.7.3-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Function/arguments-002.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Function/regress-313570.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/LexicalConventions/7.9.1.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Number/regress-442242-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Object/8.6.1-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Object/regress-361274.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Object/regress-385393-07.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Operators/11.13.1-002.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Operators/11.4.1-002.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Operators/order-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/README0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/15.10.2.12.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-285219.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-289669.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-307456.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-309840.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-311414.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-312351.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-330684.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-334158.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-346090.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-367888.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375642.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375711.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375715-01-n.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375715-02.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375715-03.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/RegExp/regress-375715-04.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Regress/regress-385393-04.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Regress/regress-419152.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Regress/regress-420087.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Regress/regress-420610.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Regress/regress-441477-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Statements/12.6.3.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Statements/regress-302439.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Statements/regress-324650.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/String/regress-304376.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/String/regress-313567.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/String/regress-392378.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/Unicode/regress-352044-01.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/browser.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/10.1.3-2.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/7.9.1.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-274152.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-320854.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-327170.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-368516.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-385393-03.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-429248.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/extensions/regress-430740.js0
-rw-r--r--[-rwxr-xr-x]tests/auto/qml/parserstress/tests/ecma_3/template.js0
-rw-r--r--tests/auto/qml/qjsengine/tst_qjsengine.cpp141
-rw-r--r--tests/auto/qml/qjsonbinding/tst_qjsonbinding.cpp2
-rw-r--r--tests/auto/qml/qjsvalue/tst_qjsvalue.cpp16
-rw-r--r--tests/auto/qml/qjsvalueiterator/tst_qjsvalueiterator.cpp2
-rw-r--r--tests/auto/qml/qml.pro9
-rw-r--r--tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/Singleton.qml6
-rw-r--r--tests/auto/qml/qmlplugindump/tests/dumper/CompositeSingleton/qmldir3
-rw-r--r--tests/auto/qml/qmlplugindump/tst_qmlplugindump.cpp17
-rw-r--r--tests/auto/qml/qqmlbinding/data/readonlyProperty.qml13
-rw-r--r--tests/auto/qml/qqmlbinding/data/unknownProperty.qml11
-rw-r--r--tests/auto/qml/qqmlbinding/tst_qqmlbinding.cpp34
-rw-r--r--tests/auto/qml/qqmlcomponent/tst_qqmlcomponent.cpp38
-rw-r--r--tests/auto/qml/qqmlconnections/tst_qqmlconnections.cpp10
-rw-r--r--tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp4
-rw-r--r--tests/auto/qml/qqmlcontext/tst_qqmlcontext.cpp16
-rw-r--r--tests/auto/qml/qqmldirparser/tst_qqmldirparser.cpp9
-rw-r--r--tests/auto/qml/qqmlecmascript/data/qtbug_46022.js21
-rw-r--r--tests/auto/qml/qqmlecmascript/data/qtbug_46022.qml7
-rw-r--r--tests/auto/qml/qqmlecmascript/data/singletonTest.qml1
-rw-r--r--tests/auto/qml/qqmlecmascript/data/singletonTest2.qml2
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.cpp33
-rw-r--r--tests/auto/qml/qqmlecmascript/testtypes.h2
-rw-r--r--tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp170
-rw-r--r--tests/auto/qml/qqmlengine/data/TypeofQmlProperty.qml6
-rw-r--r--tests/auto/qml/qqmlengine/tst_qqmlengine.cpp37
-rw-r--r--tests/auto/qml/qqmlexpression/tst_qqmlexpression.cpp2
-rw-r--r--tests/auto/qml/qqmlincubator/tst_qqmlincubator.cpp22
-rw-r--r--tests/auto/qml/qqmllanguage/BLACKLIST2
-rw-r--r--tests/auto/qml/qqmllanguage/data/CompositeTypeWithAttachedProperty.qml4
-rw-r--r--tests/auto/qml/qqmllanguage/data/CompositeTypeWithEnum.qml4
-rw-r--r--tests/auto/qml/qqmllanguage/data/assignSignalFunctionExpression.qml5
-rw-r--r--tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithAttachedProperty.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/data/registeredCompositeTypeWithEnum.qml6
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.cpp4
-rw-r--r--tests/auto/qml/qqmllanguage/testtypes.h13
-rw-r--r--tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp159
-rw-r--r--tests/auto/qml/qqmllistmodel/tst_qqmllistmodel.cpp37
-rw-r--r--tests/auto/qml/qqmllistmodelworkerscript/tst_qqmllistmodelworkerscript.cpp68
-rw-r--r--tests/auto/qml/qqmllistreference/tst_qqmllistreference.cpp254
-rw-r--r--tests/auto/qml/qqmllocale/tst_qqmllocale.cpp16
-rw-r--r--tests/auto/qml/qqmlmetatype/tst_qqmlmetatype.cpp18
-rw-r--r--tests/auto/qml/qqmlmoduleplugin/tst_qqmlmoduleplugin.cpp15
-rw-r--r--tests/auto/qml/qqmlobjectmodel/qqmlobjectmodel.pro10
-rw-r--r--tests/auto/qml/qqmlobjectmodel/tst_qqmlobjectmodel.cpp134
-rw-r--r--tests/auto/qml/qqmlopenmetaobject/qqmlopenmetaobject.pro9
-rw-r--r--tests/auto/qml/qqmlopenmetaobject/tst_qqmlopenmetaobject.cpp69
-rw-r--r--tests/auto/qml/qqmlproperty/data/floatToStringPrecision.qml10
-rw-r--r--tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp278
-rw-r--r--tests/auto/qml/qqmlpropertycache/tst_qqmlpropertycache.cpp19
-rw-r--r--tests/auto/qml/qqmlpropertymap/tst_qqmlpropertymap.cpp22
-rw-r--r--tests/auto/qml/qqmlqt/tst_qqmlqt.cpp2
-rw-r--r--tests/auto/qml/qqmltimer/tst_qqmltimer.cpp10
-rw-r--r--tests/auto/qml/qqmltypeloader/data/load_synchronous.qml42
-rw-r--r--tests/auto/qml/qqmltypeloader/tst_qqmltypeloader.cpp11
-rw-r--r--tests/auto/qml/qqmlvaluetypeproviders/data/changedSignal.qml94
-rw-r--r--tests/auto/qml/qqmlvaluetypeproviders/data/qtquickValueTypes.qml2
-rw-r--r--tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp14
-rw-r--r--tests/auto/qml/qqmlvaluetypes/data/color_compare.qml4
-rw-r--r--tests/auto/qml/qqmlvaluetypes/tst_qqmlvaluetypes.cpp12
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.expect14
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.collection.allprop.reply.body29
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.expect18
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.reply.body29
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/propfind.file.reply.header2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/sendPropfind.collection.allprop.qml200
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/sendPropfind.response.qml161
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/WebDAV/sendPropfind.responseXML.qml160
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/cdata.qml4
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/json.data6
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receiveBinaryData.qml2
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receiveJsonData.qml22
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.expect7
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/receive_json_data.reply3
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/status.500.reply3
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/data/text.qml4
-rw-r--r--tests/auto/qml/qqmlxmlhttprequest/tst_qqmlxmlhttprequest.cpp134
-rw-r--r--tests/auto/qml/qquickfolderlistmodel/tst_qquickfolderlistmodel.cpp8
-rw-r--r--tests/auto/qml/qquickworkerscript/tst_qquickworkerscript.cpp12
-rw-r--r--tests/auto/qml/qv4debugger/qv4debugger.pro10
-rw-r--r--tests/auto/qml/qv4debugger/tst_qv4debugger.cpp398
-rw-r--r--tests/auto/qmldevtools/compile/tst_compile.cpp1
-rw-r--r--tests/auto/qmltest/BLACKLIST5
-rw-r--r--tests/auto/qmltest/objectmodel/tst_objectmodel.qml100
-rw-r--r--tests/auto/qmltest/qtbug46798/tst_qtbug46798.qml71
-rw-r--r--tests/auto/qmltest/selftests/tst_grabImage.qml58
-rw-r--r--tests/auto/qmltest/selftests/tst_selftests.qml26
-rw-r--r--tests/auto/qmltest/textedit/tst_textedit_editingfinished.qml89
-rw-r--r--tests/auto/qmltest/window/tst_clickwindow.qml84
-rw-r--r--tests/auto/quick/geometry/tst_geometry.cpp6
-rw-r--r--tests/auto/quick/nokeywords/tst_nokeywords.cpp1
-rw-r--r--tests/auto/quick/qquickanchors/tst_qquickanchors.cpp8
-rw-r--r--tests/auto/quick/qquickanimatedimage/tst_qquickanimatedimage.cpp56
-rw-r--r--[-rwxr-xr-x]tests/auto/quick/qquickanimationcontroller/data/tst_coloranimation.qml0
-rw-r--r--[-rwxr-xr-x]tests/auto/quick/qquickanimationcontroller/data/tst_completion.qml0
-rw-r--r--tests/auto/quick/qquickanimations/data/animatorInvalidTargetCrash.qml63
-rw-r--r--tests/auto/quick/qquickanimations/data/defaultRotationAnimation.qml14
-rw-r--r--tests/auto/quick/qquickanimations/tst_qquickanimations.cpp99
-rw-r--r--tests/auto/quick/qquickapplication/tst_qquickapplication.cpp4
-rw-r--r--tests/auto/quick/qquickbehaviors/BLACKLIST2
-rw-r--r--tests/auto/quick/qquickbehaviors/data/Accelerator.qml18
-rw-r--r--tests/auto/quick/qquickbehaviors/data/aliased.qml39
-rw-r--r--tests/auto/quick/qquickbehaviors/tst_qquickbehaviors.cpp210
-rw-r--r--tests/auto/quick/qquickborderimage/tst_qquickborderimage.cpp51
-rw-r--r--tests/auto/quick/qquickdesignersupport/data/TestComponent.qml9
-rw-r--r--tests/auto/quick/qquickdesignersupport/data/test.qml39
-rw-r--r--tests/auto/quick/qquickdesignersupport/qquickdesignersupport.pro16
-rw-r--r--tests/auto/quick/qquickdesignersupport/tst_qquickdesignersupport.cpp501
-rw-r--r--tests/auto/quick/qquickdynamicpropertyanimation/tst_qquickdynamicpropertyanimation.cpp8
-rw-r--r--tests/auto/quick/qquickflickable/BLACKLIST2
-rw-r--r--tests/auto/quick/qquickflickable/data/movementSignals.qml26
-rw-r--r--tests/auto/quick/qquickflickable/data/nestedPressDelay.qml10
-rw-r--r--tests/auto/quick/qquickflickable/tst_qquickflickable.cpp276
-rw-r--r--tests/auto/quick/qquickflipable/tst_qquickflipable.cpp8
-rw-r--r--tests/auto/quick/qquickfocusscope/tst_qquickfocusscope.cpp160
-rw-r--r--tests/auto/quick/qquickfontloader/tst_qquickfontloader.cpp30
-rw-r--r--tests/auto/quick/qquickfontloader_static/data/font.ttfbin0 -> 51984 bytes
-rw-r--r--tests/auto/quick/qquickfontloader_static/qquickfontloader_static.pro12
-rw-r--r--tests/auto/quick/qquickfontloader_static/tst_qquickfontloader_static.cpp (renamed from src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp)75
-rw-r--r--tests/auto/quick/qquickgridview/BLACKLIST2
-rw-r--r--tests/auto/quick/qquickgridview/data/contentHeightWithDelayRemove.qml47
-rw-r--r--tests/auto/quick/qquickgridview/data/gridview-initCurrent.qml3
-rw-r--r--tests/auto/quick/qquickgridview/data/qtbug45640.qml24
-rw-r--r--tests/auto/quick/qquickgridview/tst_qquickgridview.cpp194
-rw-r--r--tests/auto/quick/qquickimage/tst_qquickimage.cpp83
-rw-r--r--tests/auto/quick/qquickimageprovider/tst_qquickimageprovider.cpp110
-rw-r--r--tests/auto/quick/qquickitem/BLACKLIST2
-rw-r--r--tests/auto/quick/qquickitem/tst_qquickitem.cpp78
-rw-r--r--tests/auto/quick/qquickitem2/data/childrenRectBottomRightCorner.qml47
-rw-r--r--tests/auto/quick/qquickitem2/data/mapCoordinates.qml16
-rw-r--r--tests/auto/quick/qquickitem2/data/mapCoordinatesRect.qml16
-rw-r--r--tests/auto/quick/qquickitem2/data/tabFence.qml49
-rw-r--r--tests/auto/quick/qquickitem2/tst_qquickitem.cpp190
-rw-r--r--tests/auto/quick/qquickitemlayer/data/TextureMirroring.qml159
-rw-r--r--tests/auto/quick/qquickitemlayer/qquickitemlayer.pro3
-rw-r--r--tests/auto/quick/qquickitemlayer/tst_qquickitemlayer.cpp93
-rw-r--r--tests/auto/quick/qquicklistview/BLACKLIST4
-rw-r--r--tests/auto/quick/qquicklistview/data/contentHeightWithDelayRemove.qml46
-rw-r--r--tests/auto/quick/qquicklistview/data/listview-initCurrent.qml3
-rw-r--r--tests/auto/quick/qquicklistview/data/objectmodel.qml24
-rw-r--r--tests/auto/quick/qquicklistview/data/qtbug48044.qml144
-rw-r--r--tests/auto/quick/qquicklistview/data/qtbug48870.qml24
-rw-r--r--tests/auto/quick/qquicklistview/data/qtbug50097.qml47
-rw-r--r--tests/auto/quick/qquicklistview/data/qtbug50105.qml130
-rw-r--r--tests/auto/quick/qquicklistview/data/snapOneItemCurrentIndexRemoveAnimation.qml39
-rw-r--r--tests/auto/quick/qquicklistview/data/snapOneItemResize.qml16
-rw-r--r--tests/auto/quick/qquicklistview/tst_qquicklistview.cpp529
-rw-r--r--tests/auto/quick/qquickloader/tst_qquickloader.cpp51
-rw-r--r--tests/auto/quick/qquickmousearea/tst_qquickmousearea.cpp22
-rw-r--r--tests/auto/quick/qquickmultipointtoucharea/BLACKLIST2
-rw-r--r--tests/auto/quick/qquickmultipointtoucharea/tst_qquickmultipointtoucharea.cpp8
-rw-r--r--tests/auto/quick/qquickpathview/data/customAttribute.qml58
-rw-r--r--tests/auto/quick/qquickpathview/data/qtbug42716.qml111
-rw-r--r--tests/auto/quick/qquickpathview/tst_qquickpathview.cpp82
-rw-r--r--tests/auto/quick/qquickpincharea/tst_qquickpincharea.cpp2
-rw-r--r--tests/auto/quick/qquickpixmapcache/tst_qquickpixmapcache.cpp25
-rw-r--r--tests/auto/quick/qquickpositioners/data/allInvisible.qml40
-rw-r--r--tests/auto/quick/qquickpositioners/data/flowtest-padding.qml44
-rw-r--r--tests/auto/quick/qquickpositioners/data/gridtest-padding.qml47
-rw-r--r--tests/auto/quick/qquickpositioners/data/horizontal-padding.qml30
-rw-r--r--tests/auto/quick/qquickpositioners/data/repeatertest-padding.qml53
-rw-r--r--tests/auto/quick/qquickpositioners/data/repeatertest.qml18
-rw-r--r--tests/auto/quick/qquickpositioners/data/transitions-padding.qml239
-rw-r--r--tests/auto/quick/qquickpositioners/tst_qquickpositioners.cpp2060
-rw-r--r--tests/auto/quick/qquickrepeater/data/modelCleared.qml17
-rw-r--r--tests/auto/quick/qquickrepeater/data/objectmodel.qml28
-rw-r--r--tests/auto/quick/qquickrepeater/data/stackingorder.qml38
-rw-r--r--tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp122
-rw-r--r--tests/auto/quick/qquicksmoothedanimation/tst_qquicksmoothedanimation.cpp8
-rw-r--r--tests/auto/quick/qquickstates/tst_qquickstates.cpp12
-rw-r--r--tests/auto/quick/qquickstyledtext/tst_qquickstyledtext.cpp8
-rw-r--r--tests/auto/quick/qquicksystempalette/tst_qquicksystempalette.cpp4
-rw-r--r--tests/auto/quick/qquicktext/BLACKLIST4
-rw-r--r--tests/auto/quick/qquicktext/data/fontSizeMode.qml4
-rw-r--r--tests/auto/quick/qquicktext/data/hAlignImplicitWidth.qml2
-rw-r--r--tests/auto/quick/qquicktext/data/padding.qml12
-rw-r--r--tests/auto/quick/qquicktext/tst_qquicktext.cpp265
-rw-r--r--tests/auto/quick/qquicktextdocument/tst_qquicktextdocument.cpp2
-rw-r--r--tests/auto/quick/qquicktextedit/BLACKLIST2
-rw-r--r--tests/auto/quick/qquicktextedit/data/hAlignVisual.qml1
-rw-r--r--tests/auto/quick/qquicktextedit/data/padding.qml12
-rw-r--r--tests/auto/quick/qquicktextedit/data/signal_editingfinished.qml13
-rw-r--r--tests/auto/quick/qquicktextedit/qquicktextedit.pro2
-rw-r--r--tests/auto/quick/qquicktextedit/tst_qquicktextedit.cpp296
-rw-r--r--tests/auto/quick/qquicktextinput/data/padding.qml12
-rw-r--r--tests/auto/quick/qquicktextinput/qquicktextinput.pro2
-rw-r--r--tests/auto/quick/qquicktextinput/tst_qquicktextinput.cpp302
-rw-r--r--tests/auto/quick/qquickview/data/error2.qml4
-rw-r--r--tests/auto/quick/qquickview/tst_qquickview.cpp23
-rw-r--r--tests/auto/quick/qquickvisualdatamodel/tst_qquickvisualdatamodel.cpp10
-rw-r--r--tests/auto/quick/qquickwindow/tst_qquickwindow.cpp161
-rw-r--r--tests/auto/quick/qquickxmllistmodel/tst_qquickxmllistmodel.cpp28
-rw-r--r--tests/auto/quick/quick.pro5
-rw-r--r--tests/auto/quick/scenegraph/data/mipmap_large.pngbin4465 -> 6536 bytes
-rw-r--r--tests/auto/quick/scenegraph/data/mipmap_small.pngbin170 -> 124 bytes
-rw-r--r--tests/auto/quick/scenegraph/data/render_Mipmap.qml9
-rw-r--r--tests/auto/quick/scenegraph/tst_scenegraph.cpp103
-rw-r--r--tests/auto/quick/shared/viewtestutil.cpp20
-rw-r--r--tests/auto/quick/shared/viewtestutil.h2
-rw-r--r--tests/auto/quick/touchmouse/data/hoverMouseAreas.qml39
-rw-r--r--tests/auto/quick/touchmouse/tst_touchmouse.cpp95
-rw-r--r--tests/auto/quickwidgets/qquickwidget/tst_qquickwidget.cpp20
-rw-r--r--tests/auto/shared/testhttpserver.cpp243
-rw-r--r--tests/auto/shared/testhttpserver.h49
-rw-r--r--tests/benchmarks/script/qjsvalue/tst_qjsvalue.cpp77
-rw-r--r--tests/manual/qmlplugindump/README42
-rw-r--r--tests/manual/qmlplugindump/definitions/000_dummy.json5
-rw-r--r--tests/manual/qmlplugindump/definitions/001_versions.json8
-rw-r--r--tests/manual/qmlplugindump/definitions/002_revisions.json9
-rw-r--r--tests/manual/qmlplugindump/qmlplugindump.pro8
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/dummy.cpp49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/dummy.h (renamed from src/plugins/qmltooling/shared/qmlinspectorconstants.h)39
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/dummy.pro35
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/dummy_plugin.cpp (renamed from src/qml/jsruntime/qv4qmlextensions.cpp)16
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/dummy_plugin.h49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Dummy/qmldir3
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/CompositeImports.qml5
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/imports.cpp49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/imports.h49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/imports.pro35
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/imports_plugin.cpp45
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/imports_plugin.h49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Imports/qmldir3
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Singleton/CompositeSingleton.qml6
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Singleton/qmldir2
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/plugin.qmltypes21
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/qmldir3
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/versions.cpp49
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/versions.h (renamed from src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h)52
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/versions.pro35
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/versions_plugin.cpp46
-rw-r--r--tests/manual/qmlplugindump/tests/dumper/Versions/versions_plugin.h49
-rw-r--r--tests/manual/qmlplugindump/tst_qmlplugindump.cpp376
-rw-r--r--tests/manual/scenegraph_lancelot/scenegraph/tst_scenegraph.cpp2
-rw-r--r--tests/manual/v4/crypto.js1
m---------tests/manual/v4/test2620
-rw-r--r--tests/manual/v4/typedarrays.js35
-rw-r--r--tools/fdegen/main.cpp8
-rw-r--r--tools/qml/main.cpp43
-rw-r--r--tools/qmleasing/segmentproperties.cpp2
-rw-r--r--tools/qmleasing/splineeditor.cpp12
-rw-r--r--tools/qmlimportscanner/main.cpp65
-rw-r--r--tools/qmljs/qmljs.cpp22
-rw-r--r--tools/qmllint/main.cpp2
-rw-r--r--tools/qmlmin/main.cpp20
-rw-r--r--tools/qmlplugindump/main.cpp111
-rw-r--r--tools/qmlprofiler/commandlistener.cpp21
-rw-r--r--tools/qmlprofiler/commandlistener.h13
-rw-r--r--tools/qmlprofiler/constants.h19
-rw-r--r--tools/qmlprofiler/main.cpp32
-rw-r--r--tools/qmlprofiler/qmlprofilerapplication.cpp549
-rw-r--r--tools/qmlprofiler/qmlprofilerapplication.h35
-rw-r--r--tools/qmlprofiler/qmlprofilerclient.cpp171
-rw-r--r--tools/qmlprofiler/qmlprofilerclient.h27
-rw-r--r--tools/qmlprofiler/qmlprofilerdata.cpp166
-rw-r--r--tools/qmlprofiler/qmlprofilerdata.h17
-rw-r--r--tools/qmlscene/main.cpp117
1123 files changed, 41675 insertions, 20502 deletions
diff --git a/.gitmodules b/.gitmodules
index 9f78879479..881629497e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
[submodule "tests/manual/v4/test262"]
path = tests/manual/v4/test262
- url = git://github.com/tronical/test262.git
+ url = ../qtdeclarative-testsuites.git
update = none
diff --git a/.qmake.conf b/.qmake.conf
index 58db72c7b1..fc13c75da5 100644
--- a/.qmake.conf
+++ b/.qmake.conf
@@ -2,4 +2,4 @@ load(qt_build_config)
CONFIG += qt_example_installs
CONFIG += warning_clean
-MODULE_VERSION = 5.5.1
+MODULE_VERSION = 5.6.0
diff --git a/examples/qml/doc/src/qml-extending.qdoc b/examples/qml/doc/src/qml-extending.qdoc
index 77ccd2f1e9..e5b364e0bc 100644
--- a/examples/qml/doc/src/qml-extending.qdoc
+++ b/examples/qml/doc/src/qml-extending.qdoc
@@ -73,7 +73,7 @@ This example builds on:
\li \l {Extending QML - Adding Types Example}
\endlist
-Shows how to use \l qmlRegisterExtendedType() to provide an \l {Registering
+Shows how to use \l {QQmlEngine::}{qmlRegisterExtendedType()} to provide an \l {Registering
Extension Objects}{extension object} to a \l QLineEdit without modifying or
subclassing. The QML engine instantiates a \l QLineEdit and sets a property that
only exists on the extension type. The extension type performs calls on the \l
diff --git a/examples/qml/qmlextensionplugins/plugin.cpp b/examples/qml/qmlextensionplugins/plugin.cpp
index 729c88da73..56057b7f06 100644
--- a/examples/qml/qmlextensionplugins/plugin.cpp
+++ b/examples/qml/qmlextensionplugins/plugin.cpp
@@ -110,7 +110,7 @@ public:
if (++instances == 1) {
if (!timer)
timer = new MinuteTimer(QCoreApplication::instance());
- connect(timer, SIGNAL(timeChanged()), this, SIGNAL(timeChanged()));
+ connect(timer, &MinuteTimer::timeChanged, this, &TimeModel::timeChanged);
timer->start();
}
}
diff --git a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
index 85a5416190..975f6d409a 100644
--- a/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/binding/happybirthdaysong.cpp
@@ -45,7 +45,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
{
setName(QString());
QTimer *timer = new QTimer(this);
- QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+ QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
timer->start(1000);
}
diff --git a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
index 7655b3ebc9..96b4abe775 100644
--- a/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
+++ b/examples/qml/referenceexamples/valuesource/happybirthdaysong.cpp
@@ -45,7 +45,7 @@ HappyBirthdaySong::HappyBirthdaySong(QObject *parent)
{
setName(QString());
QTimer *timer = new QTimer(this);
- QObject::connect(timer, SIGNAL(timeout()), this, SLOT(advance()));
+ QObject::connect(timer, &QTimer::timeout, this, &HappyBirthdaySong::advance);
timer->start(1000);
}
diff --git a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
index 064dba51ef..9bc6a61716 100644
--- a/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
+++ b/examples/quick/customitems/dialcontrol/doc/src/dialcontrol.qdoc
@@ -42,6 +42,7 @@
/*!
\title UI Components: Dial Control Example
\example customitems/dialcontrol
+ \brief The Dial Control Example shows how to create a speedometer-type dial.
This example shows how to create a dial-type control. It combines
\l Image elements with \l Rotation transforms and \l SpringAnimation behaviors
diff --git a/examples/quick/customitems/flipable/doc/src/flipable.qdoc b/examples/quick/customitems/flipable/doc/src/flipable.qdoc
index b492f2c147..c4b7969b7e 100644
--- a/examples/quick/customitems/flipable/doc/src/flipable.qdoc
+++ b/examples/quick/customitems/flipable/doc/src/flipable.qdoc
@@ -41,6 +41,7 @@
/*!
\title UI Components: Flipable Example
\example customitems/flipable
+ \brief The Flipable Example shows an item that flips whenever clicked, rotating around the y-axis.
This example shows how to use the \l Flipable element.
diff --git a/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
index 7adb3beb94..e5a4b11742 100644
--- a/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
+++ b/examples/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
@@ -27,6 +27,7 @@
/*!
\title UI Components: Scroll Bar Example
\example customitems/scrollbar
+ \brief The Scroll Bar Example shows how to use scroll bars on a flickable element.
This example shows how to create scroll bars for a \l Flickable element
using the \l {Flickable::visibleArea.xPosition}{Flickable::visibleArea}
diff --git a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
index dbda19384b..862c527d9f 100644
--- a/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
+++ b/examples/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
@@ -28,6 +28,8 @@
/*!
\title TabWidget Example
\example customitems/tabwidget
+ \brief The TabWidget example shows how to create a tabwidget using property aliases
+ and QML Object default properties
This example shows how to create a tab widget. It also demonstrates how
\l {Property aliases}{property aliases} and
diff --git a/examples/quick/demos/photosurface/photosurface.qml b/examples/quick/demos/photosurface/photosurface.qml
index e5cfd827dc..22cef62157 100644
--- a/examples/quick/demos/photosurface/photosurface.qml
+++ b/examples/quick/demos/photosurface/photosurface.qml
@@ -37,7 +37,7 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-import QtQuick 2.5
+import QtQuick 2.6
import QtQuick.Dialogs 1.0
import QtQuick.Window 2.1
import Qt.labs.folderlistmodel 1.0
@@ -172,7 +172,7 @@ Window {
height: flick.height * (flick.height / flick.contentHeight) - (width - anchors.margins) * 2
y: flick.contentY * (flick.height / flick.contentHeight)
NumberAnimation on opacity { id: vfade; to: 0; duration: 500 }
- onYChanged: { opacity = 1.0; fadeTimer.restart() }
+ onYChanged: { opacity = 1.0; scrollFadeTimer.restart() }
}
Rectangle {
@@ -188,10 +188,10 @@ Window {
width: flick.width * (flick.width / flick.contentWidth) - (height - anchors.margins) * 2
x: flick.contentX * (flick.width / flick.contentWidth)
NumberAnimation on opacity { id: hfade; to: 0; duration: 500 }
- onXChanged: { opacity = 1.0; fadeTimer.restart() }
+ onXChanged: { opacity = 1.0; scrollFadeTimer.restart() }
}
- Timer { id: fadeTimer; interval: 1000; onTriggered: { hfade.start(); vfade.start() } }
+ Timer { id: scrollFadeTimer; interval: 1000; onTriggered: { hfade.start(); vfade.start() } }
Image {
anchors.top: parent.top
@@ -202,6 +202,42 @@ Window {
anchors.fill: parent
anchors.margins: -10
onClicked: fileDialog.open()
+ hoverEnabled: true
+ onPositionChanged: {
+ tooltip.visible = false
+ hoverTimer.start()
+ }
+ onExited: {
+ tooltip.visible = false
+ hoverTimer.stop()
+ }
+ Timer {
+ id: hoverTimer
+ interval: 1000
+ onTriggered: {
+ tooltip.x = parent.mouseX
+ tooltip.y = parent.mouseY
+ tooltip.visible = true
+ }
+ }
+ Rectangle {
+ id: tooltip
+ border.color: "black"
+ color: "beige"
+ width: tooltipText.implicitWidth + 8
+ height: tooltipText.implicitHeight + 8
+ visible: false
+ Text {
+ id: tooltipText
+ anchors.centerIn: parent
+ text: "Open an image directory (" + openShortcut.sequenceString + ")"
+ }
+ }
+ }
+ Shortcut {
+ id: openShortcut
+ sequence: StandardKey.Open
+ onActivated: fileDialog.open()
}
}
@@ -217,5 +253,7 @@ Window {
"With a mouse: drag normally, use the vertical wheel to zoom, horizontal wheel to rotate, or hold Ctrl while using the vertical wheel to rotate"
}
+ Shortcut { sequence: StandardKey.Quit; onActivated: Qt.quit() }
+
Component.onCompleted: fileDialog.open()
}
diff --git a/examples/quick/embeddedinwidgets/main.cpp b/examples/quick/embeddedinwidgets/main.cpp
index aa6da01bd9..ef404f9fb6 100644
--- a/examples/quick/embeddedinwidgets/main.cpp
+++ b/examples/quick/embeddedinwidgets/main.cpp
@@ -63,10 +63,10 @@ MainWindow::MainWindow()
QVBoxLayout *layout = new QVBoxLayout(centralWidget);
m_quickView->setResizeMode(QQuickView::SizeRootObjectToView);
- connect(m_quickView, SIGNAL(statusChanged(QQuickView::Status)),
- this, SLOT(quickViewStatusChanged(QQuickView::Status)));
- connect(m_quickView, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)),
- this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString)));
+ connect(m_quickView, &QQuickView::statusChanged,
+ this, &MainWindow::quickViewStatusChanged);
+ connect(m_quickView, &QQuickWindow::sceneGraphError,
+ this, &MainWindow::sceneGraphError);
m_quickView->setSource(QUrl(QStringLiteral("qrc:///embeddedinwidgets/main.qml")));
QWidget *container = QWidget::createWindowContainer(m_quickView);
@@ -79,8 +79,7 @@ MainWindow::MainWindow()
setCentralWidget(centralWidget);
QMenu *fileMenu = menuBar()->addMenu(tr("File"));
- QAction *quitAction = fileMenu->addAction(tr("Quit"));
- connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+ fileMenu->addAction(tr("Quit"), qApp, &QCoreApplication::quit);
}
void MainWindow::quickViewStatusChanged(QQuickView::Status status)
diff --git a/examples/quick/imageprovider/doc/src/imageprovider.qdoc b/examples/quick/imageprovider/doc/src/imageprovider.qdoc
index ba4817ca0f..f848e03fcd 100644
--- a/examples/quick/imageprovider/doc/src/imageprovider.qdoc
+++ b/examples/quick/imageprovider/doc/src/imageprovider.qdoc
@@ -27,6 +27,7 @@
/*!
\title C++ Extensions: Image Provider Example
+ \brief How to load images in QML with QQuickImageProvider.
\example imageprovider
This examples shows how to use QQuickImageProvider to serve images
diff --git a/examples/quick/imageresponseprovider/ImageResponseProviderCore/qmldir b/examples/quick/imageresponseprovider/ImageResponseProviderCore/qmldir
new file mode 100644
index 0000000000..3a5821bdf2
--- /dev/null
+++ b/examples/quick/imageresponseprovider/ImageResponseProviderCore/qmldir
@@ -0,0 +1,2 @@
+plugin qmlimageresponseproviderplugin
+
diff --git a/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc b/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc
new file mode 100644
index 0000000000..a883ee1f2e
--- /dev/null
+++ b/examples/quick/imageresponseprovider/doc/src/imageresponseprovider.qdoc
@@ -0,0 +1,37 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies)
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \title C++ Extensions: Image Response Provider Example
+ \example imageresponseprovider
+ \brief How to load images asynchronously in QML.
+
+
+ This examples shows how to use QQuickImageProvider to serve images
+ asynchronously to QML image elements.
+*/
+
diff --git a/examples/quick/imageresponseprovider/imageresponseprovider-example.qml b/examples/quick/imageresponseprovider/imageresponseprovider-example.qml
new file mode 100644
index 0000000000..20c1e69434
--- /dev/null
+++ b/examples/quick/imageresponseprovider/imageresponseprovider-example.qml
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies)
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import "ImageResponseProviderCore"
+
+Column {
+ Image { source: "image://async/slow" }
+ Image { source: "image://async/fast" }
+}
+
diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.cpp b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
new file mode 100644
index 0000000000..bdec29114b
--- /dev/null
+++ b/examples/quick/imageresponseprovider/imageresponseprovider.cpp
@@ -0,0 +1,123 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 Canonical Limited and/or its subsidiary(-ies)
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the demonstration applications of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+** * Redistributions of source code must retain the above copyright
+** notice, this list of conditions and the following disclaimer.
+** * Redistributions in binary form must reproduce the above copyright
+** notice, this list of conditions and the following disclaimer in
+** the documentation and/or other materials provided with the
+** distribution.
+** * Neither the name of The Qt Company Ltd nor the names of its
+** contributors may be used to endorse or promote products derived
+** from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <qqmlextensionplugin.h>
+
+#include <qqmlengine.h>
+#include <qquickimageprovider.h>
+#include <QDebug>
+#include <QImage>
+#include <QThreadPool>
+
+class AsyncImageResponse : public QQuickImageResponse, public QRunnable
+{
+ public:
+ AsyncImageResponse(const QString &id, const QSize &requestedSize)
+ : m_id(id), m_requestedSize(requestedSize), m_texture(0)
+ {
+ setAutoDelete(false);
+ }
+
+ QQuickTextureFactory *textureFactory() const
+ {
+ return m_texture;
+ }
+
+ void run()
+ {
+ QImage image(50, 50, QImage::Format_RGB32);
+ if (m_id == "slow") {
+ qDebug() << "Slow, red, sleeping for 5 seconds";
+ QThread::sleep(5);
+ image.fill(Qt::red);
+ } else {
+ qDebug() << "Fast, blue, sleeping for 1 second";
+ QThread::sleep(1);
+ image.fill(Qt::blue);
+ }
+ if (m_requestedSize.isValid())
+ image = image.scaled(m_requestedSize);
+ m_texture = QQuickTextureFactory::textureFactoryForImage(image);
+ emit finished();
+ }
+
+ QString m_id;
+ QSize m_requestedSize;
+ QQuickTextureFactory *m_texture;
+};
+
+class AsyncImageProvider : public QQuickAsyncImageProvider
+{
+public:
+ QQuickImageResponse *requestImageResponse(const QString &id, const QSize &requestedSize)
+ {
+ AsyncImageResponse *response = new AsyncImageResponse(id, requestedSize);
+ pool.start(response);
+ return response;
+ }
+
+private:
+ QThreadPool pool;
+};
+
+
+class ImageProviderExtensionPlugin : public QQmlExtensionPlugin
+{
+ Q_OBJECT
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")
+public:
+ void registerTypes(const char *uri)
+ {
+ Q_UNUSED(uri);
+ }
+
+ void initializeEngine(QQmlEngine *engine, const char *uri)
+ {
+ Q_UNUSED(uri);
+ engine->addImageProvider("async", new AsyncImageProvider);
+ }
+
+};
+
+
+#define QQmlExtensionInterface_iid "org.qt-project.Qt.QQmlExtensionInterface"
+
+#include "imageresponseprovider.moc"
diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.pro b/examples/quick/imageresponseprovider/imageresponseprovider.pro
new file mode 100644
index 0000000000..856ddde863
--- /dev/null
+++ b/examples/quick/imageresponseprovider/imageresponseprovider.pro
@@ -0,0 +1,15 @@
+TEMPLATE = lib
+CONFIG += plugin
+QT += qml quick
+
+DESTDIR = ImageResponseProviderCore
+TARGET = qmlimageresponseproviderplugin
+
+SOURCES += imageresponseprovider.cpp
+
+EXAMPLE_FILES = imageresponseprovider-example.qml
+
+target.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore
+qml.files = ImageResponseProviderCore/qmldir
+qml.path = $$[QT_INSTALL_EXAMPLES]/quick/imageresponseprovider/ImageResponseProviderCore
+INSTALLS = target qml
diff --git a/examples/quick/imageresponseprovider/imageresponseprovider.qmlproject b/examples/quick/imageresponseprovider/imageresponseprovider.qmlproject
new file mode 100644
index 0000000000..2bb4016996
--- /dev/null
+++ b/examples/quick/imageresponseprovider/imageresponseprovider.qmlproject
@@ -0,0 +1,14 @@
+import QmlProject 1.0
+
+Project {
+ /* Include .qml, .js, and image files from current directory and subdirectories */
+ QmlFiles {
+ directory: "."
+ }
+ JavaScriptFiles {
+ directory: "."
+ }
+ ImageFiles {
+ directory: "."
+ }
+}
diff --git a/examples/quick/mousearea/mousearea-wheel-example.qml b/examples/quick/mousearea/mousearea-wheel-example.qml
index ca6518ec4b..861639811c 100644
--- a/examples/quick/mousearea/mousearea-wheel-example.qml
+++ b/examples/quick/mousearea/mousearea-wheel-example.qml
@@ -64,10 +64,9 @@ Rectangle {
anchors.fill: parent
onWheel: {
if (wheel.modifiers & Qt.ControlModifier) {
- if (wheel.angleDelta.y > 0)
- parent.scaleFactor += 0.2;
- else if (parent.scaleFactor - 0.2 >= 0.2)
- parent.scaleFactor -= 0.2;
+ parent.scaleFactor += 0.2 * wheel.angleDelta.y / 120;
+ if (parent.scaleFactor < 0)
+ parent.scaleFactor = 0;
}
}
}
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro
index a412c53a65..c5ef46173c 100644
--- a/examples/quick/quick.pro
+++ b/examples/quick/quick.pro
@@ -20,6 +20,7 @@ SUBDIRS = quick-accessibility \
tutorials \
customitems \
imageprovider \
+ imageresponseprovider \
window \
particles \
demos \
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/main.cpp b/examples/quick/quickwidgets/qquickviewcomparison/main.cpp
index bbe97a947f..7e45e42527 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/main.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/main.cpp
@@ -48,7 +48,13 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
- MainWindow widgetWindow;
+ bool transparency = QCoreApplication::arguments().contains(QStringLiteral("--transparent"));
+ MainWindow widgetWindow(transparency);
+ if (transparency) {
+ widgetWindow.setAttribute(Qt::WA_TranslucentBackground);
+ widgetWindow.setAttribute(Qt::WA_NoSystemBackground, false);
+ }
+
widgetWindow.resize(1024, 768);
widgetWindow.show();
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
index dce89d6b18..078d8e7e03 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp
@@ -47,10 +47,10 @@
#include <QLabel>
#include <QQuickItem>
-MainWindow::MainWindow()
+MainWindow::MainWindow(bool transparency)
: m_currentView(0),
m_currentRootObject(0),
- m_transparent(false)
+ m_transparent(transparency)
{
QVBoxLayout *layout = new QVBoxLayout;
@@ -103,13 +103,6 @@ MainWindow::MainWindow()
connect(m_checkboxOverlayVisible, &QCheckBox::toggled, m_overlayLabel, &QWidget::setVisible);
layout->addWidget(m_checkboxOverlayVisible);
- m_checkboxTransparent = new QCheckBox(tr("Transparent background in QQuickWidget"));
- connect(m_radioWidget, &QCheckBox::toggled, m_checkboxTransparent, &QWidget::setEnabled);
-#ifdef Q_OS_LINUX
- connect(m_checkboxTransparent, &QCheckBox::toggled, this, &MainWindow::onTransparentChanged);
- layout->addWidget(m_checkboxTransparent);
-#endif
-
setLayout(layout);
updateView();
@@ -170,10 +163,8 @@ void MainWindow::updateView()
switchTo(QWidget::createWindowContainer(quickView));
} else if (m_state == UseWidget) {
QQuickWidget *quickWidget = new QQuickWidget;
- if (m_transparent) {
+ if (m_transparent)
quickWidget->setClearColor(Qt::transparent);
- quickWidget->setAttribute(Qt::WA_TranslucentBackground);
- }
quickWidget->setFormat(m_format);
quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
connect(quickWidget, &QQuickWidget::statusChanged, this, &MainWindow::onStatusChangedWidget);
@@ -186,7 +177,8 @@ void MainWindow::updateView()
if (m_currentRootObject) {
m_currentRootObject->setProperty("currentText", text);
m_currentRootObject->setProperty("multisample", m_checkboxMultiSample->isChecked());
- m_currentRootObject->setProperty("translucency", m_transparent);
+ if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha")))
+ m_currentRootObject->setProperty("translucency", m_transparent);
}
m_overlayLabel->raise();
@@ -242,9 +234,3 @@ void MainWindow::onSceneGraphError(QQuickWindow::SceneGraphError error, const QS
{
m_labelStatus->setText(tr("Scenegraph error %1: %2").arg(error).arg(message));
}
-
-void MainWindow::onTransparentChanged(bool enabled)
-{
- m_transparent = enabled;
- updateView();
-}
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
index c58523f675..5b86c93f38 100644
--- a/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
+++ b/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.h
@@ -53,7 +53,7 @@ QT_FORWARD_DECLARE_CLASS(QLayout)
class MainWindow : public QWidget
{
public:
- MainWindow();
+ MainWindow(bool transparency);
protected:
void resizeEvent(QResizeEvent*);
@@ -63,7 +63,6 @@ private slots:
void onStatusChangedView(QQuickView::Status status);
void onStatusChangedWidget(QQuickWidget::Status status);
void onSceneGraphError(QQuickWindow::SceneGraphError error, const QString &message);
- void onTransparentChanged(bool enabled);
private:
void switchTo(QWidget *view);
@@ -86,8 +85,6 @@ private:
QSurfaceFormat m_format;
- QCheckBox *m_checkboxTransparent;
-
bool m_transparent;
};
diff --git a/examples/quick/quickwidgets/quickwidget/main.cpp b/examples/quick/quickwidgets/quickwidget/main.cpp
index 1e5cf89319..65258d958e 100644
--- a/examples/quick/quickwidgets/quickwidget/main.cpp
+++ b/examples/quick/quickwidgets/quickwidget/main.cpp
@@ -78,10 +78,10 @@ MainWindow::MainWindow()
QUrl source("qrc:quickwidget/rotatingsquare.qml");
- connect(m_quickWidget, SIGNAL(statusChanged(QQuickWidget::Status)),
- this, SLOT(quickWidgetStatusChanged(QQuickWidget::Status)));
- connect(m_quickWidget, SIGNAL(sceneGraphError(QQuickWindow::SceneGraphError,QString)),
- this, SLOT(sceneGraphError(QQuickWindow::SceneGraphError,QString)));
+ connect(m_quickWidget, &QQuickWidget::statusChanged,
+ this, &MainWindow::quickWidgetStatusChanged);
+ connect(m_quickWidget, &QQuickWidget::sceneGraphError,
+ this, &MainWindow::sceneGraphError);
m_quickWidget->resize(300,300);
m_quickWidget->setResizeMode(QQuickWidget::SizeRootObjectToView );
m_quickWidget->setSource(source);
@@ -91,12 +91,9 @@ MainWindow::MainWindow()
setCentralWidget(centralWidget);
QMenu *fileMenu = menuBar()->addMenu(tr("&File"));
- QAction *grabAction = fileMenu->addAction(tr("Grab to image"));
- connect(grabAction, SIGNAL(triggered()), this, SLOT(grabToFile()));
- QAction *renderAction = fileMenu->addAction(tr("Render to pixmap"));
- connect(renderAction, SIGNAL(triggered()), this, SLOT(renderToFile()));
- QAction *quitAction = fileMenu->addAction(tr("Quit"));
- connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));
+ fileMenu->addAction(tr("Grab to imFage"), this, &MainWindow::grabToFile);
+ fileMenu->addAction(tr("Render to pixmap"), this, &MainWindow::renderToFile);
+ fileMenu->addAction(tr("Quit"), qApp, &QCoreApplication::quit);
}
void MainWindow::quickWidgetStatusChanged(QQuickWidget::Status status)
diff --git a/examples/quick/rendercontrol/window_multithreaded.cpp b/examples/quick/rendercontrol/window_multithreaded.cpp
index 8de5a7776d..4df3488ab3 100644
--- a/examples/quick/rendercontrol/window_multithreaded.cpp
+++ b/examples/quick/rendercontrol/window_multithreaded.cpp
@@ -353,7 +353,7 @@ void WindowMultiThreaded::polishSyncAndRender()
void WindowMultiThreaded::run()
{
- disconnect(m_qmlComponent, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(run()));
+ disconnect(m_qmlComponent, &QQmlComponent::statusChanged, this, &WindowMultiThreaded::run);
if (m_qmlComponent->isError()) {
QList<QQmlError> errorList = m_qmlComponent->errors();
diff --git a/examples/quick/rendercontrol/window_singlethreaded.cpp b/examples/quick/rendercontrol/window_singlethreaded.cpp
index 1e81f08f7e..e43093e241 100644
--- a/examples/quick/rendercontrol/window_singlethreaded.cpp
+++ b/examples/quick/rendercontrol/window_singlethreaded.cpp
@@ -206,7 +206,7 @@ void WindowSingleThreaded::requestUpdate()
void WindowSingleThreaded::run()
{
- disconnect(m_qmlComponent, SIGNAL(statusChanged(QQmlComponent::Status)), this, SLOT(run()));
+ disconnect(m_qmlComponent, &QQmlComponent::statusChanged, this, &WindowSingleThreaded::run);
if (m_qmlComponent->isError()) {
QList<QQmlError> errorList = m_qmlComponent->errors();
diff --git a/examples/quick/scenegraph/openglunderqml/squircle.cpp b/examples/quick/scenegraph/openglunderqml/squircle.cpp
index 8ef975c5b6..8bb9af1ed4 100644
--- a/examples/quick/scenegraph/openglunderqml/squircle.cpp
+++ b/examples/quick/scenegraph/openglunderqml/squircle.cpp
@@ -42,7 +42,7 @@ Squircle::Squircle()
: m_t(0)
, m_renderer(0)
{
- connect(this, SIGNAL(windowChanged(QQuickWindow*)), this, SLOT(handleWindowChanged(QQuickWindow*)));
+ connect(this, &QQuickItem::windowChanged, this, &Squircle::handleWindowChanged);
}
//! [7]
@@ -62,8 +62,8 @@ void Squircle::setT(qreal t)
void Squircle::handleWindowChanged(QQuickWindow *win)
{
if (win) {
- connect(win, SIGNAL(beforeSynchronizing()), this, SLOT(sync()), Qt::DirectConnection);
- connect(win, SIGNAL(sceneGraphInvalidated()), this, SLOT(cleanup()), Qt::DirectConnection);
+ connect(win, &QQuickWindow::beforeSynchronizing, this, &Squircle::sync, Qt::DirectConnection);
+ connect(win, &QQuickWindow::sceneGraphInvalidated, this, &Squircle::cleanup, Qt::DirectConnection);
//! [1]
// If we allow QML to do the clearing, they would clear what we paint
// and nothing would show.
@@ -93,10 +93,11 @@ void Squircle::sync()
{
if (!m_renderer) {
m_renderer = new SquircleRenderer();
- connect(window(), SIGNAL(beforeRendering()), m_renderer, SLOT(paint()), Qt::DirectConnection);
+ connect(window(), &QQuickWindow::beforeRendering, m_renderer, &SquircleRenderer::paint, Qt::DirectConnection);
}
m_renderer->setViewportSize(window()->size() * window()->devicePixelRatio());
m_renderer->setT(m_t);
+ m_renderer->setWindow(window());
}
//! [9]
@@ -156,5 +157,9 @@ void SquircleRenderer::paint()
m_program->disableAttributeArray(0);
m_program->release();
+
+ // Not strictly needed for this example, but generally useful for when
+ // mixing with raw OpenGL.
+ m_window->resetOpenGLState();
}
//! [5]
diff --git a/examples/quick/scenegraph/openglunderqml/squircle.h b/examples/quick/scenegraph/openglunderqml/squircle.h
index f797d7a7a5..28016def44 100644
--- a/examples/quick/scenegraph/openglunderqml/squircle.h
+++ b/examples/quick/scenegraph/openglunderqml/squircle.h
@@ -50,6 +50,7 @@ public:
void setT(qreal t) { m_t = t; }
void setViewportSize(const QSize &size) { m_viewportSize = size; }
+ void setWindow(QQuickWindow *window) { m_window = window; }
public slots:
void paint();
@@ -58,6 +59,7 @@ private:
QSize m_viewportSize;
qreal m_t;
QOpenGLShaderProgram *m_program;
+ QQuickWindow *m_window;
};
//! [1]
diff --git a/examples/quick/scenegraph/textureinthread/threadrenderer.cpp b/examples/quick/scenegraph/textureinthread/threadrenderer.cpp
index 272b903ef2..95fd377dcf 100644
--- a/examples/quick/scenegraph/textureinthread/threadrenderer.cpp
+++ b/examples/quick/scenegraph/textureinthread/threadrenderer.cpp
@@ -228,7 +228,7 @@ void ThreadRenderer::ready()
m_renderThread->moveToThread(m_renderThread);
- connect(window(), SIGNAL(sceneGraphInvalidated()), m_renderThread, SLOT(shutDown()), Qt::QueuedConnection);
+ connect(window(), &QQuickWindow::sceneGraphInvalidated, m_renderThread, &RenderThread::shutDown, Qt::QueuedConnection);
m_renderThread->start();
update();
@@ -274,10 +274,10 @@ QSGNode *ThreadRenderer::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeData *
*
* This FBO rendering pipeline is throttled by vsync on the scene graph rendering thread.
*/
- connect(m_renderThread, SIGNAL(textureReady(int,QSize)), node, SLOT(newTexture(int,QSize)), Qt::DirectConnection);
- connect(node, SIGNAL(pendingNewTexture()), window(), SLOT(update()), Qt::QueuedConnection);
- connect(window(), SIGNAL(beforeRendering()), node, SLOT(prepareNode()), Qt::DirectConnection);
- connect(node, SIGNAL(textureInUse()), m_renderThread, SLOT(renderNext()), Qt::QueuedConnection);
+ connect(m_renderThread, &RenderThread::textureReady, node, &TextureNode::newTexture, Qt::DirectConnection);
+ connect(node, &TextureNode::pendingNewTexture, window(), &QQuickWindow::update, Qt::QueuedConnection);
+ connect(window(), &QQuickWindow::beforeRendering, node, &TextureNode::prepareNode, Qt::DirectConnection);
+ connect(node, &TextureNode::textureInUse, m_renderThread, &RenderThread::renderNext, Qt::QueuedConnection);
// Get the production of FBO textures started..
QMetaObject::invokeMethod(m_renderThread, "renderNext", Qt::QueuedConnection);
diff --git a/examples/quick/scenegraph/threadedanimation/spinner.cpp b/examples/quick/scenegraph/threadedanimation/spinner.cpp
index 04b91e5449..6fefc33f4d 100644
--- a/examples/quick/scenegraph/threadedanimation/spinner.cpp
+++ b/examples/quick/scenegraph/threadedanimation/spinner.cpp
@@ -49,8 +49,8 @@ public:
, m_spinning(false)
, m_window(window)
{
- connect(window, SIGNAL(beforeRendering()), this, SLOT(maybeRotate()));
- connect(window, SIGNAL(frameSwapped()), this, SLOT(maybeUpdate()));
+ connect(window, &QQuickWindow::beforeRendering, this, &SpinnerNode::maybeRotate);
+ connect(window, &QQuickWindow::frameSwapped, this, &SpinnerNode::maybeUpdate);
QImage image(":/scenegraph/threadedanimation/spinner.png");
m_texture = window->createTextureFromImage(image);
diff --git a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
index 384d118809..0dd035ffea 100644
--- a/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
+++ b/examples/quick/scenegraph/twotextureproviders/xorblender.cpp
@@ -151,8 +151,8 @@ public:
// If this node is used as in a shader effect source, we need to propegate
// changes that will occur in this node outwards.
- connect(m_provider1, SIGNAL(textureChanged()), this, SLOT(textureChange()), Qt::DirectConnection);
- connect(m_provider2, SIGNAL(textureChanged()), this, SLOT(textureChange()), Qt::DirectConnection);
+ connect(m_provider1.data(), &QSGTextureProvider::textureChanged, this, &XorNode::textureChange, Qt::DirectConnection);
+ connect(m_provider2.data(), &QSGTextureProvider::textureChanged, this, &XorNode::textureChange, Qt::DirectConnection);
}
void preprocess() {
diff --git a/examples/quick/shared/shared.h b/examples/quick/shared/shared.h
index 4472b9bfbb..d8fb80b97e 100644
--- a/examples/quick/shared/shared.h
+++ b/examples/quick/shared/shared.h
@@ -55,9 +55,11 @@
f.setVersion(4, 4);\
view.setFormat(f);\
}\
- view.connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));\
+ view.connect(view.engine(), &QQmlEngine::quit, &app, &QCoreApplication::quit);\
new QQmlFileSelector(view.engine(), &view);\
view.setSource(QUrl("qrc:///" #NAME ".qml")); \
+ if (view.status() == QQuickView::Error)\
+ return -1;\
view.setResizeMode(QQuickView::SizeRootObjectToView);\
if (QGuiApplication::platformName() == QLatin1String("qnx") || \
QGuiApplication::platformName() == QLatin1String("eglfs")) {\
diff --git a/examples/quick/text/doc/src/text.qdoc b/examples/quick/text/doc/src/text.qdoc
index 7ac33da563..ea6a786e8a 100644
--- a/examples/quick/text/doc/src/text.qdoc
+++ b/examples/quick/text/doc/src/text.qdoc
@@ -60,7 +60,7 @@
\section1 Available Fonts
- \e{Available Fonts} shows how to use the QML \l{QtQml::Qt}{Qt} global object
+ \e{Available Fonts} shows how to use the \l [QML] {Qt} global object
and a list view to display all the fonts available on the system.
The \l ListView type uses the list of fonts available as its model:
\snippet text/fonts/availableFonts.qml model
diff --git a/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc
index 68f0db9629..7e0a46139a 100644
--- a/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc
+++ b/examples/quick/threading/threadedlistmodel/doc/src/threadedlistmodel.qdoc
@@ -28,6 +28,8 @@
/*!
\title Threaded ListModel Example
\example threading/threadedlistmodel
+ \brief The Threaded ListModel example shows how to use a ListModel from multiple
+ threads using WorkerScript.
This example shows how to use a ListModel from multiple threads using
WorkerScript.
diff --git a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
index 760e14adca..e66d5c5654 100644
--- a/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
+++ b/examples/quick/touchinteraction/doc/src/touchinteraction.qdoc
@@ -36,7 +36,7 @@
\include examples-run.qdocinc
- \section1 Multipoint Flames
+ \section1 Multipoint Flames Example
\e{Multipoint Flames} demonstrates distinguishing different fingers in a
\l MultiPointTouchArea, by assigning a different colored flame to each touch
@@ -49,7 +49,7 @@
whether it is currently pressed, as follows:
\snippet touchinteraction/multipointtouch/multiflame.qml 1
- \section1 Bear-Whack
+ \section1 Bear-Whack Example
\e{Bear-Whack} demonstrates using \l MultiPointTouchArea to add multiple
finger support to a simple game. The interaction with the game
@@ -58,19 +58,19 @@
embedded into it:
\snippet touchinteraction/multipointtouch/content/AugmentedTouchPoint.qml 0
- \section1 Flick Resize
+ \section1 Flick Resize Example
\e{Flick Resize} uses a \l PinchArea to implement a \e{pinch-to-resize}
behavior. This is easily achieved by listening to the PinchArea signals and
responding to user input.
\snippet touchinteraction/pincharea/flickresize.qml 0
- \section1 Flickable
+ \section1 Flickable Example
\e Flickable is a simple example demonstrating the \l Flickable type.
\snippet touchinteraction/flickable/basic-flickable.qml 0
- \section1 Corkboards
+ \section1 Corkboards Example
\e Corkboards shows another use for \l Flickable, with QML types within the
flickable object that respond to mouse and keyboard interaction. This
diff --git a/examples/quick/tutorials/samegame/samegame4/content/samegame.js b/examples/quick/tutorials/samegame/samegame4/content/samegame.js
index 80b175d450..80b175d450 100755..100644
--- a/examples/quick/tutorials/samegame/samegame4/content/samegame.js
+++ b/examples/quick/tutorials/samegame/samegame4/content/samegame.js
diff --git a/qtdeclarative.pro b/qtdeclarative.pro
index 9ecfad6f75..0e746c3c65 100644
--- a/qtdeclarative.pro
+++ b/qtdeclarative.pro
@@ -1,3 +1,10 @@
CONFIG += tests_need_tools examples_need_tools
load(qt_parts)
+!python_available {
+ py_out = $$system('python -c "print(1)"')
+ !equals(py_out, 1): error("Building QtQml requires Python version 2.")
+ tmp = python_available
+ CONFIG += $$tmp
+ cache(CONFIG, add, tmp)
+}
diff --git a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
index 03f8e2d71a..734e779c70 100644
--- a/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
+++ b/src/3rdparty/masm/assembler/MacroAssemblerMIPS.h
@@ -359,6 +359,12 @@ public:
}
}
+ void mul32(Address src, RegisterID dest)
+ {
+ load32(src, dataTempRegister);
+ mul32(dataTempRegister, dest);
+ }
+
void neg32(RegisterID srcDest)
{
m_assembler.subu(srcDest, MIPSRegisters::zero, srcDest);
@@ -420,6 +426,12 @@ public:
store32(dataTempRegister, dest.m_ptr);
}
+ void or32(Address src, RegisterID dest)
+ {
+ load32(src, dataTempRegister);
+ or32(dataTempRegister, dest);
+ }
+
void rshift32(RegisterID shiftAmount, RegisterID dest)
{
m_assembler.srav(dest, dest, shiftAmount);
@@ -615,6 +627,12 @@ public:
m_assembler.xorInsn(dest, src, immTempRegister);
}
+ void xor32(Address src, RegisterID dest)
+ {
+ load32(src, dataTempRegister);
+ xor32(dataTempRegister, dest);
+ }
+
void sqrtDouble(FPRegisterID src, FPRegisterID dst)
{
m_assembler.sqrtd(dst, src);
@@ -2519,6 +2537,18 @@ public:
m_assembler.cvtdw(dest, fpTempRegister);
}
+ void convertUInt32ToDouble(RegisterID src, FPRegisterID dest, RegisterID scratch)
+ {
+ m_assembler.mtc1(src, fpTempRegister);
+ m_assembler.bltz(src, 2);
+ m_assembler.cvtdw(dest, fpTempRegister);
+ m_assembler.beq(MIPSRegisters::zero, MIPSRegisters::zero, 4);
+ m_assembler.lui(scratch, 0x4f80);
+ m_assembler.mtc1(scratch, fpTempRegister);
+ m_assembler.cvtds(fpTempRegister, fpTempRegister);
+ m_assembler.addd(dest, dest, fpTempRegister);
+ }
+
void convertFloatToDouble(FPRegisterID src, FPRegisterID dst)
{
m_assembler.cvtds(dst, src);
@@ -2761,7 +2791,7 @@ public:
return CodeLocationLabel();
}
- static void revertJumpReplacementToPatchableBranchPtrWithPatch(CodeLocationLabel instructionStart, Address, void* initialValue)
+ static void revertJumpReplacementToPatchableBranchPtrWithPatch(CodeLocationLabel, Address, void*)
{
UNREACHABLE_FOR_PLATFORM();
}
diff --git a/src/3rdparty/masm/disassembler/Mips32Disassembler.cpp b/src/3rdparty/masm/disassembler/Mips32Disassembler.cpp
new file mode 100644
index 0000000000..af0a73b2cb
--- /dev/null
+++ b/src/3rdparty/masm/disassembler/Mips32Disassembler.cpp
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2015 Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "Disassembler.h"
+
+#if USE(MIPS32_DISASSEMBLER)
+
+#include "mips32/Mips32Opcode.h"
+#include "MacroAssemblerCodeRef.h"
+
+namespace JSC {
+
+bool tryToDisassemble(const MacroAssemblerCodePtr& codePtr, size_t size, const char* prefix, PrintStream& out)
+{
+ Mips32Opcode mipsOpcode;
+
+ uint32_t* currentPC = reinterpret_cast<uint32_t*>(reinterpret_cast<uintptr_t>(codePtr.executableAddress()) & ~3);
+ uint32_t* endPC = currentPC + (size / sizeof(uint32_t));
+
+ while (currentPC < endPC) {
+ char pcString[12];
+ snprintf(pcString, sizeof(pcString), "0x%x", reinterpret_cast<unsigned>(currentPC));
+ out.printf("%s%10s: %s\n", prefix, pcString, mipsOpcode.disassemble(currentPC));
+ currentPC++;
+ }
+
+ return true;
+}
+
+} // namespace JSC
+
+#endif // USE(MIPS32_DISASSEMBLER)
+
diff --git a/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.cpp b/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.cpp
new file mode 100644
index 0000000000..164217eb55
--- /dev/null
+++ b/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.cpp
@@ -0,0 +1,620 @@
+/*
+ * Copyright (C) 2015 Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+
+#if USE(MIPS32_DISASSEMBLER)
+
+#include "Mips32Opcode.h"
+
+#include <stdio.h>
+
+#define OPCODE_FMT "%s\t"
+#define COP1_OPCODE_FMT "%s.%s\t"
+#define FORMAT_INSTR(_format, ...) \
+ snprintf(m_formatBuffer, bufferSize - 1, _format, ##__VA_ARGS__)
+
+const char *Mips32Opcode::registerName(uint8_t r)
+{
+ static const char *gpRegisters[] = {
+ "zero", "AT", "v0", "v1", "a0", "a1", "a2", "a3",
+ "t0", "t1", "t2", "t3", "t4", "t5", "t6", "t7",
+ "s0", "s1", "s2", "s3", "s4", "s5", "s6", "s7",
+ "t8", "t9", "kt0", "kt1", "gp", "sp", "s8", "ra"
+ };
+
+ return (r < sizeof(gpRegisters)) ? gpRegisters[r] : "invalid";
+}
+
+const char *Mips32Opcode::fpRegisterName(uint8_t r)
+{
+ static const char *fpRegisters[] = {
+ "$f0", "$f1", "$f2", "$f3", "$f4", "$f5", "$f6", "$f7",
+ "$f8", "$f9", "$f10", "$f11", "$f12", "$f13", "$f14", "$f15",
+ "$f16", "$f17", "$f18", "$f19", "$f20", "$f21", "$f22", "$f23",
+ "$f24", "$f25", "$f26", "$f27", "$f28", "$f29", "$f30", "$f31"
+ };
+
+ return (r < sizeof(fpRegisters)) ? fpRegisters[r] : "invalid";
+}
+
+void Mips32Opcode::formatSpecialEncodingOpcode(uint8_t op1, uint8_t op2, uint8_t dest, uint8_t shift, uint8_t function)
+{
+ const char *opcode;
+ OpcodePrintFormat format = Unknown;
+ switch (function) {
+ case 0x00:
+ format = RdRtSa;
+ opcode = "sll";
+ break;
+ case 0x02:
+ format = RdRtSa;
+ opcode = "srl";
+ break;
+ case 0x03:
+ format = RdRtSa;
+ opcode = "sra";
+ break;
+ case 0x04:
+ format = RdRtRs;
+ opcode = "sllv";
+ break;
+ case 0x06:
+ format = RdRtRs;
+ opcode = "srlv";
+ break;
+ case 0x07:
+ format = RdRtRs;
+ opcode = "srav";
+ break;
+ case 0x08:
+ format = Rs;
+ opcode = "jr";
+ break;
+ case 0x09:
+ format = (dest != 0x1f) ? RdRs : Rs;
+ opcode = "jalr";
+ break;
+ case 0x10:
+ format = Rd;
+ opcode = "mfhi";
+ break;
+ case 0x11:
+ format = Rs;
+ opcode = "mthi";
+ break;
+ case 0x12:
+ format = Rd;
+ opcode = "mflo";
+ break;
+ case 0x13:
+ format = Rs;
+ opcode = "mtlo";
+ break;
+ case 0x18:
+ format = RsRt;
+ opcode = "mult";
+ break;
+ case 0x19:
+ format = RsRt;
+ opcode = "multu";
+ break;
+ case 0x1a:
+ format = RsRt;
+ opcode = "div";
+ break;
+ case 0x1b:
+ format = RsRt;
+ opcode = "divu";
+ break;
+ case 0x20:
+ format = RdRsRt;
+ opcode = "add";
+ break;
+ case 0x21:
+ if (op2) {
+ format = RdRsRt;
+ opcode = "addu";
+ } else {
+ format = RdRs;
+ opcode = "move";
+ }
+ break;
+ case 0x22:
+ format = RdRsRt;
+ opcode = "sub";
+ break;
+ case 0x23:
+ format = RdRsRt;
+ opcode = "subu";
+ break;
+ case 0x24:
+ format = RdRsRt;
+ opcode = "and";
+ break;
+ case 0x25:
+ format = RdRsRt;
+ opcode = "or";
+ break;
+ case 0x26:
+ format = RdRsRt;
+ opcode = "xor";
+ break;
+ case 0x27:
+ format = RdRsRt;
+ opcode = "nor";
+ break;
+ case 0x2a:
+ format = RdRsRt;
+ opcode = "slt";
+ break;
+ case 0x2b:
+ format = RdRsRt;
+ opcode = "sltu";
+ break;
+ }
+
+ switch (format) {
+ case Rs:
+ FORMAT_INSTR(OPCODE_FMT "%s", opcode, registerName(op1));
+ break;
+ case Rd:
+ FORMAT_INSTR(OPCODE_FMT "%s", opcode, registerName(dest));
+ break;
+ case RdRs:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s", opcode, registerName(dest), registerName(op1));
+ break;
+ case RsRt:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s", opcode, registerName(op1), registerName(op2));
+ break;
+ case RdRtRs:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, %s", opcode, registerName(dest), registerName(op2), registerName(op1));
+ break;
+ case RdRsRt:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, %s", opcode, registerName(dest), registerName(op1), registerName(op2));
+ break;
+ case RdRtSa:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, %d", opcode, registerName(dest), registerName(op2), shift);
+ break;
+ default:
+ FORMAT_INSTR("unknown special encoding opcode 0x%x", function);
+ break;
+ }
+}
+
+void Mips32Opcode::formatSpecial2EncodingOpcode(uint8_t op1, uint8_t op2, uint8_t dest, uint8_t function)
+{
+ if (function == 0x02) {
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, %s", "mul", registerName(dest), registerName(op1), registerName(op2));
+ return;
+ }
+
+ FORMAT_INSTR("unknown special2 encoding opcode 0x%x", function);
+}
+
+void Mips32Opcode::formatJumpEncodingOpcode(uint32_t iOp, uint32_t index, uint32_t* opcodePtr)
+{
+ if ((iOp != 0x02) && (iOp != 0x03)) {
+ FORMAT_INSTR("unknown jump encoding opcode 0x%x", iOp);
+ return;
+ }
+
+ FORMAT_INSTR(OPCODE_FMT "0x%x", (iOp == 0x02) ? "j" : "jal",
+ (reinterpret_cast<unsigned>(opcodePtr+1) & 0xf0000000) | (index << 2));
+}
+
+void Mips32Opcode::formatREGIMMEncodingOpcode(uint8_t rs, uint8_t rt, int16_t imm, uint32_t* opcodePtr)
+{
+ const char *opcodes[] = { "bltz", "bgez", "bltzl", "bgezl" };
+ if (rt < sizeof(opcodes))
+ FORMAT_INSTR(OPCODE_FMT "%s, 0x%x", opcodes[rt], registerName(rs), reinterpret_cast<unsigned>(opcodePtr+1) + (imm << 2));
+ else
+ FORMAT_INSTR("unknown REGIMM encoding opcode 0x%x", rt);
+}
+
+void Mips32Opcode::formatImmediateEncodingOpcode(uint32_t iOp, uint8_t rs, uint8_t rt, int16_t imm, uint32_t* opcodePtr)
+{
+ const char *opcode;
+ OpcodePrintFormat format = Unknown;
+ switch (iOp) {
+ case 0x04:
+ if (!rs && !rt) {
+ format = Addr;
+ opcode = "b";
+ } else {
+ format = RsRtAddr;
+ opcode = "beq";
+ }
+ break;
+ case 0x05:
+ format = RsRtAddr;
+ opcode = "bne";
+ break;
+ case 0x06:
+ format = RsRtAddr;
+ opcode = "blez";
+ break;
+ case 0x07:
+ format = RsRtAddr;
+ opcode = "bgtz";
+ break;
+ case 0x08:
+ format = RtRsImm;
+ opcode = "addi";
+ break;
+ case 0x09:
+ if (rs) {
+ format = RtRsImm;
+ opcode = "addiu";
+ } else {
+ format = RtUImm;
+ opcode = "li";
+ }
+ break;
+ case 0x0a:
+ format = RtRsImm;
+ opcode = "slti";
+ break;
+ case 0x0b:
+ format = RtRsImm;
+ opcode = "sltiu";
+ break;
+ case 0x0c:
+ format = RtRsImm;
+ opcode = "andi";
+ break;
+ case 0x0d:
+ format = RtRsImm;
+ opcode = "ori";
+ break;
+ case 0x0e:
+ format = RtRsImm;
+ opcode = "xori";
+ break;
+ case 0x0f:
+ format = RtUImm;
+ opcode = "lui";
+ break;
+ case 0x20:
+ format = RtOffsetBase;
+ opcode = "lb";
+ break;
+ case 0x21:
+ format = RtOffsetBase;
+ opcode = "lh";
+ break;
+ case 0x22:
+ format = RtOffsetBase;
+ opcode = "lwl";
+ break;
+ case 0x23:
+ format = RtOffsetBase;
+ opcode = "lw";
+ break;
+ case 0x24:
+ format = RtOffsetBase;
+ opcode = "lbu";
+ break;
+ case 0x25:
+ format = RtOffsetBase;
+ opcode = "lhu";
+ break;
+ case 0x26:
+ format = RtOffsetBase;
+ opcode = "lwr";
+ break;
+ case 0x28:
+ format = RtOffsetBase;
+ opcode = "sb";
+ break;
+ case 0x29:
+ format = RtOffsetBase;
+ opcode = "sh";
+ break;
+ case 0x2a:
+ format = RtOffsetBase;
+ opcode = "swl";
+ break;
+ case 0x2b:
+ format = RtOffsetBase;
+ opcode = "sw";
+ break;
+ case 0x2e:
+ format = RtOffsetBase;
+ opcode = "swr";
+ break;
+ case 0x35:
+ format = FtOffsetBase;
+ opcode = "ldc1";
+ break;
+ case 0x3d:
+ format = FtOffsetBase;
+ opcode = "sdc1";
+ break;
+ }
+
+ switch (format) {
+ case Addr:
+ FORMAT_INSTR(OPCODE_FMT "0x%x", opcode, reinterpret_cast<unsigned>(opcodePtr+1) + (imm << 2));
+ break;
+ case RtUImm:
+ FORMAT_INSTR(OPCODE_FMT "%s, 0x%hx", opcode, registerName(rt), imm);
+ break;
+ case RtRsImm:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, %d", opcode, registerName(rt), registerName(rs), imm);
+ break;
+ case RsRtAddr:
+ FORMAT_INSTR(OPCODE_FMT "%s, %s, 0x%x", opcode, registerName(rs), registerName(rt),
+ reinterpret_cast<unsigned>(opcodePtr+1) + (imm << 2));
+ break;
+ case RtOffsetBase:
+ FORMAT_INSTR(OPCODE_FMT "%s, %d(%s)", opcode, registerName(rt), imm, registerName(rs));
+ break;
+ case FtOffsetBase:
+ FORMAT_INSTR(OPCODE_FMT "%s, %d(%s)", opcode, fpRegisterName(rt), imm, registerName(rs));
+ break;
+ default:
+ FORMAT_INSTR("unknown immediate encoding opcode 0x%x", iOp);
+ break;
+ }
+}
+
+void Mips32Opcode::formatCOP1Opcode(uint8_t fmt, uint8_t ft, uint8_t fs, uint8_t fd, uint8_t func)
+{
+ const char *opcode;
+ const char *suffix;
+ OpcodePrintFormat format = Unknown;
+
+ if (fmt < 0x10) {
+ switch (fmt) {
+ case 0x00:
+ opcode = "mfc1";
+ break;
+ case 0x04:
+ opcode = "mtc1";
+ break;
+ default:
+ FORMAT_INSTR("unknown COP1 rs 0x%x", fmt);
+ return;
+ }
+ FORMAT_INSTR(OPCODE_FMT "%s, %s", opcode, registerName(ft), fpRegisterName(fs));
+ return;
+ }
+
+ switch (fmt) {
+ case 0x10:
+ suffix = "s";
+ break;
+ case 0x11:
+ suffix = "d";
+ break;
+ case 0x14:
+ suffix = "w";
+ break;
+ case 0x15:
+ suffix = "l";
+ break;
+ case 0x16:
+ suffix = "ps";
+ break;
+ default:
+ FORMAT_INSTR("unknown COP1 fmt 0x%x", fmt);
+ return;
+ }
+
+ switch (func) {
+ case 0x00:
+ format = FdFsFt;
+ opcode = "add";
+ break;
+ case 0x01:
+ format = FdFsFt;
+ opcode = "sub";
+ break;
+ case 0x02:
+ format = FdFsFt;
+ opcode = "mul";
+ break;
+ case 0x03:
+ format = FdFsFt;
+ opcode = "div";
+ break;
+ case 0x04:
+ format = FdFs;
+ opcode = "sqrt";
+ break;
+ case 0x05:
+ format = FdFs;
+ opcode = "abs";
+ break;
+ case 0x06:
+ format = FdFs;
+ opcode = "mov";
+ break;
+ case 0x07:
+ format = FdFs;
+ opcode = "neg";
+ break;
+ case 0x08:
+ format = FdFs;
+ opcode = "round.l";
+ break;
+ case 0x09:
+ format = FdFs;
+ opcode = "trunc.l";
+ break;
+ case 0x0a:
+ format = FdFs;
+ opcode = "ceil.l";
+ break;
+ case 0x0b:
+ format = FdFs;
+ opcode = "floor.l";
+ break;
+ case 0x0c:
+ format = FdFs;
+ opcode = "round.w";
+ break;
+ case 0x0d:
+ format = FdFs;
+ opcode = "trunc.w";
+ break;
+ case 0x0e:
+ format = FdFs;
+ opcode = "ceil.w";
+ break;
+ case 0x0f:
+ format = FdFs;
+ opcode = "floor.w";
+ break;
+ case 0x20:
+ format = FdFs;
+ opcode = "cvt.s";
+ break;
+ case 0x21:
+ format = FdFs;
+ opcode = "cvt.d";
+ break;
+ case 0x24:
+ format = FdFs;
+ opcode = "cvt.w";
+ break;
+ case 0x25:
+ format = FdFs;
+ opcode = "cvt.l";
+ break;
+ }
+
+ switch (format) {
+ case FdFs:
+ FORMAT_INSTR(COP1_OPCODE_FMT "%s, %s", opcode, suffix, fpRegisterName(fd), fpRegisterName(fs));
+ break;
+ case FdFsFt:
+ FORMAT_INSTR(COP1_OPCODE_FMT "%s, %s, %s", opcode, suffix, fpRegisterName(fd), fpRegisterName(fs), fpRegisterName(ft));
+ break;
+ default:
+ FORMAT_INSTR("unknown COP1 opcode 0x%x", func);
+ break;
+ }
+}
+
+void Mips32Opcode::formatCOP1FPCompareOpcode(uint8_t fmt, uint8_t ft, uint8_t fs, uint8_t cc, uint8_t cond)
+{
+ const char *suffix;
+ static const char *opcodes[] = {
+ "c.f", "c.un", "c.eq", "c.ueq", "c.olt", "c.ult", "c.ole", "c.ule",
+ "c.sf", "c.ngle", "c.seq", "c.ngl", "c.lt", "c.nge", "c.le", "c.ngt"
+ };
+ ASSERT(cond < sizeof(opcdoes));
+
+ switch (fmt) {
+ case 0x10:
+ suffix = "s";
+ break;
+ case 0x11:
+ suffix = "d";
+ break;
+ case 0x16:
+ suffix = "ps";
+ break;
+ default:
+ FORMAT_INSTR("unknown COP1 fmt 0x%x", fmt);
+ return;
+ }
+
+ if (!cc)
+ FORMAT_INSTR(COP1_OPCODE_FMT "%s, %s", opcodes[cond], suffix, fpRegisterName(fs), fpRegisterName(ft));
+ else
+ FORMAT_INSTR(COP1_OPCODE_FMT "%d, %s, %s", opcodes[cond], suffix, cc, fpRegisterName(fs), fpRegisterName(ft));
+}
+
+void Mips32Opcode::formatCOP1BCOpcode(uint8_t cc, uint8_t ndtf, int16_t offset, uint32_t* opcodePtr)
+{
+ static const char *opcodes[] = { "bc1f", "bc1t", "bc1fl", "bc1tl" };
+ ASSERT(ndtf < sizeof(opcodes));
+
+ if (!cc)
+ FORMAT_INSTR(OPCODE_FMT "0x%x", opcodes[ndtf], reinterpret_cast<unsigned>(opcodePtr+1) + (offset << 2));
+ else
+ FORMAT_INSTR(OPCODE_FMT "%d, 0x%x", opcodes[ndtf], cc, reinterpret_cast<unsigned>(opcodePtr+1) + (offset << 2));
+}
+
+const char* Mips32Opcode::disassemble(uint32_t* opcodePtr)
+{
+ uint32_t opcode = *opcodePtr;
+ uint32_t iOp = (opcode >> 26) & 0x3f;
+
+ if (!opcode)
+ FORMAT_INSTR(OPCODE_FMT, "nop");
+ else if (!iOp) {
+ uint8_t op1 = (opcode >> 21) & 0x1f;
+ uint8_t op2 = (opcode >> 16) & 0x1f;
+ uint8_t dst = (opcode >> 11) & 0x1f;
+ uint8_t shft = (opcode >> 6) & 0x1f;
+ uint8_t func = opcode & 0x3f;
+ formatSpecialEncodingOpcode(op1, op2, dst, shft, func);
+ } else if ((iOp == 0x02) || (iOp == 0x03)) {
+ uint32_t index = opcode & 0x3ffffff;
+ formatJumpEncodingOpcode(iOp, index, opcodePtr);
+ } else if (iOp == 0x11) {
+ uint8_t fmt = (opcode >> 21) & 0x1f;
+ if (fmt == 0x08) {
+ uint8_t cc = (opcode >> 18) & 0x07;
+ uint8_t ndtf = (opcode >> 16) & 0x03;
+ int16_t offset = opcode & 0xffff;
+ formatCOP1BCOpcode(cc, ndtf, offset, opcodePtr);
+ } else if ((opcode & 0xf0) == 0x30) {
+ uint8_t ft = (opcode >> 16) & 0x1f;
+ uint8_t fs = (opcode >> 11) & 0x1f;
+ uint8_t cc = (opcode >> 8) & 0x07;
+ uint8_t cond = opcode & 0x0f;
+ formatCOP1FPCompareOpcode(fmt, ft, fs, cc, cond);
+ } else {
+ uint8_t ft = (opcode >> 16) & 0x1f;
+ uint8_t fs = (opcode >> 11) & 0x1f;
+ uint8_t fd = (opcode >> 6) & 0x1f;
+ uint8_t func = opcode & 0x3f;
+ formatCOP1Opcode(fmt, ft, fs, fd, func);
+ }
+ } else if (iOp == 0x1c) {
+ uint8_t op1 = (opcode >> 21) & 0x1f;
+ uint8_t op2 = (opcode >> 16) & 0x1f;
+ uint8_t dst = (opcode >> 11) & 0x1f;
+ uint8_t func = opcode & 0x3f;
+ formatSpecial2EncodingOpcode(op1, op2, dst, func);
+ } else {
+ uint8_t rs = (opcode >> 21) & 0x1f;
+ uint8_t rt = (opcode >> 16) & 0x1f;
+ int16_t imm = opcode & 0xffff;
+ if (iOp == 0x01)
+ formatREGIMMEncodingOpcode(rs, rt, imm, opcodePtr);
+ else
+ formatImmediateEncodingOpcode(iOp, rs, rt, imm, opcodePtr);
+ }
+
+ return m_formatBuffer;
+}
+
+#endif // USE(MIPS32_DISASSEMBLER)
diff --git a/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.h b/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.h
new file mode 100644
index 0000000000..c63fb1109a
--- /dev/null
+++ b/src/3rdparty/masm/disassembler/mips32/Mips32Opcode.h
@@ -0,0 +1,78 @@
+/*
+ * Copyright (C) 2015 Cisco Systems, Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY CISCO SYSTEMS, INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL CISCO SYSTEMS, INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _MIPS32Opcode_h_
+#define _MIPS32Opcode_h_
+
+#if USE(MIPS32_DISASSEMBLER)
+
+#include <stdint.h>
+#include <wtf/Assertions.h>
+
+class Mips32Opcode {
+public:
+ Mips32Opcode() {}
+
+ const char* disassemble(uint32_t*);
+
+private:
+ enum OpcodePrintFormat {
+ Unknown = 0,
+ Rs,
+ Rd,
+ Addr,
+ RdRs,
+ RsRt,
+ RtUImm,
+ RdRtRs,
+ RdRsRt,
+ RdRtSa,
+ RtRsImm,
+ RsRtAddr,
+ RtOffsetBase,
+ FdFs,
+ FdFsFt,
+ FtOffsetBase
+ };
+
+ const char *registerName(uint8_t r);
+ const char *fpRegisterName(uint8_t r);
+ void formatSpecialEncodingOpcode(uint8_t op1, uint8_t op2, uint8_t dest, uint8_t shift, uint8_t function);
+ void formatSpecial2EncodingOpcode(uint8_t op1, uint8_t op2, uint8_t dest, uint8_t function);
+ void formatJumpEncodingOpcode(uint32_t iOp, uint32_t index, uint32_t* opcodePtr);
+ void formatREGIMMEncodingOpcode(uint8_t rs, uint8_t rt, int16_t imm, uint32_t* opcodePtr);
+ void formatImmediateEncodingOpcode(uint32_t iOp, uint8_t rs, uint8_t rt, int16_t imm, uint32_t* opcodePtr);
+ void formatCOP1Opcode(uint8_t fmt, uint8_t ft, uint8_t fs, uint8_t fd, uint8_t func);
+ void formatCOP1FPCompareOpcode(uint8_t fmt, uint8_t ft, uint8_t fs, uint8_t cc, uint8_t cond);
+ void formatCOP1BCOpcode(uint8_t cc, uint8_t ndtf, int16_t offset, uint32_t* opcodePtr);
+
+ static const int bufferSize = 81;
+
+ char m_formatBuffer[bufferSize];
+};
+
+#endif
+
+#endif // _MIPS32Opcode_h_
diff --git a/src/3rdparty/masm/masm-defs.pri b/src/3rdparty/masm/masm-defs.pri
index d0980c5312..f09a8329c9 100644
--- a/src/3rdparty/masm/masm-defs.pri
+++ b/src/3rdparty/masm/masm-defs.pri
@@ -26,6 +26,7 @@ INCLUDEPATH += $$PWD
disassembler {
if(isEqual(QT_ARCH, "i386")|isEqual(QT_ARCH, "x86_64")): DEFINES += WTF_USE_UDIS86=1
if(isEqual(QT_ARCH, "arm")): DEFINES += WTF_USE_ARMV7_DISASSEMBLER=1
+ if(isEqual(QT_ARCH, "mips")): DEFINES += WTF_USE_MIPS32_DISASSEMBLER=1
} else {
DEFINES += WTF_USE_UDIS86=0
}
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri
index 3497650f0c..04548fe8a3 100644
--- a/src/3rdparty/masm/masm.pri
+++ b/src/3rdparty/masm/masm.pri
@@ -59,6 +59,9 @@ contains(DEFINES, WTF_USE_UDIS86=1) {
SOURCES += $$PWD/disassembler/ARMv7Disassembler.cpp
SOURCES += $$PWD/disassembler/ARMv7/ARMv7DOpcode.cpp
HEADERS += $$PWD/disassembler/ARMv7/ARMv7DOpcode.h
+SOURCES += $$PWD/disassembler/Mips32Disassembler.cpp
+SOURCES += $$PWD/disassembler/mips32/Mips32Opcode.cpp
+HEADERS += $$PWD/disassembler/mips32/Mips32Opcode.h
SOURCES += $$PWD/yarr/*.cpp
HEADERS += $$PWD/yarr/*.h
diff --git a/src/3rdparty/masm/stubs/Options.cpp b/src/3rdparty/masm/stubs/Options.cpp
index 3b13e32218..76da55c387 100644
--- a/src/3rdparty/masm/stubs/Options.cpp
+++ b/src/3rdparty/masm/stubs/Options.cpp
@@ -40,7 +40,7 @@ namespace JSC {
bool Options::showDisassembly()
{
- static bool showCode = !qgetenv("QV4_SHOW_ASM").isNull();
+ static const bool showCode = qEnvironmentVariableIsSet("QV4_SHOW_ASM");
return showCode;
}
diff --git a/src/3rdparty/masm/wtf/FilePrintStream.cpp b/src/3rdparty/masm/wtf/FilePrintStream.cpp
index b5ab25e0bf..45f1565f46 100644
--- a/src/3rdparty/masm/wtf/FilePrintStream.cpp
+++ b/src/3rdparty/masm/wtf/FilePrintStream.cpp
@@ -38,7 +38,8 @@ FilePrintStream::~FilePrintStream()
{
if (m_adoptionMode == Borrow)
return;
- fclose(m_file);
+ if (m_file)
+ fclose(m_file);
}
PassOwnPtr<FilePrintStream> FilePrintStream::open(const char* filename, const char* mode)
diff --git a/src/3rdparty/masm/wtf/Platform.h b/src/3rdparty/masm/wtf/Platform.h
index 3e2a51379c..f0612fe50e 100644
--- a/src/3rdparty/masm/wtf/Platform.h
+++ b/src/3rdparty/masm/wtf/Platform.h
@@ -735,7 +735,7 @@
#define WTF_USE_UDIS86 1
#endif
-#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER))
+#if !defined(ENABLE_DISASSEMBLER) && (USE(UDIS86) || USE(ARMV7_DISASSEMBLER) || USE(MIPS32_DISASSEMBLER))
#define ENABLE_DISASSEMBLER 1
#endif
diff --git a/src/imports/builtins.qmltypes b/src/imports/builtins.qmltypes
new file mode 100644
index 0000000000..cca1c20d54
--- /dev/null
+++ b/src/imports/builtins.qmltypes
@@ -0,0 +1,1605 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable -builtins'
+
+Module {
+ dependencies: []
+ Component {
+ name: "Qt"
+ Enum {
+ name: "GlobalColor"
+ values: {
+ "color0": 0,
+ "color1": 1,
+ "black": 2,
+ "white": 3,
+ "darkGray": 4,
+ "gray": 5,
+ "lightGray": 6,
+ "red": 7,
+ "green": 8,
+ "blue": 9,
+ "cyan": 10,
+ "magenta": 11,
+ "yellow": 12,
+ "darkRed": 13,
+ "darkGreen": 14,
+ "darkBlue": 15,
+ "darkCyan": 16,
+ "darkMagenta": 17,
+ "darkYellow": 18,
+ "transparent": 19
+ }
+ }
+ Enum {
+ name: "KeyboardModifiers"
+ values: {
+ "NoModifier": 0,
+ "ShiftModifier": 33554432,
+ "ControlModifier": 67108864,
+ "AltModifier": 134217728,
+ "MetaModifier": 268435456,
+ "KeypadModifier": 536870912,
+ "GroupSwitchModifier": 1073741824,
+ "KeyboardModifierMask": -33554432
+ }
+ }
+ Enum {
+ name: "MouseButtons"
+ values: {
+ "NoButton": 0,
+ "LeftButton": 1,
+ "RightButton": 2,
+ "MidButton": 4,
+ "MiddleButton": 4,
+ "BackButton": 8,
+ "XButton1": 8,
+ "ExtraButton1": 8,
+ "ForwardButton": 16,
+ "XButton2": 16,
+ "ExtraButton2": 16,
+ "TaskButton": 32,
+ "ExtraButton3": 32,
+ "ExtraButton4": 64,
+ "ExtraButton5": 128,
+ "ExtraButton6": 256,
+ "ExtraButton7": 512,
+ "ExtraButton8": 1024,
+ "ExtraButton9": 2048,
+ "ExtraButton10": 4096,
+ "ExtraButton11": 8192,
+ "ExtraButton12": 16384,
+ "ExtraButton13": 32768,
+ "ExtraButton14": 65536,
+ "ExtraButton15": 131072,
+ "ExtraButton16": 262144,
+ "ExtraButton17": 524288,
+ "ExtraButton18": 1048576,
+ "ExtraButton19": 2097152,
+ "ExtraButton20": 4194304,
+ "ExtraButton21": 8388608,
+ "ExtraButton22": 16777216,
+ "ExtraButton23": 33554432,
+ "ExtraButton24": 67108864,
+ "AllButtons": 134217727,
+ "MaxMouseButton": 67108864,
+ "MouseButtonMask": -1
+ }
+ }
+ Enum {
+ name: "Orientation"
+ values: {
+ "Horizontal": 1,
+ "Vertical": 2
+ }
+ }
+ Enum {
+ name: "Orientations"
+ values: {
+ "Horizontal": 1,
+ "Vertical": 2
+ }
+ }
+ Enum {
+ name: "FocusPolicy"
+ values: {
+ "NoFocus": 0,
+ "TabFocus": 1,
+ "ClickFocus": 2,
+ "StrongFocus": 11,
+ "WheelFocus": 15
+ }
+ }
+ Enum {
+ name: "TabFocusBehavior"
+ values: {
+ "NoTabFocus": 0,
+ "TabFocusTextControls": 1,
+ "TabFocusListControls": 2,
+ "TabFocusAllControls": 255
+ }
+ }
+ Enum {
+ name: "SortOrder"
+ values: {
+ "AscendingOrder": 0,
+ "DescendingOrder": 1
+ }
+ }
+ Enum {
+ name: "Alignment"
+ values: {
+ "AlignLeft": 1,
+ "AlignLeading": 1,
+ "AlignRight": 2,
+ "AlignTrailing": 2,
+ "AlignHCenter": 4,
+ "AlignJustify": 8,
+ "AlignAbsolute": 16,
+ "AlignHorizontal_Mask": 31,
+ "AlignTop": 32,
+ "AlignBottom": 64,
+ "AlignVCenter": 128,
+ "AlignBaseline": 256,
+ "AlignVertical_Mask": 480,
+ "AlignCenter": 132
+ }
+ }
+ Enum {
+ name: "TextElideMode"
+ values: {
+ "ElideLeft": 0,
+ "ElideRight": 1,
+ "ElideMiddle": 2,
+ "ElideNone": 3
+ }
+ }
+ Enum {
+ name: "WindowType"
+ values: {
+ "Widget": 0,
+ "Window": 1,
+ "Dialog": 3,
+ "Sheet": 5,
+ "Drawer": 7,
+ "Popup": 9,
+ "Tool": 11,
+ "ToolTip": 13,
+ "SplashScreen": 15,
+ "Desktop": 17,
+ "SubWindow": 18,
+ "ForeignWindow": 33,
+ "CoverWindow": 65,
+ "WindowType_Mask": 255,
+ "MSWindowsFixedSizeDialogHint": 256,
+ "MSWindowsOwnDC": 512,
+ "BypassWindowManagerHint": 1024,
+ "X11BypassWindowManagerHint": 1024,
+ "FramelessWindowHint": 2048,
+ "WindowTitleHint": 4096,
+ "WindowSystemMenuHint": 8192,
+ "WindowMinimizeButtonHint": 16384,
+ "WindowMaximizeButtonHint": 32768,
+ "WindowMinMaxButtonsHint": 49152,
+ "WindowContextHelpButtonHint": 65536,
+ "WindowShadeButtonHint": 131072,
+ "WindowStaysOnTopHint": 262144,
+ "WindowTransparentForInput": 524288,
+ "WindowOverridesSystemGestures": 1048576,
+ "WindowDoesNotAcceptFocus": 2097152,
+ "MaximizeUsingFullscreenGeometryHint": 4194304,
+ "CustomizeWindowHint": 33554432,
+ "WindowStaysOnBottomHint": 67108864,
+ "WindowCloseButtonHint": 134217728,
+ "MacWindowToolBarButtonHint": 268435456,
+ "BypassGraphicsProxyWidget": 536870912,
+ "NoDropShadowWindowHint": 1073741824,
+ "WindowFullscreenButtonHint": -2147483648,
+ "WindowOkButtonHint": 524288,
+ "WindowCancelButtonHint": 1048576
+ }
+ }
+ Enum {
+ name: "WindowFlags"
+ values: {
+ "Widget": 0,
+ "Window": 1,
+ "Dialog": 3,
+ "Sheet": 5,
+ "Drawer": 7,
+ "Popup": 9,
+ "Tool": 11,
+ "ToolTip": 13,
+ "SplashScreen": 15,
+ "Desktop": 17,
+ "SubWindow": 18,
+ "ForeignWindow": 33,
+ "CoverWindow": 65,
+ "WindowType_Mask": 255,
+ "MSWindowsFixedSizeDialogHint": 256,
+ "MSWindowsOwnDC": 512,
+ "BypassWindowManagerHint": 1024,
+ "X11BypassWindowManagerHint": 1024,
+ "FramelessWindowHint": 2048,
+ "WindowTitleHint": 4096,
+ "WindowSystemMenuHint": 8192,
+ "WindowMinimizeButtonHint": 16384,
+ "WindowMaximizeButtonHint": 32768,
+ "WindowMinMaxButtonsHint": 49152,
+ "WindowContextHelpButtonHint": 65536,
+ "WindowShadeButtonHint": 131072,
+ "WindowStaysOnTopHint": 262144,
+ "WindowTransparentForInput": 524288,
+ "WindowOverridesSystemGestures": 1048576,
+ "WindowDoesNotAcceptFocus": 2097152,
+ "MaximizeUsingFullscreenGeometryHint": 4194304,
+ "CustomizeWindowHint": 33554432,
+ "WindowStaysOnBottomHint": 67108864,
+ "WindowCloseButtonHint": 134217728,
+ "MacWindowToolBarButtonHint": 268435456,
+ "BypassGraphicsProxyWidget": 536870912,
+ "NoDropShadowWindowHint": 1073741824,
+ "WindowFullscreenButtonHint": -2147483648,
+ "WindowOkButtonHint": 524288,
+ "WindowCancelButtonHint": 1048576
+ }
+ }
+ Enum {
+ name: "WindowState"
+ values: {
+ "WindowNoState": 0,
+ "WindowMinimized": 1,
+ "WindowMaximized": 2,
+ "WindowFullScreen": 4,
+ "WindowActive": 8
+ }
+ }
+ Enum {
+ name: "WindowStates"
+ values: {
+ "WindowNoState": 0,
+ "WindowMinimized": 1,
+ "WindowMaximized": 2,
+ "WindowFullScreen": 4,
+ "WindowActive": 8
+ }
+ }
+ Enum {
+ name: "ApplicationState"
+ values: {
+ "ApplicationSuspended": 0,
+ "ApplicationHidden": 1,
+ "ApplicationInactive": 2,
+ "ApplicationActive": 4
+ }
+ }
+ Enum {
+ name: "ScreenOrientation"
+ values: {
+ "PrimaryOrientation": 0,
+ "PortraitOrientation": 1,
+ "LandscapeOrientation": 2,
+ "InvertedPortraitOrientation": 4,
+ "InvertedLandscapeOrientation": 8
+ }
+ }
+ Enum {
+ name: "ScreenOrientations"
+ values: {
+ "PrimaryOrientation": 0,
+ "PortraitOrientation": 1,
+ "LandscapeOrientation": 2,
+ "InvertedPortraitOrientation": 4,
+ "InvertedLandscapeOrientation": 8
+ }
+ }
+ Enum {
+ name: "WidgetAttribute"
+ values: {
+ "WA_Disabled": 0,
+ "WA_UnderMouse": 1,
+ "WA_MouseTracking": 2,
+ "WA_ContentsPropagated": 3,
+ "WA_OpaquePaintEvent": 4,
+ "WA_NoBackground": 4,
+ "WA_StaticContents": 5,
+ "WA_LaidOut": 7,
+ "WA_PaintOnScreen": 8,
+ "WA_NoSystemBackground": 9,
+ "WA_UpdatesDisabled": 10,
+ "WA_Mapped": 11,
+ "WA_MacNoClickThrough": 12,
+ "WA_InputMethodEnabled": 14,
+ "WA_WState_Visible": 15,
+ "WA_WState_Hidden": 16,
+ "WA_ForceDisabled": 32,
+ "WA_KeyCompression": 33,
+ "WA_PendingMoveEvent": 34,
+ "WA_PendingResizeEvent": 35,
+ "WA_SetPalette": 36,
+ "WA_SetFont": 37,
+ "WA_SetCursor": 38,
+ "WA_NoChildEventsFromChildren": 39,
+ "WA_WindowModified": 41,
+ "WA_Resized": 42,
+ "WA_Moved": 43,
+ "WA_PendingUpdate": 44,
+ "WA_InvalidSize": 45,
+ "WA_MacBrushedMetal": 46,
+ "WA_MacMetalStyle": 46,
+ "WA_CustomWhatsThis": 47,
+ "WA_LayoutOnEntireRect": 48,
+ "WA_OutsideWSRange": 49,
+ "WA_GrabbedShortcut": 50,
+ "WA_TransparentForMouseEvents": 51,
+ "WA_PaintUnclipped": 52,
+ "WA_SetWindowIcon": 53,
+ "WA_NoMouseReplay": 54,
+ "WA_DeleteOnClose": 55,
+ "WA_RightToLeft": 56,
+ "WA_SetLayoutDirection": 57,
+ "WA_NoChildEventsForParent": 58,
+ "WA_ForceUpdatesDisabled": 59,
+ "WA_WState_Created": 60,
+ "WA_WState_CompressKeys": 61,
+ "WA_WState_InPaintEvent": 62,
+ "WA_WState_Reparented": 63,
+ "WA_WState_ConfigPending": 64,
+ "WA_WState_Polished": 66,
+ "WA_WState_DND": 67,
+ "WA_WState_OwnSizePolicy": 68,
+ "WA_WState_ExplicitShowHide": 69,
+ "WA_ShowModal": 70,
+ "WA_MouseNoMask": 71,
+ "WA_GroupLeader": 72,
+ "WA_NoMousePropagation": 73,
+ "WA_Hover": 74,
+ "WA_InputMethodTransparent": 75,
+ "WA_QuitOnClose": 76,
+ "WA_KeyboardFocusChange": 77,
+ "WA_AcceptDrops": 78,
+ "WA_DropSiteRegistered": 79,
+ "WA_ForceAcceptDrops": 79,
+ "WA_WindowPropagation": 80,
+ "WA_NoX11EventCompression": 81,
+ "WA_TintedBackground": 82,
+ "WA_X11OpenGLOverlay": 83,
+ "WA_AlwaysShowToolTips": 84,
+ "WA_MacOpaqueSizeGrip": 85,
+ "WA_SetStyle": 86,
+ "WA_SetLocale": 87,
+ "WA_MacShowFocusRect": 88,
+ "WA_MacNormalSize": 89,
+ "WA_MacSmallSize": 90,
+ "WA_MacMiniSize": 91,
+ "WA_LayoutUsesWidgetRect": 92,
+ "WA_StyledBackground": 93,
+ "WA_MSWindowsUseDirect3D": 94,
+ "WA_CanHostQMdiSubWindowTitleBar": 95,
+ "WA_MacAlwaysShowToolWindow": 96,
+ "WA_StyleSheet": 97,
+ "WA_ShowWithoutActivating": 98,
+ "WA_X11BypassTransientForHint": 99,
+ "WA_NativeWindow": 100,
+ "WA_DontCreateNativeAncestors": 101,
+ "WA_MacVariableSize": 102,
+ "WA_DontShowOnScreen": 103,
+ "WA_X11NetWmWindowTypeDesktop": 104,
+ "WA_X11NetWmWindowTypeDock": 105,
+ "WA_X11NetWmWindowTypeToolBar": 106,
+ "WA_X11NetWmWindowTypeMenu": 107,
+ "WA_X11NetWmWindowTypeUtility": 108,
+ "WA_X11NetWmWindowTypeSplash": 109,
+ "WA_X11NetWmWindowTypeDialog": 110,
+ "WA_X11NetWmWindowTypeDropDownMenu": 111,
+ "WA_X11NetWmWindowTypePopupMenu": 112,
+ "WA_X11NetWmWindowTypeToolTip": 113,
+ "WA_X11NetWmWindowTypeNotification": 114,
+ "WA_X11NetWmWindowTypeCombo": 115,
+ "WA_X11NetWmWindowTypeDND": 116,
+ "WA_MacFrameworkScaled": 117,
+ "WA_SetWindowModality": 118,
+ "WA_WState_WindowOpacitySet": 119,
+ "WA_TranslucentBackground": 120,
+ "WA_AcceptTouchEvents": 121,
+ "WA_WState_AcceptedTouchBeginEvent": 122,
+ "WA_TouchPadAcceptSingleTouchEvents": 123,
+ "WA_X11DoNotAcceptFocus": 126,
+ "WA_MacNoShadow": 127,
+ "WA_AlwaysStackOnTop": 128,
+ "WA_AttributeCount": 129
+ }
+ }
+ Enum {
+ name: "ApplicationAttribute"
+ values: {
+ "AA_ImmediateWidgetCreation": 0,
+ "AA_MSWindowsUseDirect3DByDefault": 1,
+ "AA_DontShowIconsInMenus": 2,
+ "AA_NativeWindows": 3,
+ "AA_DontCreateNativeWidgetSiblings": 4,
+ "AA_MacPluginApplication": 5,
+ "AA_DontUseNativeMenuBar": 6,
+ "AA_MacDontSwapCtrlAndMeta": 7,
+ "AA_Use96Dpi": 8,
+ "AA_X11InitThreads": 10,
+ "AA_SynthesizeTouchForUnhandledMouseEvents": 11,
+ "AA_SynthesizeMouseForUnhandledTouchEvents": 12,
+ "AA_UseHighDpiPixmaps": 13,
+ "AA_ForceRasterWidgets": 14,
+ "AA_UseDesktopOpenGL": 15,
+ "AA_UseOpenGLES": 16,
+ "AA_UseSoftwareOpenGL": 17,
+ "AA_ShareOpenGLContexts": 18,
+ "AA_SetPalette": 19,
+ "AA_EnableHighDpiScaling": 20,
+ "AA_DisableHighDpiScaling": 21,
+ "AA_AttributeCount": 22
+ }
+ }
+ Enum {
+ name: "ImageConversionFlags"
+ values: {
+ "ColorMode_Mask": 3,
+ "AutoColor": 0,
+ "ColorOnly": 3,
+ "MonoOnly": 2,
+ "AlphaDither_Mask": 12,
+ "ThresholdAlphaDither": 0,
+ "OrderedAlphaDither": 4,
+ "DiffuseAlphaDither": 8,
+ "NoAlpha": 12,
+ "Dither_Mask": 48,
+ "DiffuseDither": 0,
+ "OrderedDither": 16,
+ "ThresholdDither": 32,
+ "DitherMode_Mask": 192,
+ "AutoDither": 0,
+ "PreferDither": 64,
+ "AvoidDither": 128,
+ "NoOpaqueDetection": 256,
+ "NoFormatConversion": 512
+ }
+ }
+ Enum {
+ name: "BGMode"
+ values: {
+ "TransparentMode": 0,
+ "OpaqueMode": 1
+ }
+ }
+ Enum {
+ name: "Key"
+ values: {
+ "Key_Escape": 16777216,
+ "Key_Tab": 16777217,
+ "Key_Backtab": 16777218,
+ "Key_Backspace": 16777219,
+ "Key_Return": 16777220,
+ "Key_Enter": 16777221,
+ "Key_Insert": 16777222,
+ "Key_Delete": 16777223,
+ "Key_Pause": 16777224,
+ "Key_Print": 16777225,
+ "Key_SysReq": 16777226,
+ "Key_Clear": 16777227,
+ "Key_Home": 16777232,
+ "Key_End": 16777233,
+ "Key_Left": 16777234,
+ "Key_Up": 16777235,
+ "Key_Right": 16777236,
+ "Key_Down": 16777237,
+ "Key_PageUp": 16777238,
+ "Key_PageDown": 16777239,
+ "Key_Shift": 16777248,
+ "Key_Control": 16777249,
+ "Key_Meta": 16777250,
+ "Key_Alt": 16777251,
+ "Key_CapsLock": 16777252,
+ "Key_NumLock": 16777253,
+ "Key_ScrollLock": 16777254,
+ "Key_F1": 16777264,
+ "Key_F2": 16777265,
+ "Key_F3": 16777266,
+ "Key_F4": 16777267,
+ "Key_F5": 16777268,
+ "Key_F6": 16777269,
+ "Key_F7": 16777270,
+ "Key_F8": 16777271,
+ "Key_F9": 16777272,
+ "Key_F10": 16777273,
+ "Key_F11": 16777274,
+ "Key_F12": 16777275,
+ "Key_F13": 16777276,
+ "Key_F14": 16777277,
+ "Key_F15": 16777278,
+ "Key_F16": 16777279,
+ "Key_F17": 16777280,
+ "Key_F18": 16777281,
+ "Key_F19": 16777282,
+ "Key_F20": 16777283,
+ "Key_F21": 16777284,
+ "Key_F22": 16777285,
+ "Key_F23": 16777286,
+ "Key_F24": 16777287,
+ "Key_F25": 16777288,
+ "Key_F26": 16777289,
+ "Key_F27": 16777290,
+ "Key_F28": 16777291,
+ "Key_F29": 16777292,
+ "Key_F30": 16777293,
+ "Key_F31": 16777294,
+ "Key_F32": 16777295,
+ "Key_F33": 16777296,
+ "Key_F34": 16777297,
+ "Key_F35": 16777298,
+ "Key_Super_L": 16777299,
+ "Key_Super_R": 16777300,
+ "Key_Menu": 16777301,
+ "Key_Hyper_L": 16777302,
+ "Key_Hyper_R": 16777303,
+ "Key_Help": 16777304,
+ "Key_Direction_L": 16777305,
+ "Key_Direction_R": 16777312,
+ "Key_Space": 32,
+ "Key_Any": 32,
+ "Key_Exclam": 33,
+ "Key_QuoteDbl": 34,
+ "Key_NumberSign": 35,
+ "Key_Dollar": 36,
+ "Key_Percent": 37,
+ "Key_Ampersand": 38,
+ "Key_Apostrophe": 39,
+ "Key_ParenLeft": 40,
+ "Key_ParenRight": 41,
+ "Key_Asterisk": 42,
+ "Key_Plus": 43,
+ "Key_Comma": 44,
+ "Key_Minus": 45,
+ "Key_Period": 46,
+ "Key_Slash": 47,
+ "Key_0": 48,
+ "Key_1": 49,
+ "Key_2": 50,
+ "Key_3": 51,
+ "Key_4": 52,
+ "Key_5": 53,
+ "Key_6": 54,
+ "Key_7": 55,
+ "Key_8": 56,
+ "Key_9": 57,
+ "Key_Colon": 58,
+ "Key_Semicolon": 59,
+ "Key_Less": 60,
+ "Key_Equal": 61,
+ "Key_Greater": 62,
+ "Key_Question": 63,
+ "Key_At": 64,
+ "Key_A": 65,
+ "Key_B": 66,
+ "Key_C": 67,
+ "Key_D": 68,
+ "Key_E": 69,
+ "Key_F": 70,
+ "Key_G": 71,
+ "Key_H": 72,
+ "Key_I": 73,
+ "Key_J": 74,
+ "Key_K": 75,
+ "Key_L": 76,
+ "Key_M": 77,
+ "Key_N": 78,
+ "Key_O": 79,
+ "Key_P": 80,
+ "Key_Q": 81,
+ "Key_R": 82,
+ "Key_S": 83,
+ "Key_T": 84,
+ "Key_U": 85,
+ "Key_V": 86,
+ "Key_W": 87,
+ "Key_X": 88,
+ "Key_Y": 89,
+ "Key_Z": 90,
+ "Key_BracketLeft": 91,
+ "Key_Backslash": 92,
+ "Key_BracketRight": 93,
+ "Key_AsciiCircum": 94,
+ "Key_Underscore": 95,
+ "Key_QuoteLeft": 96,
+ "Key_BraceLeft": 123,
+ "Key_Bar": 124,
+ "Key_BraceRight": 125,
+ "Key_AsciiTilde": 126,
+ "Key_nobreakspace": 160,
+ "Key_exclamdown": 161,
+ "Key_cent": 162,
+ "Key_sterling": 163,
+ "Key_currency": 164,
+ "Key_yen": 165,
+ "Key_brokenbar": 166,
+ "Key_section": 167,
+ "Key_diaeresis": 168,
+ "Key_copyright": 169,
+ "Key_ordfeminine": 170,
+ "Key_guillemotleft": 171,
+ "Key_notsign": 172,
+ "Key_hyphen": 173,
+ "Key_registered": 174,
+ "Key_macron": 175,
+ "Key_degree": 176,
+ "Key_plusminus": 177,
+ "Key_twosuperior": 178,
+ "Key_threesuperior": 179,
+ "Key_acute": 180,
+ "Key_mu": 181,
+ "Key_paragraph": 182,
+ "Key_periodcentered": 183,
+ "Key_cedilla": 184,
+ "Key_onesuperior": 185,
+ "Key_masculine": 186,
+ "Key_guillemotright": 187,
+ "Key_onequarter": 188,
+ "Key_onehalf": 189,
+ "Key_threequarters": 190,
+ "Key_questiondown": 191,
+ "Key_Agrave": 192,
+ "Key_Aacute": 193,
+ "Key_Acircumflex": 194,
+ "Key_Atilde": 195,
+ "Key_Adiaeresis": 196,
+ "Key_Aring": 197,
+ "Key_AE": 198,
+ "Key_Ccedilla": 199,
+ "Key_Egrave": 200,
+ "Key_Eacute": 201,
+ "Key_Ecircumflex": 202,
+ "Key_Ediaeresis": 203,
+ "Key_Igrave": 204,
+ "Key_Iacute": 205,
+ "Key_Icircumflex": 206,
+ "Key_Idiaeresis": 207,
+ "Key_ETH": 208,
+ "Key_Ntilde": 209,
+ "Key_Ograve": 210,
+ "Key_Oacute": 211,
+ "Key_Ocircumflex": 212,
+ "Key_Otilde": 213,
+ "Key_Odiaeresis": 214,
+ "Key_multiply": 215,
+ "Key_Ooblique": 216,
+ "Key_Ugrave": 217,
+ "Key_Uacute": 218,
+ "Key_Ucircumflex": 219,
+ "Key_Udiaeresis": 220,
+ "Key_Yacute": 221,
+ "Key_THORN": 222,
+ "Key_ssharp": 223,
+ "Key_division": 247,
+ "Key_ydiaeresis": 255,
+ "Key_AltGr": 16781571,
+ "Key_Multi_key": 16781600,
+ "Key_Codeinput": 16781623,
+ "Key_SingleCandidate": 16781628,
+ "Key_MultipleCandidate": 16781629,
+ "Key_PreviousCandidate": 16781630,
+ "Key_Mode_switch": 16781694,
+ "Key_Kanji": 16781601,
+ "Key_Muhenkan": 16781602,
+ "Key_Henkan": 16781603,
+ "Key_Romaji": 16781604,
+ "Key_Hiragana": 16781605,
+ "Key_Katakana": 16781606,
+ "Key_Hiragana_Katakana": 16781607,
+ "Key_Zenkaku": 16781608,
+ "Key_Hankaku": 16781609,
+ "Key_Zenkaku_Hankaku": 16781610,
+ "Key_Touroku": 16781611,
+ "Key_Massyo": 16781612,
+ "Key_Kana_Lock": 16781613,
+ "Key_Kana_Shift": 16781614,
+ "Key_Eisu_Shift": 16781615,
+ "Key_Eisu_toggle": 16781616,
+ "Key_Hangul": 16781617,
+ "Key_Hangul_Start": 16781618,
+ "Key_Hangul_End": 16781619,
+ "Key_Hangul_Hanja": 16781620,
+ "Key_Hangul_Jamo": 16781621,
+ "Key_Hangul_Romaja": 16781622,
+ "Key_Hangul_Jeonja": 16781624,
+ "Key_Hangul_Banja": 16781625,
+ "Key_Hangul_PreHanja": 16781626,
+ "Key_Hangul_PostHanja": 16781627,
+ "Key_Hangul_Special": 16781631,
+ "Key_Dead_Grave": 16781904,
+ "Key_Dead_Acute": 16781905,
+ "Key_Dead_Circumflex": 16781906,
+ "Key_Dead_Tilde": 16781907,
+ "Key_Dead_Macron": 16781908,
+ "Key_Dead_Breve": 16781909,
+ "Key_Dead_Abovedot": 16781910,
+ "Key_Dead_Diaeresis": 16781911,
+ "Key_Dead_Abovering": 16781912,
+ "Key_Dead_Doubleacute": 16781913,
+ "Key_Dead_Caron": 16781914,
+ "Key_Dead_Cedilla": 16781915,
+ "Key_Dead_Ogonek": 16781916,
+ "Key_Dead_Iota": 16781917,
+ "Key_Dead_Voiced_Sound": 16781918,
+ "Key_Dead_Semivoiced_Sound": 16781919,
+ "Key_Dead_Belowdot": 16781920,
+ "Key_Dead_Hook": 16781921,
+ "Key_Dead_Horn": 16781922,
+ "Key_Back": 16777313,
+ "Key_Forward": 16777314,
+ "Key_Stop": 16777315,
+ "Key_Refresh": 16777316,
+ "Key_VolumeDown": 16777328,
+ "Key_VolumeMute": 16777329,
+ "Key_VolumeUp": 16777330,
+ "Key_BassBoost": 16777331,
+ "Key_BassUp": 16777332,
+ "Key_BassDown": 16777333,
+ "Key_TrebleUp": 16777334,
+ "Key_TrebleDown": 16777335,
+ "Key_MediaPlay": 16777344,
+ "Key_MediaStop": 16777345,
+ "Key_MediaPrevious": 16777346,
+ "Key_MediaNext": 16777347,
+ "Key_MediaRecord": 16777348,
+ "Key_MediaPause": 16777349,
+ "Key_MediaTogglePlayPause": 16777350,
+ "Key_HomePage": 16777360,
+ "Key_Favorites": 16777361,
+ "Key_Search": 16777362,
+ "Key_Standby": 16777363,
+ "Key_OpenUrl": 16777364,
+ "Key_LaunchMail": 16777376,
+ "Key_LaunchMedia": 16777377,
+ "Key_Launch0": 16777378,
+ "Key_Launch1": 16777379,
+ "Key_Launch2": 16777380,
+ "Key_Launch3": 16777381,
+ "Key_Launch4": 16777382,
+ "Key_Launch5": 16777383,
+ "Key_Launch6": 16777384,
+ "Key_Launch7": 16777385,
+ "Key_Launch8": 16777386,
+ "Key_Launch9": 16777387,
+ "Key_LaunchA": 16777388,
+ "Key_LaunchB": 16777389,
+ "Key_LaunchC": 16777390,
+ "Key_LaunchD": 16777391,
+ "Key_LaunchE": 16777392,
+ "Key_LaunchF": 16777393,
+ "Key_MonBrightnessUp": 16777394,
+ "Key_MonBrightnessDown": 16777395,
+ "Key_KeyboardLightOnOff": 16777396,
+ "Key_KeyboardBrightnessUp": 16777397,
+ "Key_KeyboardBrightnessDown": 16777398,
+ "Key_PowerOff": 16777399,
+ "Key_WakeUp": 16777400,
+ "Key_Eject": 16777401,
+ "Key_ScreenSaver": 16777402,
+ "Key_WWW": 16777403,
+ "Key_Memo": 16777404,
+ "Key_LightBulb": 16777405,
+ "Key_Shop": 16777406,
+ "Key_History": 16777407,
+ "Key_AddFavorite": 16777408,
+ "Key_HotLinks": 16777409,
+ "Key_BrightnessAdjust": 16777410,
+ "Key_Finance": 16777411,
+ "Key_Community": 16777412,
+ "Key_AudioRewind": 16777413,
+ "Key_BackForward": 16777414,
+ "Key_ApplicationLeft": 16777415,
+ "Key_ApplicationRight": 16777416,
+ "Key_Book": 16777417,
+ "Key_CD": 16777418,
+ "Key_Calculator": 16777419,
+ "Key_ToDoList": 16777420,
+ "Key_ClearGrab": 16777421,
+ "Key_Close": 16777422,
+ "Key_Copy": 16777423,
+ "Key_Cut": 16777424,
+ "Key_Display": 16777425,
+ "Key_DOS": 16777426,
+ "Key_Documents": 16777427,
+ "Key_Excel": 16777428,
+ "Key_Explorer": 16777429,
+ "Key_Game": 16777430,
+ "Key_Go": 16777431,
+ "Key_iTouch": 16777432,
+ "Key_LogOff": 16777433,
+ "Key_Market": 16777434,
+ "Key_Meeting": 16777435,
+ "Key_MenuKB": 16777436,
+ "Key_MenuPB": 16777437,
+ "Key_MySites": 16777438,
+ "Key_News": 16777439,
+ "Key_OfficeHome": 16777440,
+ "Key_Option": 16777441,
+ "Key_Paste": 16777442,
+ "Key_Phone": 16777443,
+ "Key_Calendar": 16777444,
+ "Key_Reply": 16777445,
+ "Key_Reload": 16777446,
+ "Key_RotateWindows": 16777447,
+ "Key_RotationPB": 16777448,
+ "Key_RotationKB": 16777449,
+ "Key_Save": 16777450,
+ "Key_Send": 16777451,
+ "Key_Spell": 16777452,
+ "Key_SplitScreen": 16777453,
+ "Key_Support": 16777454,
+ "Key_TaskPane": 16777455,
+ "Key_Terminal": 16777456,
+ "Key_Tools": 16777457,
+ "Key_Travel": 16777458,
+ "Key_Video": 16777459,
+ "Key_Word": 16777460,
+ "Key_Xfer": 16777461,
+ "Key_ZoomIn": 16777462,
+ "Key_ZoomOut": 16777463,
+ "Key_Away": 16777464,
+ "Key_Messenger": 16777465,
+ "Key_WebCam": 16777466,
+ "Key_MailForward": 16777467,
+ "Key_Pictures": 16777468,
+ "Key_Music": 16777469,
+ "Key_Battery": 16777470,
+ "Key_Bluetooth": 16777471,
+ "Key_WLAN": 16777472,
+ "Key_UWB": 16777473,
+ "Key_AudioForward": 16777474,
+ "Key_AudioRepeat": 16777475,
+ "Key_AudioRandomPlay": 16777476,
+ "Key_Subtitle": 16777477,
+ "Key_AudioCycleTrack": 16777478,
+ "Key_Time": 16777479,
+ "Key_Hibernate": 16777480,
+ "Key_View": 16777481,
+ "Key_TopMenu": 16777482,
+ "Key_PowerDown": 16777483,
+ "Key_Suspend": 16777484,
+ "Key_ContrastAdjust": 16777485,
+ "Key_LaunchG": 16777486,
+ "Key_LaunchH": 16777487,
+ "Key_TouchpadToggle": 16777488,
+ "Key_TouchpadOn": 16777489,
+ "Key_TouchpadOff": 16777490,
+ "Key_MicMute": 16777491,
+ "Key_Red": 16777492,
+ "Key_Green": 16777493,
+ "Key_Yellow": 16777494,
+ "Key_Blue": 16777495,
+ "Key_ChannelUp": 16777496,
+ "Key_ChannelDown": 16777497,
+ "Key_Guide": 16777498,
+ "Key_Info": 16777499,
+ "Key_Settings": 16777500,
+ "Key_MicVolumeUp": 16777501,
+ "Key_MicVolumeDown": 16777502,
+ "Key_New": 16777504,
+ "Key_Open": 16777505,
+ "Key_Find": 16777506,
+ "Key_Undo": 16777507,
+ "Key_Redo": 16777508,
+ "Key_MediaLast": 16842751,
+ "Key_Select": 16842752,
+ "Key_Yes": 16842753,
+ "Key_No": 16842754,
+ "Key_Cancel": 16908289,
+ "Key_Printer": 16908290,
+ "Key_Execute": 16908291,
+ "Key_Sleep": 16908292,
+ "Key_Play": 16908293,
+ "Key_Zoom": 16908294,
+ "Key_Exit": 16908298,
+ "Key_Context1": 17825792,
+ "Key_Context2": 17825793,
+ "Key_Context3": 17825794,
+ "Key_Context4": 17825795,
+ "Key_Call": 17825796,
+ "Key_Hangup": 17825797,
+ "Key_Flip": 17825798,
+ "Key_ToggleCallHangup": 17825799,
+ "Key_VoiceDial": 17825800,
+ "Key_LastNumberRedial": 17825801,
+ "Key_Camera": 17825824,
+ "Key_CameraFocus": 17825825,
+ "Key_unknown": 33554431
+ }
+ }
+ Enum {
+ name: "ArrowType"
+ values: {
+ "NoArrow": 0,
+ "UpArrow": 1,
+ "DownArrow": 2,
+ "LeftArrow": 3,
+ "RightArrow": 4
+ }
+ }
+ Enum {
+ name: "PenStyle"
+ values: {
+ "NoPen": 0,
+ "SolidLine": 1,
+ "DashLine": 2,
+ "DotLine": 3,
+ "DashDotLine": 4,
+ "DashDotDotLine": 5,
+ "CustomDashLine": 6
+ }
+ }
+ Enum {
+ name: "PenCapStyle"
+ values: {
+ "FlatCap": 0,
+ "SquareCap": 16,
+ "RoundCap": 32,
+ "MPenCapStyle": 48
+ }
+ }
+ Enum {
+ name: "PenJoinStyle"
+ values: {
+ "MiterJoin": 0,
+ "BevelJoin": 64,
+ "RoundJoin": 128,
+ "SvgMiterJoin": 256,
+ "MPenJoinStyle": 448
+ }
+ }
+ Enum {
+ name: "BrushStyle"
+ values: {
+ "NoBrush": 0,
+ "SolidPattern": 1,
+ "Dense1Pattern": 2,
+ "Dense2Pattern": 3,
+ "Dense3Pattern": 4,
+ "Dense4Pattern": 5,
+ "Dense5Pattern": 6,
+ "Dense6Pattern": 7,
+ "Dense7Pattern": 8,
+ "HorPattern": 9,
+ "VerPattern": 10,
+ "CrossPattern": 11,
+ "BDiagPattern": 12,
+ "FDiagPattern": 13,
+ "DiagCrossPattern": 14,
+ "LinearGradientPattern": 15,
+ "RadialGradientPattern": 16,
+ "ConicalGradientPattern": 17,
+ "TexturePattern": 24
+ }
+ }
+ Enum {
+ name: "SizeMode"
+ values: {
+ "AbsoluteSize": 0,
+ "RelativeSize": 1
+ }
+ }
+ Enum {
+ name: "CursorShape"
+ values: {
+ "ArrowCursor": 0,
+ "UpArrowCursor": 1,
+ "CrossCursor": 2,
+ "WaitCursor": 3,
+ "IBeamCursor": 4,
+ "SizeVerCursor": 5,
+ "SizeHorCursor": 6,
+ "SizeBDiagCursor": 7,
+ "SizeFDiagCursor": 8,
+ "SizeAllCursor": 9,
+ "BlankCursor": 10,
+ "SplitVCursor": 11,
+ "SplitHCursor": 12,
+ "PointingHandCursor": 13,
+ "ForbiddenCursor": 14,
+ "WhatsThisCursor": 15,
+ "BusyCursor": 16,
+ "OpenHandCursor": 17,
+ "ClosedHandCursor": 18,
+ "DragCopyCursor": 19,
+ "DragMoveCursor": 20,
+ "DragLinkCursor": 21,
+ "LastCursor": 21,
+ "BitmapCursor": 24,
+ "CustomCursor": 25
+ }
+ }
+ Enum {
+ name: "TextFormat"
+ values: {
+ "PlainText": 0,
+ "RichText": 1,
+ "AutoText": 2
+ }
+ }
+ Enum {
+ name: "AspectRatioMode"
+ values: {
+ "IgnoreAspectRatio": 0,
+ "KeepAspectRatio": 1,
+ "KeepAspectRatioByExpanding": 2
+ }
+ }
+ Enum {
+ name: "DockWidgetArea"
+ values: {
+ "LeftDockWidgetArea": 1,
+ "RightDockWidgetArea": 2,
+ "TopDockWidgetArea": 4,
+ "BottomDockWidgetArea": 8,
+ "DockWidgetArea_Mask": 15,
+ "AllDockWidgetAreas": 15,
+ "NoDockWidgetArea": 0
+ }
+ }
+ Enum {
+ name: "DockWidgetAreas"
+ values: {
+ "LeftDockWidgetArea": 1,
+ "RightDockWidgetArea": 2,
+ "TopDockWidgetArea": 4,
+ "BottomDockWidgetArea": 8,
+ "DockWidgetArea_Mask": 15,
+ "AllDockWidgetAreas": 15,
+ "NoDockWidgetArea": 0
+ }
+ }
+ Enum {
+ name: "ToolBarArea"
+ values: {
+ "LeftToolBarArea": 1,
+ "RightToolBarArea": 2,
+ "TopToolBarArea": 4,
+ "BottomToolBarArea": 8,
+ "ToolBarArea_Mask": 15,
+ "AllToolBarAreas": 15,
+ "NoToolBarArea": 0
+ }
+ }
+ Enum {
+ name: "ToolBarAreas"
+ values: {
+ "LeftToolBarArea": 1,
+ "RightToolBarArea": 2,
+ "TopToolBarArea": 4,
+ "BottomToolBarArea": 8,
+ "ToolBarArea_Mask": 15,
+ "AllToolBarAreas": 15,
+ "NoToolBarArea": 0
+ }
+ }
+ Enum {
+ name: "DateFormat"
+ values: {
+ "TextDate": 0,
+ "ISODate": 1,
+ "SystemLocaleDate": 2,
+ "LocalDate": 2,
+ "LocaleDate": 3,
+ "SystemLocaleShortDate": 4,
+ "SystemLocaleLongDate": 5,
+ "DefaultLocaleShortDate": 6,
+ "DefaultLocaleLongDate": 7,
+ "RFC2822Date": 8
+ }
+ }
+ Enum {
+ name: "TimeSpec"
+ values: {
+ "LocalTime": 0,
+ "UTC": 1,
+ "OffsetFromUTC": 2,
+ "TimeZone": 3
+ }
+ }
+ Enum {
+ name: "DayOfWeek"
+ values: {
+ "Monday": 1,
+ "Tuesday": 2,
+ "Wednesday": 3,
+ "Thursday": 4,
+ "Friday": 5,
+ "Saturday": 6,
+ "Sunday": 7
+ }
+ }
+ Enum {
+ name: "ScrollBarPolicy"
+ values: {
+ "ScrollBarAsNeeded": 0,
+ "ScrollBarAlwaysOff": 1,
+ "ScrollBarAlwaysOn": 2
+ }
+ }
+ Enum {
+ name: "CaseSensitivity"
+ values: {
+ "CaseInsensitive": 0,
+ "CaseSensitive": 1
+ }
+ }
+ Enum {
+ name: "Corner"
+ values: {
+ "TopLeftCorner": 0,
+ "TopRightCorner": 1,
+ "BottomLeftCorner": 2,
+ "BottomRightCorner": 3
+ }
+ }
+ Enum {
+ name: "Edge"
+ values: {
+ "TopEdge": 1,
+ "LeftEdge": 2,
+ "RightEdge": 4,
+ "BottomEdge": 8
+ }
+ }
+ Enum {
+ name: "Edges"
+ values: {
+ "TopEdge": 1,
+ "LeftEdge": 2,
+ "RightEdge": 4,
+ "BottomEdge": 8
+ }
+ }
+ Enum {
+ name: "ConnectionType"
+ values: {
+ "AutoConnection": 0,
+ "DirectConnection": 1,
+ "QueuedConnection": 2,
+ "BlockingQueuedConnection": 3,
+ "UniqueConnection": 128
+ }
+ }
+ Enum {
+ name: "ShortcutContext"
+ values: {
+ "WidgetShortcut": 0,
+ "WindowShortcut": 1,
+ "ApplicationShortcut": 2,
+ "WidgetWithChildrenShortcut": 3
+ }
+ }
+ Enum {
+ name: "FillRule"
+ values: {
+ "OddEvenFill": 0,
+ "WindingFill": 1
+ }
+ }
+ Enum {
+ name: "MaskMode"
+ values: {
+ "MaskInColor": 0,
+ "MaskOutColor": 1
+ }
+ }
+ Enum {
+ name: "ClipOperation"
+ values: {
+ "NoClip": 0,
+ "ReplaceClip": 1,
+ "IntersectClip": 2
+ }
+ }
+ Enum {
+ name: "ItemSelectionMode"
+ values: {
+ "ContainsItemShape": 0,
+ "IntersectsItemShape": 1,
+ "ContainsItemBoundingRect": 2,
+ "IntersectsItemBoundingRect": 3
+ }
+ }
+ Enum {
+ name: "ItemSelectionOperation"
+ values: {
+ "ReplaceSelection": 0,
+ "AddToSelection": 1
+ }
+ }
+ Enum {
+ name: "TransformationMode"
+ values: {
+ "FastTransformation": 0,
+ "SmoothTransformation": 1
+ }
+ }
+ Enum {
+ name: "Axis"
+ values: {
+ "XAxis": 0,
+ "YAxis": 1,
+ "ZAxis": 2
+ }
+ }
+ Enum {
+ name: "FocusReason"
+ values: {
+ "MouseFocusReason": 0,
+ "TabFocusReason": 1,
+ "BacktabFocusReason": 2,
+ "ActiveWindowFocusReason": 3,
+ "PopupFocusReason": 4,
+ "ShortcutFocusReason": 5,
+ "MenuBarFocusReason": 6,
+ "OtherFocusReason": 7,
+ "NoFocusReason": 8
+ }
+ }
+ Enum {
+ name: "ContextMenuPolicy"
+ values: {
+ "NoContextMenu": 0,
+ "DefaultContextMenu": 1,
+ "ActionsContextMenu": 2,
+ "CustomContextMenu": 3,
+ "PreventContextMenu": 4
+ }
+ }
+ Enum {
+ name: "InputMethodQuery"
+ values: {
+ "ImEnabled": 1,
+ "ImCursorRectangle": 2,
+ "ImMicroFocus": 2,
+ "ImFont": 4,
+ "ImCursorPosition": 8,
+ "ImSurroundingText": 16,
+ "ImCurrentSelection": 32,
+ "ImMaximumTextLength": 64,
+ "ImAnchorPosition": 128,
+ "ImHints": 256,
+ "ImPreferredLanguage": 512,
+ "ImAbsolutePosition": 1024,
+ "ImTextBeforeCursor": 2048,
+ "ImTextAfterCursor": 4096,
+ "ImEnterKeyType": 8192,
+ "ImPlatformData": -2147483648,
+ "ImQueryInput": 186,
+ "ImQueryAll": -1
+ }
+ }
+ Enum {
+ name: "InputMethodQueries"
+ values: {
+ "ImEnabled": 1,
+ "ImCursorRectangle": 2,
+ "ImMicroFocus": 2,
+ "ImFont": 4,
+ "ImCursorPosition": 8,
+ "ImSurroundingText": 16,
+ "ImCurrentSelection": 32,
+ "ImMaximumTextLength": 64,
+ "ImAnchorPosition": 128,
+ "ImHints": 256,
+ "ImPreferredLanguage": 512,
+ "ImAbsolutePosition": 1024,
+ "ImTextBeforeCursor": 2048,
+ "ImTextAfterCursor": 4096,
+ "ImEnterKeyType": 8192,
+ "ImPlatformData": -2147483648,
+ "ImQueryInput": 186,
+ "ImQueryAll": -1
+ }
+ }
+ Enum {
+ name: "InputMethodHint"
+ values: {
+ "ImhNone": 0,
+ "ImhHiddenText": 1,
+ "ImhSensitiveData": 2,
+ "ImhNoAutoUppercase": 4,
+ "ImhPreferNumbers": 8,
+ "ImhPreferUppercase": 16,
+ "ImhPreferLowercase": 32,
+ "ImhNoPredictiveText": 64,
+ "ImhDate": 128,
+ "ImhTime": 256,
+ "ImhPreferLatin": 512,
+ "ImhMultiLine": 1024,
+ "ImhDigitsOnly": 65536,
+ "ImhFormattedNumbersOnly": 131072,
+ "ImhUppercaseOnly": 262144,
+ "ImhLowercaseOnly": 524288,
+ "ImhDialableCharactersOnly": 1048576,
+ "ImhEmailCharactersOnly": 2097152,
+ "ImhUrlCharactersOnly": 4194304,
+ "ImhLatinOnly": 8388608,
+ "ImhExclusiveInputMask": -65536
+ }
+ }
+ Enum {
+ name: "InputMethodHints"
+ values: {
+ "ImhNone": 0,
+ "ImhHiddenText": 1,
+ "ImhSensitiveData": 2,
+ "ImhNoAutoUppercase": 4,
+ "ImhPreferNumbers": 8,
+ "ImhPreferUppercase": 16,
+ "ImhPreferLowercase": 32,
+ "ImhNoPredictiveText": 64,
+ "ImhDate": 128,
+ "ImhTime": 256,
+ "ImhPreferLatin": 512,
+ "ImhMultiLine": 1024,
+ "ImhDigitsOnly": 65536,
+ "ImhFormattedNumbersOnly": 131072,
+ "ImhUppercaseOnly": 262144,
+ "ImhLowercaseOnly": 524288,
+ "ImhDialableCharactersOnly": 1048576,
+ "ImhEmailCharactersOnly": 2097152,
+ "ImhUrlCharactersOnly": 4194304,
+ "ImhLatinOnly": 8388608,
+ "ImhExclusiveInputMask": -65536
+ }
+ }
+ Enum {
+ name: "EnterKeyType"
+ values: {
+ "EnterKeyDefault": 0,
+ "EnterKeyReturn": 1,
+ "EnterKeyDone": 2,
+ "EnterKeyGo": 3,
+ "EnterKeySend": 4,
+ "EnterKeySearch": 5,
+ "EnterKeyNext": 6,
+ "EnterKeyPrevious": 7
+ }
+ }
+ Enum {
+ name: "ToolButtonStyle"
+ values: {
+ "ToolButtonIconOnly": 0,
+ "ToolButtonTextOnly": 1,
+ "ToolButtonTextBesideIcon": 2,
+ "ToolButtonTextUnderIcon": 3,
+ "ToolButtonFollowStyle": 4
+ }
+ }
+ Enum {
+ name: "LayoutDirection"
+ values: {
+ "LeftToRight": 0,
+ "RightToLeft": 1,
+ "LayoutDirectionAuto": 2
+ }
+ }
+ Enum {
+ name: "DropAction"
+ values: {
+ "CopyAction": 1,
+ "MoveAction": 2,
+ "LinkAction": 4,
+ "ActionMask": 255,
+ "TargetMoveAction": 32770,
+ "IgnoreAction": 0
+ }
+ }
+ Enum {
+ name: "DropActions"
+ values: {
+ "CopyAction": 1,
+ "MoveAction": 2,
+ "LinkAction": 4,
+ "ActionMask": 255,
+ "TargetMoveAction": 32770,
+ "IgnoreAction": 0
+ }
+ }
+ Enum {
+ name: "CheckState"
+ values: {
+ "Unchecked": 0,
+ "PartiallyChecked": 1,
+ "Checked": 2
+ }
+ }
+ Enum {
+ name: "ItemDataRole"
+ values: {
+ "DisplayRole": 0,
+ "DecorationRole": 1,
+ "EditRole": 2,
+ "ToolTipRole": 3,
+ "StatusTipRole": 4,
+ "WhatsThisRole": 5,
+ "FontRole": 6,
+ "TextAlignmentRole": 7,
+ "BackgroundColorRole": 8,
+ "BackgroundRole": 8,
+ "TextColorRole": 9,
+ "ForegroundRole": 9,
+ "CheckStateRole": 10,
+ "AccessibleTextRole": 11,
+ "AccessibleDescriptionRole": 12,
+ "SizeHintRole": 13,
+ "InitialSortOrderRole": 14,
+ "DisplayPropertyRole": 27,
+ "DecorationPropertyRole": 28,
+ "ToolTipPropertyRole": 29,
+ "StatusTipPropertyRole": 30,
+ "WhatsThisPropertyRole": 31,
+ "UserRole": 256
+ }
+ }
+ Enum {
+ name: "ItemFlags"
+ values: {
+ "NoItemFlags": 0,
+ "ItemIsSelectable": 1,
+ "ItemIsEditable": 2,
+ "ItemIsDragEnabled": 4,
+ "ItemIsDropEnabled": 8,
+ "ItemIsUserCheckable": 16,
+ "ItemIsEnabled": 32,
+ "ItemIsAutoTristate": 64,
+ "ItemIsTristate": 64,
+ "ItemNeverHasChildren": 128,
+ "ItemIsUserTristate": 256
+ }
+ }
+ Enum {
+ name: "MatchFlags"
+ values: {
+ "MatchExactly": 0,
+ "MatchContains": 1,
+ "MatchStartsWith": 2,
+ "MatchEndsWith": 3,
+ "MatchRegExp": 4,
+ "MatchWildcard": 5,
+ "MatchFixedString": 8,
+ "MatchCaseSensitive": 16,
+ "MatchWrap": 32,
+ "MatchRecursive": 64
+ }
+ }
+ Enum {
+ name: "WindowModality"
+ values: {
+ "NonModal": 0,
+ "WindowModal": 1,
+ "ApplicationModal": 2
+ }
+ }
+ Enum {
+ name: "TextInteractionFlag"
+ values: {
+ "NoTextInteraction": 0,
+ "TextSelectableByMouse": 1,
+ "TextSelectableByKeyboard": 2,
+ "LinksAccessibleByMouse": 4,
+ "LinksAccessibleByKeyboard": 8,
+ "TextEditable": 16,
+ "TextEditorInteraction": 19,
+ "TextBrowserInteraction": 13
+ }
+ }
+ Enum {
+ name: "TextInteractionFlags"
+ values: {
+ "NoTextInteraction": 0,
+ "TextSelectableByMouse": 1,
+ "TextSelectableByKeyboard": 2,
+ "LinksAccessibleByMouse": 4,
+ "LinksAccessibleByKeyboard": 8,
+ "TextEditable": 16,
+ "TextEditorInteraction": 19,
+ "TextBrowserInteraction": 13
+ }
+ }
+ Enum {
+ name: "SizeHint"
+ values: {
+ "MinimumSize": 0,
+ "PreferredSize": 1,
+ "MaximumSize": 2,
+ "MinimumDescent": 3,
+ "NSizeHints": 4
+ }
+ }
+ Enum {
+ name: "TouchPointStates"
+ values: {
+ "TouchPointPressed": 1,
+ "TouchPointMoved": 2,
+ "TouchPointStationary": 4,
+ "TouchPointReleased": 8
+ }
+ }
+ Enum {
+ name: "GestureState"
+ values: {
+ "NoGesture": 0,
+ "GestureStarted": 1,
+ "GestureUpdated": 2,
+ "GestureFinished": 3,
+ "GestureCanceled": 4
+ }
+ }
+ Enum {
+ name: "GestureType"
+ values: {
+ "TapGesture": 1,
+ "TapAndHoldGesture": 2,
+ "PanGesture": 3,
+ "PinchGesture": 4,
+ "SwipeGesture": 5,
+ "CustomGesture": 256,
+ "LastGestureType": -1
+ }
+ }
+ Enum {
+ name: "NativeGestureType"
+ values: {
+ "BeginNativeGesture": 0,
+ "EndNativeGesture": 1,
+ "PanNativeGesture": 2,
+ "ZoomNativeGesture": 3,
+ "SmartZoomNativeGesture": 4,
+ "RotateNativeGesture": 5,
+ "SwipeNativeGesture": 6
+ }
+ }
+ Enum {
+ name: "CursorMoveStyle"
+ values: {
+ "LogicalMoveStyle": 0,
+ "VisualMoveStyle": 1
+ }
+ }
+ Enum {
+ name: "TimerType"
+ values: {
+ "PreciseTimer": 0,
+ "CoarseTimer": 1,
+ "VeryCoarseTimer": 2
+ }
+ }
+ Enum {
+ name: "ScrollPhase"
+ values: {
+ "ScrollBegin": 1,
+ "ScrollUpdate": 2,
+ "ScrollEnd": 3
+ }
+ }
+ Enum {
+ name: "MouseEventSource"
+ values: {
+ "MouseEventNotSynthesized": 0,
+ "MouseEventSynthesizedBySystem": 1,
+ "MouseEventSynthesizedByQt": 2,
+ "MouseEventSynthesizedByApplication": 3
+ }
+ }
+ Enum {
+ name: "MouseEventFlag"
+ values: {
+ "MouseEventCreatedDoubleClick": 1,
+ "MouseEventFlagMask": 255
+ }
+ }
+ }
+ Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" }
+}
diff --git a/src/imports/folderlistmodel/fileinfothread.cpp b/src/imports/folderlistmodel/fileinfothread.cpp
index e1db7834ec..ebdfba42a8 100644
--- a/src/imports/folderlistmodel/fileinfothread.cpp
+++ b/src/imports/folderlistmodel/fileinfothread.cpp
@@ -251,7 +251,8 @@ void FileInfoThread::getFileInfos(const QString &path)
fileInfoList = currentDir.entryInfoList(nameFilters, filter, sortFlags);
if (!fileInfoList.isEmpty()) {
- foreach (QFileInfo info, fileInfoList) {
+ filePropertyList.reserve(fileInfoList.count());
+ foreach (const QFileInfo &info, fileInfoList) {
//qDebug() << "Adding file : " << info.fileName() << "to list ";
filePropertyList << FileProperty(info);
}
diff --git a/src/imports/folderlistmodel/fileinfothread_p.h b/src/imports/folderlistmodel/fileinfothread_p.h
index ee325fa50b..b375584ff8 100644
--- a/src/imports/folderlistmodel/fileinfothread_p.h
+++ b/src/imports/folderlistmodel/fileinfothread_p.h
@@ -34,6 +34,17 @@
#ifndef FILEINFOTHREAD_P_H
#define FILEINFOTHREAD_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QThread>
#include <QMutex>
#include <QWaitCondition>
diff --git a/src/imports/folderlistmodel/fileproperty_p.h b/src/imports/folderlistmodel/fileproperty_p.h
index d514ad55bc..3ec8cc0c00 100644
--- a/src/imports/folderlistmodel/fileproperty_p.h
+++ b/src/imports/folderlistmodel/fileproperty_p.h
@@ -34,6 +34,17 @@
#ifndef FILEPROPERTY_P_H
#define FILEPROPERTY_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QFileInfo>
#include <QDateTime>
diff --git a/src/imports/folderlistmodel/plugins.qmltypes b/src/imports/folderlistmodel/plugins.qmltypes
index a55d3a3499..02127c63cb 100644
--- a/src/imports/folderlistmodel/plugins.qmltypes
+++ b/src/imports/folderlistmodel/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
@@ -7,6 +7,272 @@ import QtQuick.tooling 1.1
// 'qmlplugindump -nonrelocatable Qt.labs.folderlistmodel 2.1'
Module {
+ dependencies: []
+ Component {
+ name: "QAbstractItemModel"
+ prototype: "QObject"
+ Enum {
+ name: "LayoutChangeHint"
+ values: {
+ "NoLayoutChangeHint": 0,
+ "VerticalSortHint": 1,
+ "HorizontalSortHint": 2
+ }
+ }
+ Signal {
+ name: "dataChanged"
+ Parameter { name: "topLeft"; type: "QModelIndex" }
+ Parameter { name: "bottomRight"; type: "QModelIndex" }
+ Parameter { name: "roles"; type: "QVector<int>" }
+ }
+ Signal {
+ name: "dataChanged"
+ Parameter { name: "topLeft"; type: "QModelIndex" }
+ Parameter { name: "bottomRight"; type: "QModelIndex" }
+ }
+ Signal {
+ name: "headerDataChanged"
+ Parameter { name: "orientation"; type: "Qt::Orientation" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "layoutChanged"
+ Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+ Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+ }
+ Signal {
+ name: "layoutChanged"
+ Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+ }
+ Signal { name: "layoutChanged" }
+ Signal {
+ name: "layoutAboutToBeChanged"
+ Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+ Parameter { name: "hint"; type: "QAbstractItemModel::LayoutChangeHint" }
+ }
+ Signal {
+ name: "layoutAboutToBeChanged"
+ Parameter { name: "parents"; type: "QList<QPersistentModelIndex>" }
+ }
+ Signal { name: "layoutAboutToBeChanged" }
+ Signal {
+ name: "rowsAboutToBeInserted"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "rowsInserted"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "rowsAboutToBeRemoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "rowsRemoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "columnsAboutToBeInserted"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "columnsInserted"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "columnsAboutToBeRemoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal {
+ name: "columnsRemoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "first"; type: "int" }
+ Parameter { name: "last"; type: "int" }
+ }
+ Signal { name: "modelAboutToBeReset" }
+ Signal { name: "modelReset" }
+ Signal {
+ name: "rowsAboutToBeMoved"
+ Parameter { name: "sourceParent"; type: "QModelIndex" }
+ Parameter { name: "sourceStart"; type: "int" }
+ Parameter { name: "sourceEnd"; type: "int" }
+ Parameter { name: "destinationParent"; type: "QModelIndex" }
+ Parameter { name: "destinationRow"; type: "int" }
+ }
+ Signal {
+ name: "rowsMoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ Parameter { name: "destination"; type: "QModelIndex" }
+ Parameter { name: "row"; type: "int" }
+ }
+ Signal {
+ name: "columnsAboutToBeMoved"
+ Parameter { name: "sourceParent"; type: "QModelIndex" }
+ Parameter { name: "sourceStart"; type: "int" }
+ Parameter { name: "sourceEnd"; type: "int" }
+ Parameter { name: "destinationParent"; type: "QModelIndex" }
+ Parameter { name: "destinationColumn"; type: "int" }
+ }
+ Signal {
+ name: "columnsMoved"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ Parameter { name: "destination"; type: "QModelIndex" }
+ Parameter { name: "column"; type: "int" }
+ }
+ Method { name: "submit"; type: "bool" }
+ Method { name: "revert" }
+ Method {
+ name: "hasIndex"
+ type: "bool"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "hasIndex"
+ type: "bool"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ }
+ Method {
+ name: "index"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "index"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ }
+ Method {
+ name: "parent"
+ type: "QModelIndex"
+ Parameter { name: "child"; type: "QModelIndex" }
+ }
+ Method {
+ name: "sibling"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "idx"; type: "QModelIndex" }
+ }
+ Method {
+ name: "rowCount"
+ type: "int"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "rowCount"; type: "int" }
+ Method {
+ name: "columnCount"
+ type: "int"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "columnCount"; type: "int" }
+ Method {
+ name: "hasChildren"
+ type: "bool"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "hasChildren"; type: "bool" }
+ Method {
+ name: "data"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "data"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QModelIndex" }
+ }
+ Method {
+ name: "setData"
+ type: "bool"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "setData"
+ type: "bool"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "value"; type: "QVariant" }
+ }
+ Method {
+ name: "headerData"
+ type: "QVariant"
+ Parameter { name: "section"; type: "int" }
+ Parameter { name: "orientation"; type: "Qt::Orientation" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "headerData"
+ type: "QVariant"
+ Parameter { name: "section"; type: "int" }
+ Parameter { name: "orientation"; type: "Qt::Orientation" }
+ }
+ Method {
+ name: "fetchMore"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "canFetchMore"
+ type: "bool"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "flags"
+ type: "Qt::ItemFlags"
+ Parameter { name: "index"; type: "QModelIndex" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "hits"; type: "int" }
+ Parameter { name: "flags"; type: "Qt::MatchFlags" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "hits"; type: "int" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ }
+ }
+ Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
Component {
name: "QQuickFolderListModel"
prototype: "QAbstractListModel"
@@ -52,5 +318,10 @@ Module {
Parameter { name: "idx"; type: "int" }
Parameter { name: "property"; type: "string" }
}
+ Method {
+ name: "indexOf"
+ type: "int"
+ Parameter { name: "file"; type: "QUrl" }
+ }
}
}
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 80b32e64ef..8bfbf09769 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -197,7 +197,7 @@ QString QQuickFolderListModelPrivate::resolvePath(const QUrl &path)
QUrl localUrl = QUrl(localPath);
QString fullPath = localUrl.path();
if (localUrl.scheme().length())
- fullPath = localUrl.scheme() + ":" + fullPath;
+ fullPath = localUrl.scheme() + QLatin1Char(':') + fullPath;
return QDir::cleanPath(fullPath);
}
@@ -788,6 +788,20 @@ QVariant QQuickFolderListModel::get(int idx, const QString &property) const
return QVariant();
}
+/*!
+ \qmlmethod int FolderListModel::indexOf(url file)
+ \since 5.6
+
+ Get the index of the given file URL if the model contains it,
+ or -1 if not.
+*/
+int QQuickFolderListModel::indexOf(const QUrl &file) const
+{
+ Q_D(const QQuickFolderListModel);
+ FileProperty toFind(QFileInfo(file.toLocalFile()));
+ return d->data.indexOf(toFind);
+}
+
#include "moc_qquickfolderlistmodel.cpp"
//![code]
diff --git a/src/imports/folderlistmodel/qquickfolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 63ed528556..fcfec56c87 100644
--- a/src/imports/folderlistmodel/qquickfolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -109,9 +109,9 @@ public:
void setNameFilters(const QStringList &filters);
enum SortField { Unsorted, Name, Time, Size, Type };
+ Q_ENUM(SortField)
SortField sortField() const;
void setSortField(SortField field);
- Q_ENUMS(SortField)
bool sortReversed() const;
void setSortReversed(bool rev);
@@ -132,6 +132,7 @@ public:
Q_INVOKABLE bool isFolder(int index) const;
Q_INVOKABLE QVariant get(int idx, const QString &property) const;
+ Q_INVOKABLE int indexOf(const QUrl &file) const;
//![parserstatus]
virtual void classBegin();
diff --git a/src/imports/imports.pro b/src/imports/imports.pro
index d0d47aa38c..f7002f9ed5 100644
--- a/src/imports/imports.pro
+++ b/src/imports/imports.pro
@@ -1,6 +1,7 @@
TEMPLATE = subdirs
SUBDIRS += \
+ qtqml \
folderlistmodel \
localstorage \
models \
@@ -16,3 +17,35 @@ qtHaveModule(quick) {
}
qtHaveModule(xmlpatterns) : SUBDIRS += xmllistmodel
+
+
+QMLTYPEFILE = builtins.qmltypes
+
+# install rule
+builtins.files = $$QMLTYPEFILE
+builtins.path = $$[QT_INSTALL_QML]
+INSTALLS += builtins
+
+# copy to build directory
+!force_independent:if(!debug_and_release|!build_all|CONFIG(release, debug|release)) {
+ defineReplace(qmlModStripSrcDir) {
+ return($$relative_path($$1, $$_PRO_FILE_PWD_))
+ }
+
+ qmltypes2build.input = QMLTYPEFILE
+ qmltypes2build.output = $$[QT_INSTALL_QML]/${QMAKE_FUNC_FILE_IN_qmlModStripSrcDir}
+ !contains(TEMPLATE, vc.*): qmltypes2build.variable_out = PRE_TARGETDEPS
+ qmltypes2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
+ qmltypes2build.name = COPY ${QMAKE_FILE_IN}
+ qmltypes2build.CONFIG = no_link no_clean
+
+ QMAKE_EXTRA_COMPILERS += qmltypes2build
+}
+
+# qmltypes target
+!cross_compile:if(build_pass|!debug_and_release) {
+ qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
+
+ qmltypes.commands = $$QMLPLUGINDUMP -builtins > $$PWD/$$QMLTYPEFILE
+ QMAKE_EXTRA_TARGETS += qmltypes
+}
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index b0ba3f9228..ada50774a7 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -68,7 +68,7 @@ QT_BEGIN_NAMESPACE
QV4::ScopedString v(scope, scope.engine->newString(desc)); \
QV4::ScopedObject ex(scope, scope.engine->newErrorObject(v)); \
ex->put(QV4::ScopedString(scope, scope.engine->newIdentifier(QStringLiteral("code"))).getPointer(), QV4::ScopedValue(scope, Primitive::fromInt32(error))); \
- args->setReturnValue(ctx->engine()->throwError(ex)); \
+ args->setReturnValue(scope.engine->throwError(ex)); \
return; \
}
@@ -97,7 +97,10 @@ namespace QV4 {
namespace Heap {
struct QQmlSqlDatabaseWrapper : public Object {
enum Type { Database, Query, Rows };
- QQmlSqlDatabaseWrapper(ExecutionEngine *e);
+ QQmlSqlDatabaseWrapper()
+ {
+ type = Database;
+ }
Type type;
QSqlDatabase database;
@@ -120,13 +123,13 @@ public:
static Heap::QQmlSqlDatabaseWrapper *create(QV4::ExecutionEngine *engine)
{
- return engine->memoryManager->alloc<QQmlSqlDatabaseWrapper>(engine);
+ return engine->memoryManager->allocObject<QQmlSqlDatabaseWrapper>();
}
~QQmlSqlDatabaseWrapper() {
}
- static ReturnedValue getIndexed(Managed *m, uint index, bool *hasProperty);
+ static ReturnedValue getIndexed(const Managed *m, uint index, bool *hasProperty);
};
}
@@ -135,11 +138,7 @@ using namespace QV4;
DEFINE_OBJECT_VTABLE(QV4::QQmlSqlDatabaseWrapper);
-QV4::Heap::QQmlSqlDatabaseWrapper::QQmlSqlDatabaseWrapper(ExecutionEngine *e)
- : QV4::Heap::Object(e)
-{
- type = Database;
-}
+
static ReturnedValue qmlsqldatabase_version(CallContext *ctx)
{
@@ -214,7 +213,7 @@ static QString qmlsqldatabase_databaseFile(const QString& connectionName, QV4::E
return qmlsqldatabase_databasesPath(engine) + QDir::separator() + connectionName;
}
-static ReturnedValue qmlsqldatabase_rows_index(QQmlSqlDatabaseWrapper *r, ExecutionEngine *v4, quint32 index, bool *hasProperty = 0)
+static ReturnedValue qmlsqldatabase_rows_index(const QQmlSqlDatabaseWrapper *r, ExecutionEngine *v4, quint32 index, bool *hasProperty = 0)
{
Scope scope(v4);
@@ -238,15 +237,14 @@ static ReturnedValue qmlsqldatabase_rows_index(QQmlSqlDatabaseWrapper *r, Execut
}
}
-ReturnedValue QQmlSqlDatabaseWrapper::getIndexed(Managed *m, uint index, bool *hasProperty)
+ReturnedValue QQmlSqlDatabaseWrapper::getIndexed(const Managed *m, uint index, bool *hasProperty)
{
- QV4::Scope scope(static_cast<QQmlSqlDatabaseWrapper *>(m)->engine());
Q_ASSERT(m->as<QQmlSqlDatabaseWrapper>());
- QV4::Scoped<QQmlSqlDatabaseWrapper> r(scope, static_cast<QQmlSqlDatabaseWrapper *>(m));
+ const QQmlSqlDatabaseWrapper *r = static_cast<const QQmlSqlDatabaseWrapper *>(m);
if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Rows)
return Object::getIndexed(m, index, hasProperty);
- return qmlsqldatabase_rows_index(r, scope.engine, index, hasProperty);
+ return qmlsqldatabase_rows_index(r, r->engine(), index, hasProperty);
}
static ReturnedValue qmlsqldatabase_rows_item(CallContext *ctx)
@@ -285,13 +283,13 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
if (query.prepare(sql)) {
if (ctx->argc() > 1) {
ScopedValue values(scope, ctx->args()[1]);
- if (values->asArrayObject()) {
+ if (values->as<ArrayObject>()) {
ScopedArrayObject array(scope, values);
quint32 size = array->getLength();
QV4::ScopedValue v(scope);
for (quint32 ii = 0; ii < size; ++ii)
query.bindValue(ii, scope.engine->toVariant((v = array->getIndexed(ii)), -1));
- } else if (values->asObject()) {
+ } else if (values->as<Object>()) {
ScopedObject object(scope, values);
ObjectIterator it(scope, object, ObjectIterator::WithProtoChain|ObjectIterator::EnumerableOnly);
ScopedValue key(scope);
@@ -304,7 +302,7 @@ static ReturnedValue qmlsqldatabase_executeSql(CallContext *ctx)
if (key->isString()) {
query.bindValue(key->stringValue()->toQString(), v);
} else {
- assert(key->isInteger());
+ Q_ASSERT(key->isInteger());
query.bindValue(key->integerValue(), v);
}
}
@@ -401,7 +399,7 @@ static ReturnedValue qmlsqldatabase_changeVersion(CallContext *ctx)
db.transaction();
ScopedCallData callData(scope, 1);
- callData->thisObject = scope.engine->globalObject();
+ callData->thisObject = scope.engine->globalObject;
callData->args[0] = w;
TransactionRollback rollbackOnException(&db, &w->d()->inTransaction);
@@ -433,7 +431,7 @@ static ReturnedValue qmlsqldatabase_transaction_shared(CallContext *ctx, bool re
if (!r || r->d()->type != Heap::QQmlSqlDatabaseWrapper::Database)
V4THROW_REFERENCE("Not a SQLDatabase object");
- FunctionObject *callback = ctx->argc() ? ctx->args()[0].asFunctionObject() : 0;
+ const FunctionObject *callback = ctx->argc() ? ctx->args()[0].as<FunctionObject>() : 0;
if (!callback)
V4THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR, QQmlEngine::tr("transaction: missing callback"));
@@ -450,7 +448,7 @@ static ReturnedValue qmlsqldatabase_transaction_shared(CallContext *ctx, bool re
db.transaction();
if (callback) {
ScopedCallData callData(scope, 1);
- callData->thisObject = scope.engine->globalObject();
+ callData->thisObject = scope.engine->globalObject;
callData->args[0] = w;
TransactionRollback rollbackOnException(&db, &w->d()->inTransaction);
callback->call(callData);
@@ -660,7 +658,6 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args)
{
#ifndef QT_NO_SETTINGS
QV4::Scope scope(args->v4engine());
- QV4::ScopedContext ctx(scope, args->v4engine()->currentContext());
if (scope.engine->qmlEngine()->offlineStoragePath().isEmpty())
V4THROW_SQL2(SQLEXCEPTION_DATABASE_ERR, QQmlEngine::tr("SQL: can't create database, offline storage is disabled."));
@@ -673,7 +670,7 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args)
QString dbversion = (v = (*args)[1])->toQStringNoThrow();
QString dbdescription = (v = (*args)[2])->toQStringNoThrow();
int dbestimatedsize = (v = (*args)[3])->toInt32();
- FunctionObject *dbcreationCallback = (v = (*args)[4])->asFunctionObject();
+ FunctionObject *dbcreationCallback = (v = (*args)[4])->as<FunctionObject>();
QCryptographicHash md5(QCryptographicHash::Md5);
md5.addData(dbname.toUtf8());
@@ -722,9 +719,8 @@ void QQuickLocalStorage::openDatabaseSync(QQmlV4Function *args)
db->d()->version = version;
if (created && dbcreationCallback) {
- Scope scope(ctx);
ScopedCallData callData(scope, 1);
- callData->thisObject = scope.engine->globalObject();
+ callData->thisObject = scope.engine->globalObject;
callData->args[0] = db;
dbcreationCallback->call(callData);
}
diff --git a/src/imports/localstorage/plugins.qmltypes b/src/imports/localstorage/plugins.qmltypes
index ff4c897f58..7d81cdf6f4 100644
--- a/src/imports/localstorage/plugins.qmltypes
+++ b/src/imports/localstorage/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
// 'qmlplugindump -nonrelocatable QtQuick.LocalStorage 2.0'
Module {
+ dependencies: []
Component {
name: "QQuickLocalStorage"
prototype: "QObject"
diff --git a/src/imports/models/models.pro b/src/imports/models/models.pro
index 6a2952cd82..c94ba833ad 100644
--- a/src/imports/models/models.pro
+++ b/src/imports/models/models.pro
@@ -1,7 +1,7 @@
CXX_MODULE = qml
TARGET = modelsplugin
TARGETPATH = QtQml/Models.2
-IMPORT_VERSION = 2.2
+IMPORT_VERSION = 2.3
SOURCES += \
plugin.cpp
diff --git a/src/imports/models/plugins.qmltypes b/src/imports/models/plugins.qmltypes
index e81a971e79..0bd52a13fd 100644
--- a/src/imports/models/plugins.qmltypes
+++ b/src/imports/models/plugins.qmltypes
@@ -1,12 +1,13 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQml.Models 2.2'
+// 'qmlplugindump -nonrelocatable QtQml.Models 2.3'
Module {
+ dependencies: []
Component {
name: "QAbstractItemModel"
prototype: "QObject"
@@ -527,10 +528,55 @@ Module {
name: "QQmlObjectModel"
defaultProperty: "children"
prototype: "QQmlInstanceModel"
- exports: ["QtQml.Models/ObjectModel 2.1"]
- exportMetaObjectRevisions: [0]
+ exports: [
+ "QtQml.Models/ObjectModel 2.1",
+ "QtQml.Models/ObjectModel 2.3"
+ ]
+ exportMetaObjectRevisions: [0, 3]
attachedType: "QQmlObjectModelAttached"
Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
+ Method { name: "clear"; revision: 3 }
+ Method {
+ name: "get"
+ revision: 3
+ type: "QObject*"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "append"
+ revision: 3
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "insert"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "move"
+ revision: 3
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ Parameter { name: "n"; type: "int" }
+ }
+ Method {
+ name: "move"
+ revision: 3
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ }
+ Method {
+ name: "remove"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "n"; type: "int" }
+ }
+ Method {
+ name: "remove"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ }
}
Component {
name: "QQmlObjectModelAttached"
diff --git a/src/imports/particles/plugins.qmltypes b/src/imports/particles/plugins.qmltypes
index b1b825dea6..ce78392610 100644
--- a/src/imports/particles/plugins.qmltypes
+++ b/src/imports/particles/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
// 'qmlplugindump -nonrelocatable QtQuick.Particles 2.0'
Module {
+ dependencies: []
Component {
name: "QQuickAgeAffector"
defaultProperty: "data"
@@ -491,6 +492,160 @@ Module {
}
}
Component {
+ name: "QQuickItem"
+ defaultProperty: "data"
+ prototype: "QObject"
+ Enum {
+ name: "TransformOrigin"
+ values: {
+ "TopLeft": 0,
+ "Top": 1,
+ "TopRight": 2,
+ "Left": 3,
+ "Center": 4,
+ "Right": 5,
+ "BottomLeft": 6,
+ "Bottom": 7,
+ "BottomRight": 8
+ }
+ }
+ Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "x"; type: "double" }
+ Property { name: "y"; type: "double" }
+ Property { name: "z"; type: "double" }
+ Property { name: "width"; type: "double" }
+ Property { name: "height"; type: "double" }
+ Property { name: "opacity"; type: "double" }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+ Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+ Property { name: "state"; type: "string" }
+ Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+ Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+ Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baselineOffset"; type: "double" }
+ Property { name: "clip"; type: "bool" }
+ Property { name: "focus"; type: "bool" }
+ Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+ Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+ Property { name: "rotation"; type: "double" }
+ Property { name: "scale"; type: "double" }
+ Property { name: "transformOrigin"; type: "TransformOrigin" }
+ Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+ Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+ Property { name: "smooth"; type: "bool" }
+ Property { name: "antialiasing"; type: "bool" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+ Signal {
+ name: "childrenRectChanged"
+ Parameter { type: "QRectF" }
+ }
+ Signal {
+ name: "baselineOffsetChanged"
+ Parameter { type: "double" }
+ }
+ Signal {
+ name: "stateChanged"
+ Parameter { type: "string" }
+ }
+ Signal {
+ name: "focusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusOnTabChanged"
+ revision: 1
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "parentChanged"
+ Parameter { type: "QQuickItem"; isPointer: true }
+ }
+ Signal {
+ name: "transformOriginChanged"
+ Parameter { type: "TransformOrigin" }
+ }
+ Signal {
+ name: "smoothChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "antialiasingChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "clipChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "windowChanged"
+ revision: 1
+ Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+ }
+ Method { name: "update" }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "targetSize"; type: "QSize" }
+ }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "contains"
+ type: "bool"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapFromItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapToItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method { name: "forceActiveFocus" }
+ Method {
+ name: "forceActiveFocus"
+ Parameter { name: "reason"; type: "Qt::FocusReason" }
+ }
+ Method {
+ name: "nextItemInFocusChain"
+ revision: 1
+ type: "QQuickItem*"
+ Parameter { name: "forward"; type: "bool" }
+ }
+ Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+ Method {
+ name: "childAt"
+ type: "QQuickItem*"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ }
+ Component {
name: "QQuickItemParticle"
defaultProperty: "data"
prototype: "QQuickParticlePainter"
@@ -996,6 +1151,56 @@ Module {
}
}
Component {
+ name: "QQuickStochasticState"
+ prototype: "QObject"
+ Property { name: "duration"; type: "int" }
+ Property { name: "durationVariation"; type: "int" }
+ Property { name: "randomStart"; type: "bool" }
+ Property { name: "to"; type: "QVariantMap" }
+ Property { name: "name"; type: "string" }
+ Signal {
+ name: "durationChanged"
+ Parameter { name: "arg"; type: "int" }
+ }
+ Signal {
+ name: "nameChanged"
+ Parameter { name: "arg"; type: "string" }
+ }
+ Signal {
+ name: "toChanged"
+ Parameter { name: "arg"; type: "QVariantMap" }
+ }
+ Signal {
+ name: "durationVariationChanged"
+ Parameter { name: "arg"; type: "int" }
+ }
+ Signal { name: "entered" }
+ Signal {
+ name: "randomStartChanged"
+ Parameter { name: "arg"; type: "bool" }
+ }
+ Method {
+ name: "setDuration"
+ Parameter { name: "arg"; type: "int" }
+ }
+ Method {
+ name: "setName"
+ Parameter { name: "arg"; type: "string" }
+ }
+ Method {
+ name: "setTo"
+ Parameter { name: "arg"; type: "QVariantMap" }
+ }
+ Method {
+ name: "setDurationVariation"
+ Parameter { name: "arg"; type: "int" }
+ }
+ Method {
+ name: "setRandomStart"
+ Parameter { name: "arg"; type: "bool" }
+ }
+ }
+ Component {
name: "QQuickTargetDirection"
prototype: "QQuickDirection"
exports: ["QtQuick.Particles/TargetDirection 2.0"]
diff --git a/src/imports/qtqml/plugins.qmltypes b/src/imports/qtqml/plugins.qmltypes
new file mode 100644
index 0000000000..864aca1f32
--- /dev/null
+++ b/src/imports/qtqml/plugins.qmltypes
@@ -0,0 +1,222 @@
+import QtQuick.tooling 1.2
+
+// This file describes the plugin-supplied types contained in the library.
+// It is used for QML tooling purposes only.
+//
+// This file was auto-generated by:
+// 'qmlplugindump -nonrelocatable QtQml 2.2'
+
+Module {
+ dependencies: []
+ Component {
+ name: "QObject"
+ exports: ["QtQml/QtObject 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "objectName"; type: "string" }
+ Signal {
+ name: "objectNameChanged"
+ Parameter { name: "objectName"; type: "string" }
+ }
+ Method { name: "toString" }
+ Method { name: "destroy" }
+ Method {
+ name: "destroy"
+ Parameter { name: "delay"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQmlBind"
+ prototype: "QObject"
+ exports: ["QtQml/Binding 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "target"; type: "QObject"; isPointer: true }
+ Property { name: "property"; type: "string" }
+ Property { name: "value"; type: "QVariant" }
+ Property { name: "when"; type: "bool" }
+ }
+ Component {
+ name: "QQmlComponent"
+ prototype: "QObject"
+ exports: ["QML/Component 1.0", "QtQml/Component 2.0"]
+ exportMetaObjectRevisions: [0, 0]
+ attachedType: "QQmlComponentAttached"
+ Enum {
+ name: "CompilationMode"
+ values: {
+ "PreferSynchronous": 0,
+ "Asynchronous": 1
+ }
+ }
+ Enum {
+ name: "Status"
+ values: {
+ "Null": 0,
+ "Ready": 1,
+ "Loading": 2,
+ "Error": 3
+ }
+ }
+ Property { name: "progress"; type: "double"; isReadonly: true }
+ Property { name: "status"; type: "Status"; isReadonly: true }
+ Property { name: "url"; type: "QUrl"; isReadonly: true }
+ Signal {
+ name: "statusChanged"
+ Parameter { type: "QQmlComponent::Status" }
+ }
+ Signal {
+ name: "progressChanged"
+ Parameter { type: "double" }
+ }
+ Method {
+ name: "loadUrl"
+ Parameter { name: "url"; type: "QUrl" }
+ }
+ Method {
+ name: "loadUrl"
+ Parameter { name: "url"; type: "QUrl" }
+ Parameter { name: "mode"; type: "CompilationMode" }
+ }
+ Method {
+ name: "setData"
+ Parameter { type: "QByteArray" }
+ Parameter { name: "baseUrl"; type: "QUrl" }
+ }
+ Method { name: "errorString"; type: "string" }
+ }
+ Component {
+ name: "QQmlComponentAttached"
+ prototype: "QObject"
+ Signal { name: "completed" }
+ Signal { name: "destruction" }
+ }
+ Component {
+ name: "QQmlConnections"
+ prototype: "QObject"
+ exports: ["QtQml/Connections 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "target"; type: "QObject"; isPointer: true }
+ Property { name: "ignoreUnknownSignals"; type: "bool" }
+ }
+ Component {
+ name: "QQmlInstanceModel"
+ prototype: "QObject"
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Signal {
+ name: "modelUpdated"
+ Parameter { name: "changeSet"; type: "QQmlChangeSet" }
+ Parameter { name: "reset"; type: "bool" }
+ }
+ Signal {
+ name: "createdItem"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Signal {
+ name: "initItem"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Signal {
+ name: "destroyingItem"
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QQmlInstantiator"
+ defaultProperty: "delegate"
+ prototype: "QObject"
+ exports: ["QtQml/Instantiator 2.1"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "active"; type: "bool" }
+ Property { name: "asynchronous"; type: "bool" }
+ Property { name: "model"; type: "QVariant" }
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true }
+ Signal {
+ name: "objectAdded"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Signal {
+ name: "objectRemoved"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "objectAt"
+ type: "QObject*"
+ Parameter { name: "index"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQmlLocale"
+ exports: ["QtQml/Locale 2.2"]
+ isCreatable: false
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "MeasurementSystem"
+ values: {
+ "MetricSystem": 0,
+ "ImperialSystem": 1,
+ "ImperialUSSystem": 1,
+ "ImperialUKSystem": 2
+ }
+ }
+ Enum {
+ name: "FormatType"
+ values: {
+ "LongFormat": 0,
+ "ShortFormat": 1,
+ "NarrowFormat": 2
+ }
+ }
+ Enum {
+ name: "CurrencySymbolFormat"
+ values: {
+ "CurrencyIsoCode": 0,
+ "CurrencySymbol": 1,
+ "CurrencyDisplayName": 2
+ }
+ }
+ Enum {
+ name: "DayOfWeek"
+ values: {
+ "Sunday": 0,
+ "Monday": 1,
+ "Tuesday": 2,
+ "Wednesday": 3,
+ "Thursday": 4,
+ "Friday": 5,
+ "Saturday": 6
+ }
+ }
+ }
+ Component {
+ name: "QQmlTimer"
+ prototype: "QObject"
+ exports: ["QtQml/Timer 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "interval"; type: "int" }
+ Property { name: "running"; type: "bool" }
+ Property { name: "repeat"; type: "bool" }
+ Property { name: "triggeredOnStart"; type: "bool" }
+ Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
+ Signal { name: "triggered" }
+ Method { name: "start" }
+ Method { name: "stop" }
+ Method { name: "restart" }
+ }
+ Component {
+ name: "QQuickMouseEvent"
+ prototype: "QObject"
+ Property { name: "x"; type: "double"; isReadonly: true }
+ Property { name: "y"; type: "double"; isReadonly: true }
+ Property { name: "button"; type: "int"; isReadonly: true }
+ Property { name: "buttons"; type: "int"; isReadonly: true }
+ Property { name: "modifiers"; type: "int"; isReadonly: true }
+ Property { name: "wasHeld"; type: "bool"; isReadonly: true }
+ Property { name: "isClick"; type: "bool"; isReadonly: true }
+ Property { name: "accepted"; type: "bool" }
+ }
+}
diff --git a/src/imports/qtqml/qmldir b/src/imports/qtqml/qmldir
new file mode 100644
index 0000000000..8175ebb1a1
--- /dev/null
+++ b/src/imports/qtqml/qmldir
@@ -0,0 +1,2 @@
+module QtQml
+typeinfo plugins.qmltypes
diff --git a/src/imports/qtqml/qtqml.pro b/src/imports/qtqml/qtqml.pro
new file mode 100644
index 0000000000..05ef15a542
--- /dev/null
+++ b/src/imports/qtqml/qtqml.pro
@@ -0,0 +1,14 @@
+TARGETPATH = QtQml
+QML_FILES += plugins.qmltypes
+
+load(qml_module)
+
+# qmltypes target
+!cross_compile:if(build_pass|!debug_and_release) {
+ qtPrepareTool(QMLPLUGINDUMP, qmlplugindump)
+
+ # Use QtQml version defined in qmlplugindump source
+ # TODO: retrieve the correct version from QtQml
+ qmltypes.commands = $$QMLPLUGINDUMP -nonrelocatable QtQml 2.2 > $$PWD/plugins.qmltypes
+ QMAKE_EXTRA_TARGETS += qmltypes
+}
diff --git a/src/imports/qtquick2/plugins.qmltypes b/src/imports/qtquick2/plugins.qmltypes
index d98e9e6981..b11906ee09 100644
--- a/src/imports/qtquick2/plugins.qmltypes
+++ b/src/imports/qtquick2/plugins.qmltypes
@@ -1,12 +1,13 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable -builtins'
+// 'qmlplugindump -nonrelocatable QtQuick 2.6'
Module {
+ dependencies: []
Component {
name: "QAbstractItemModel"
prototype: "QObject"
@@ -139,6 +140,137 @@ Module {
}
Method { name: "submit"; type: "bool" }
Method { name: "revert" }
+ Method {
+ name: "hasIndex"
+ type: "bool"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "hasIndex"
+ type: "bool"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ }
+ Method {
+ name: "index"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "index"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ }
+ Method {
+ name: "parent"
+ type: "QModelIndex"
+ Parameter { name: "child"; type: "QModelIndex" }
+ }
+ Method {
+ name: "sibling"
+ type: "QModelIndex"
+ Parameter { name: "row"; type: "int" }
+ Parameter { name: "column"; type: "int" }
+ Parameter { name: "idx"; type: "QModelIndex" }
+ }
+ Method {
+ name: "rowCount"
+ type: "int"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "rowCount"; type: "int" }
+ Method {
+ name: "columnCount"
+ type: "int"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "columnCount"; type: "int" }
+ Method {
+ name: "hasChildren"
+ type: "bool"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method { name: "hasChildren"; type: "bool" }
+ Method {
+ name: "data"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "data"
+ type: "QVariant"
+ Parameter { name: "index"; type: "QModelIndex" }
+ }
+ Method {
+ name: "setData"
+ type: "bool"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "setData"
+ type: "bool"
+ Parameter { name: "index"; type: "QModelIndex" }
+ Parameter { name: "value"; type: "QVariant" }
+ }
+ Method {
+ name: "headerData"
+ type: "QVariant"
+ Parameter { name: "section"; type: "int" }
+ Parameter { name: "orientation"; type: "Qt::Orientation" }
+ Parameter { name: "role"; type: "int" }
+ }
+ Method {
+ name: "headerData"
+ type: "QVariant"
+ Parameter { name: "section"; type: "int" }
+ Parameter { name: "orientation"; type: "Qt::Orientation" }
+ }
+ Method {
+ name: "fetchMore"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "canFetchMore"
+ type: "bool"
+ Parameter { name: "parent"; type: "QModelIndex" }
+ }
+ Method {
+ name: "flags"
+ type: "Qt::ItemFlags"
+ Parameter { name: "index"; type: "QModelIndex" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "hits"; type: "int" }
+ Parameter { name: "flags"; type: "Qt::MatchFlags" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ Parameter { name: "hits"; type: "int" }
+ }
+ Method {
+ name: "match"
+ type: "QModelIndexList"
+ Parameter { name: "start"; type: "QModelIndex" }
+ Parameter { name: "role"; type: "int" }
+ Parameter { name: "value"; type: "QVariant" }
+ }
}
Component { name: "QAbstractListModel"; prototype: "QAbstractItemModel" }
Component {
@@ -299,27 +431,13 @@ Module {
"Quit": 65,
"FullScreen": 66,
"Deselect": 67,
- "DeleteCompleteLine": 68
+ "DeleteCompleteLine": 68,
+ "Backspace": 69,
+ "Cancel": 70
}
}
}
Component {
- name: "QObject"
- exports: ["QtQml/QtObject 2.0", "QtQuick/QtObject 2.0"]
- exportMetaObjectRevisions: [0, 0]
- Property { name: "objectName"; type: "string" }
- Signal {
- name: "objectNameChanged"
- Parameter { name: "objectName"; type: "string" }
- }
- Method { name: "toString" }
- Method { name: "destroy" }
- Method {
- name: "destroy"
- Parameter { name: "delay"; type: "int" }
- }
- }
- Component {
name: "QQmlApplication"
prototype: "QObject"
Property { name: "arguments"; type: "QStringList"; isReadonly: true }
@@ -346,83 +464,6 @@ Module {
}
}
Component {
- name: "QQmlBind"
- prototype: "QObject"
- exports: ["QtQml/Binding 2.0", "QtQuick/Binding 2.0"]
- exportMetaObjectRevisions: [0, 0]
- Property { name: "target"; type: "QObject"; isPointer: true }
- Property { name: "property"; type: "string" }
- Property { name: "value"; type: "QVariant" }
- Property { name: "when"; type: "bool" }
- }
- Component {
- name: "QQmlComponent"
- prototype: "QObject"
- exports: [
- "QML/Component 1.0",
- "QtQml/Component 2.0",
- "QtQuick/Component 2.0"
- ]
- exportMetaObjectRevisions: [0, 0, 0]
- attachedType: "QQmlComponentAttached"
- Enum {
- name: "CompilationMode"
- values: {
- "PreferSynchronous": 0,
- "Asynchronous": 1
- }
- }
- Enum {
- name: "Status"
- values: {
- "Null": 0,
- "Ready": 1,
- "Loading": 2,
- "Error": 3
- }
- }
- Property { name: "progress"; type: "double"; isReadonly: true }
- Property { name: "status"; type: "Status"; isReadonly: true }
- Property { name: "url"; type: "QUrl"; isReadonly: true }
- Signal {
- name: "statusChanged"
- Parameter { type: "QQmlComponent::Status" }
- }
- Signal {
- name: "progressChanged"
- Parameter { type: "double" }
- }
- Method {
- name: "loadUrl"
- Parameter { name: "url"; type: "QUrl" }
- }
- Method {
- name: "loadUrl"
- Parameter { name: "url"; type: "QUrl" }
- Parameter { name: "mode"; type: "CompilationMode" }
- }
- Method {
- name: "setData"
- Parameter { type: "QByteArray" }
- Parameter { name: "baseUrl"; type: "QUrl" }
- }
- Method { name: "errorString"; type: "string" }
- }
- Component {
- name: "QQmlComponentAttached"
- prototype: "QObject"
- Signal { name: "completed" }
- Signal { name: "destruction" }
- }
- Component {
- name: "QQmlConnections"
- prototype: "QObject"
- exports: ["QtQml/Connections 2.0", "QtQuick/Connections 2.0"]
- exportMetaObjectRevisions: [0, 0]
- Property { name: "target"; type: "QObject"; isPointer: true }
- Property { name: "ignoreUnknownSignals"; type: "bool" }
- }
- Component {
name: "QQmlDelegateModel"
defaultProperty: "delegate"
prototype: "QQmlInstanceModel"
@@ -514,7 +555,6 @@ Module {
Component { name: "QQmlDelegateModelParts"; prototype: "QObject" }
Component {
name: "QQmlEasingValueType"
- prototype: "QQmlValueType"
exports: ["QtQuick/Easing 2.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
@@ -576,58 +616,6 @@ Module {
Property { name: "bezierCurve"; type: "QVariantList" }
}
Component {
- name: "QQmlInstanceModel"
- prototype: "QObject"
- Property { name: "count"; type: "int"; isReadonly: true }
- Signal {
- name: "modelUpdated"
- Parameter { name: "changeSet"; type: "QQmlChangeSet" }
- Parameter { name: "reset"; type: "bool" }
- }
- Signal {
- name: "createdItem"
- Parameter { name: "index"; type: "int" }
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- Signal {
- name: "initItem"
- Parameter { name: "index"; type: "int" }
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- Signal {
- name: "destroyingItem"
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- }
- Component {
- name: "QQmlInstantiator"
- defaultProperty: "delegate"
- prototype: "QObject"
- exports: ["QtQml/Instantiator 2.1", "QtQuick/Instantiator 2.1"]
- exportMetaObjectRevisions: [0, 0]
- Property { name: "active"; type: "bool" }
- Property { name: "asynchronous"; type: "bool" }
- Property { name: "model"; type: "QVariant" }
- Property { name: "count"; type: "int"; isReadonly: true }
- Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
- Property { name: "object"; type: "QObject"; isReadonly: true; isPointer: true }
- Signal {
- name: "objectAdded"
- Parameter { name: "index"; type: "int" }
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- Signal {
- name: "objectRemoved"
- Parameter { name: "index"; type: "int" }
- Parameter { name: "object"; type: "QObject"; isPointer: true }
- }
- Method {
- name: "objectAt"
- type: "QObject*"
- Parameter { name: "index"; type: "int" }
- }
- }
- Component {
name: "QQmlListElement"
prototype: "QObject"
exports: ["QtQuick/ListElement 2.0"]
@@ -678,49 +666,6 @@ Module {
Method { name: "sync" }
}
Component {
- name: "QQmlLocale"
- exports: ["QtQml/Locale 2.2", "QtQuick/Locale 2.0"]
- isCreatable: false
- exportMetaObjectRevisions: [0, 0]
- Enum {
- name: "MeasurementSystem"
- values: {
- "MetricSystem": 0,
- "ImperialSystem": 1,
- "ImperialUSSystem": 1,
- "ImperialUKSystem": 2
- }
- }
- Enum {
- name: "FormatType"
- values: {
- "LongFormat": 0,
- "ShortFormat": 1,
- "NarrowFormat": 2
- }
- }
- Enum {
- name: "CurrencySymbolFormat"
- values: {
- "CurrencyIsoCode": 0,
- "CurrencySymbol": 1,
- "CurrencyDisplayName": 2
- }
- }
- Enum {
- name: "DayOfWeek"
- values: {
- "Sunday": 0,
- "Monday": 1,
- "Tuesday": 2,
- "Wednesday": 3,
- "Thursday": 4,
- "Friday": 5,
- "Saturday": 6
- }
- }
- }
- Component {
name: "QQmlObjectModel"
defaultProperty: "children"
prototype: "QQmlInstanceModel"
@@ -728,6 +673,48 @@ Module {
exportMetaObjectRevisions: [0]
attachedType: "QQmlObjectModelAttached"
Property { name: "children"; type: "QObject"; isList: true; isReadonly: true }
+ Method { name: "clear"; revision: 3 }
+ Method {
+ name: "get"
+ revision: 3
+ type: "QObject*"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "append"
+ revision: 3
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "insert"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "object"; type: "QObject"; isPointer: true }
+ }
+ Method {
+ name: "move"
+ revision: 3
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ Parameter { name: "n"; type: "int" }
+ }
+ Method {
+ name: "move"
+ revision: 3
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ }
+ Method {
+ name: "remove"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "n"; type: "int" }
+ }
+ Method {
+ name: "remove"
+ revision: 3
+ Parameter { name: "index"; type: "int" }
+ }
}
Component {
name: "QQmlObjectModelAttached"
@@ -735,22 +722,6 @@ Module {
Property { name: "index"; type: "int"; isReadonly: true }
}
Component {
- name: "QQmlTimer"
- prototype: "QObject"
- exports: ["QtQml/Timer 2.0", "QtQuick/Timer 2.0"]
- exportMetaObjectRevisions: [0, 0]
- Property { name: "interval"; type: "int" }
- Property { name: "running"; type: "bool" }
- Property { name: "repeat"; type: "bool" }
- Property { name: "triggeredOnStart"; type: "bool" }
- Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
- Signal { name: "triggered" }
- Method { name: "start" }
- Method { name: "stop" }
- Method { name: "restart" }
- }
- Component { name: "QQmlValueType"; prototype: "QObject" }
- Component {
name: "QQuickAbstractAnimation"
prototype: "QObject"
exports: ["QtQuick/Animation 2.0"]
@@ -880,6 +851,12 @@ Module {
Signal { name: "toggleAction" }
Signal { name: "increaseAction" }
Signal { name: "decreaseAction" }
+ Signal { name: "scrollUpAction" }
+ Signal { name: "scrollDownAction" }
+ Signal { name: "scrollLeftAction" }
+ Signal { name: "scrollRightAction" }
+ Signal { name: "previousPageAction" }
+ Signal { name: "nextPageAction" }
Method { name: "valueChanged" }
Method { name: "cursorPositionChanged" }
Method {
@@ -1188,14 +1165,24 @@ Module {
name: "QQuickBasePositioner"
defaultProperty: "data"
prototype: "QQuickImplicitSizeItem"
- exports: ["QtQuick/Positioner 2.0"]
+ exports: ["QtQuick/Positioner 2.0", "QtQuick/Positioner 2.6"]
isCreatable: false
- exportMetaObjectRevisions: [0]
+ exportMetaObjectRevisions: [0, 6]
attachedType: "QQuickPositionerAttached"
Property { name: "spacing"; type: "double" }
Property { name: "populate"; type: "QQuickTransition"; isPointer: true }
Property { name: "move"; type: "QQuickTransition"; isPointer: true }
Property { name: "add"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
}
Component {
name: "QQuickBehavior"
@@ -1330,8 +1317,8 @@ Module {
name: "QQuickColumn"
defaultProperty: "data"
prototype: "QQuickBasePositioner"
- exports: ["QtQuick/Column 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick/Column 2.0", "QtQuick/Column 2.6"]
+ exportMetaObjectRevisions: [0, 6]
}
Component {
name: "QQuickCurve"
@@ -1469,6 +1456,10 @@ Module {
Parameter { type: "QQmlV4Function"; isPointer: true }
}
Method {
+ name: "getDataAsArrayBuffer"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
name: "acceptProposedAction"
Parameter { type: "QQmlV4Function"; isPointer: true }
}
@@ -1478,6 +1469,14 @@ Module {
}
}
Component {
+ name: "QQuickEnterKeyAttached"
+ prototype: "QObject"
+ exports: ["QtQuick/EnterKey 2.6"]
+ isCreatable: false
+ exportMetaObjectRevisions: [6]
+ Property { name: "type"; type: "Qt::EnterKeyType" }
+ }
+ Component {
name: "QQuickFlickable"
defaultProperty: "flickableData"
prototype: "QQuickItem"
@@ -1488,7 +1487,8 @@ Module {
values: {
"StopAtBounds": 0,
"DragOverBounds": 1,
- "DragAndOvershootBounds": 2
+ "OvershootBounds": 2,
+ "DragAndOvershootBounds": 3
}
}
Enum {
@@ -1608,8 +1608,8 @@ Module {
name: "QQuickFlow"
defaultProperty: "data"
prototype: "QQuickBasePositioner"
- exports: ["QtQuick/Flow 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick/Flow 2.0", "QtQuick/Flow 2.6"]
+ exportMetaObjectRevisions: [0, 6]
Enum {
name: "Flow"
values: {
@@ -1703,17 +1703,20 @@ Module {
}
Component {
name: "QQuickFontValueType"
- prototype: "QQmlValueType"
exports: ["QtQuick/Font 2.0"]
isCreatable: false
exportMetaObjectRevisions: [0]
Enum {
name: "FontWeight"
values: {
+ "Thin": 0,
+ "ExtraLight": 12,
"Light": 25,
"Normal": 50,
+ "Medium": 57,
"DemiBold": 63,
"Bold": 75,
+ "ExtraBold": 81,
"Black": 87
}
}
@@ -1728,6 +1731,7 @@ Module {
}
}
Property { name: "family"; type: "string" }
+ Property { name: "styleName"; type: "string" }
Property { name: "bold"; type: "bool" }
Property { name: "weight"; type: "FontWeight" }
Property { name: "italic"; type: "bool" }
@@ -1739,6 +1743,7 @@ Module {
Property { name: "capitalization"; type: "Capitalization" }
Property { name: "letterSpacing"; type: "double" }
Property { name: "wordSpacing"; type: "double" }
+ Method { name: "toString"; type: "string" }
}
Component {
name: "QQuickGrabGestureEvent"
@@ -1768,8 +1773,8 @@ Module {
name: "QQuickGrid"
defaultProperty: "data"
prototype: "QQuickBasePositioner"
- exports: ["QtQuick/Grid 2.0", "QtQuick/Grid 2.1"]
- exportMetaObjectRevisions: [0, 1]
+ exports: ["QtQuick/Grid 2.0", "QtQuick/Grid 2.1", "QtQuick/Grid 2.6"]
+ exportMetaObjectRevisions: [0, 1, 6]
Enum {
name: "Flow"
values: {
@@ -1868,8 +1873,12 @@ Module {
name: "QQuickImage"
defaultProperty: "data"
prototype: "QQuickImageBase"
- exports: ["QtQuick/Image 2.0", "QtQuick/Image 2.3"]
- exportMetaObjectRevisions: [0, 1]
+ exports: [
+ "QtQuick/Image 2.0",
+ "QtQuick/Image 2.3",
+ "QtQuick/Image 2.5"
+ ]
+ exportMetaObjectRevisions: [0, 1, 2]
Enum {
name: "HAlignment"
values: {
@@ -1904,6 +1913,7 @@ Module {
Property { name: "horizontalAlignment"; type: "HAlignment" }
Property { name: "verticalAlignment"; type: "VAlignment" }
Property { name: "mipmap"; revision: 1; type: "bool" }
+ Property { name: "autoTransform"; revision: 2; type: "bool" }
Signal { name: "paintedGeometryChanged" }
Signal {
name: "horizontalAlignmentChanged"
@@ -1918,6 +1928,7 @@ Module {
revision: 1
Parameter { type: "bool" }
}
+ Signal { name: "autoTransformChanged"; revision: 2 }
}
Component {
name: "QQuickImageBase"
@@ -2149,6 +2160,7 @@ Module {
Property { name: "format"; type: "QQuickShaderEffectSource::Format" }
Property { name: "samplerName"; type: "QByteArray" }
Property { name: "effect"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "textureMirroring"; type: "QQuickShaderEffectSource::TextureMirroring" }
Signal {
name: "enabledChanged"
Parameter { name: "enabled"; type: "bool" }
@@ -2185,6 +2197,10 @@ Module {
name: "sourceRectChanged"
Parameter { name: "sourceRect"; type: "QRectF" }
}
+ Signal {
+ name: "textureMirroringChanged"
+ Parameter { name: "mirroring"; type: "QQuickShaderEffectSource::TextureMirroring" }
+ }
}
Component {
name: "QQuickItemView"
@@ -2623,13 +2639,18 @@ Module {
name: "QQuickMouseArea"
defaultProperty: "data"
prototype: "QQuickItem"
- exports: ["QtQuick/MouseArea 2.0", "QtQuick/MouseArea 2.4"]
- exportMetaObjectRevisions: [0, 1]
+ exports: [
+ "QtQuick/MouseArea 2.0",
+ "QtQuick/MouseArea 2.4",
+ "QtQuick/MouseArea 2.5"
+ ]
+ exportMetaObjectRevisions: [0, 1, 2]
Property { name: "mouseX"; type: "double"; isReadonly: true }
Property { name: "mouseY"; type: "double"; isReadonly: true }
Property { name: "containsMouse"; type: "bool"; isReadonly: true }
Property { name: "pressed"; type: "bool"; isReadonly: true }
Property { name: "enabled"; type: "bool" }
+ Property { name: "scrollGestureEnabled"; revision: 2; type: "bool" }
Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
Property { name: "hoverEnabled"; type: "bool" }
@@ -2639,6 +2660,7 @@ Module {
Property { name: "cursorShape"; type: "Qt::CursorShape" }
Property { name: "containsPress"; revision: 1; type: "bool"; isReadonly: true }
Signal { name: "hoveredChanged" }
+ Signal { name: "scrollGestureEnabledChanged"; revision: 2 }
Signal {
name: "positionChanged"
Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
@@ -2681,18 +2703,6 @@ Module {
Signal { name: "containsPressChanged"; revision: 1 }
}
Component {
- name: "QQuickMouseEvent"
- prototype: "QObject"
- Property { name: "x"; type: "double"; isReadonly: true }
- Property { name: "y"; type: "double"; isReadonly: true }
- Property { name: "button"; type: "int"; isReadonly: true }
- Property { name: "buttons"; type: "int"; isReadonly: true }
- Property { name: "modifiers"; type: "int"; isReadonly: true }
- Property { name: "wasHeld"; type: "bool"; isReadonly: true }
- Property { name: "isClick"; type: "bool"; isReadonly: true }
- Property { name: "accepted"; type: "bool" }
- }
- Component {
name: "QQuickMultiPointTouchArea"
defaultProperty: "data"
prototype: "QQuickItem"
@@ -2801,6 +2811,7 @@ Module {
Property { name: "fillColor"; type: "QColor" }
Property { name: "contentsScale"; type: "double" }
Property { name: "renderTarget"; type: "RenderTarget" }
+ Property { name: "textureSize"; type: "QSize" }
}
Component {
name: "QQuickParallelAnimation"
@@ -3131,8 +3142,8 @@ Module {
name: "QQuickPinchArea"
defaultProperty: "data"
prototype: "QQuickItem"
- exports: ["QtQuick/PinchArea 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick/PinchArea 2.0", "QtQuick/PinchArea 2.5"]
+ exportMetaObjectRevisions: [0, 1]
Property { name: "enabled"; type: "bool" }
Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true }
Signal {
@@ -3147,6 +3158,11 @@ Module {
name: "pinchFinished"
Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
}
+ Signal {
+ name: "smartZoom"
+ revision: 1
+ Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
+ }
}
Component {
name: "QQuickPinchEvent"
@@ -3324,8 +3340,8 @@ Module {
name: "QQuickRow"
defaultProperty: "data"
prototype: "QQuickBasePositioner"
- exports: ["QtQuick/Row 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: ["QtQuick/Row 2.0", "QtQuick/Row 2.6"]
+ exportMetaObjectRevisions: [0, 6]
Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
}
@@ -3413,8 +3429,11 @@ Module {
name: "QQuickShaderEffectSource"
defaultProperty: "data"
prototype: "QQuickItem"
- exports: ["QtQuick/ShaderEffectSource 2.0"]
- exportMetaObjectRevisions: [0]
+ exports: [
+ "QtQuick/ShaderEffectSource 2.0",
+ "QtQuick/ShaderEffectSource 2.6"
+ ]
+ exportMetaObjectRevisions: [0, 1]
Enum {
name: "WrapMode"
values: {
@@ -3432,6 +3451,14 @@ Module {
"RGBA": 6408
}
}
+ Enum {
+ name: "TextureMirroring"
+ values: {
+ "NoMirroring": 0,
+ "MirrorHorizontally": 1,
+ "MirrorVertically": 2
+ }
+ }
Property { name: "wrapMode"; type: "WrapMode" }
Property { name: "sourceItem"; type: "QQuickItem"; isPointer: true }
Property { name: "sourceRect"; type: "QRectF" }
@@ -3441,10 +3468,25 @@ Module {
Property { name: "hideSource"; type: "bool" }
Property { name: "mipmap"; type: "bool" }
Property { name: "recursive"; type: "bool" }
+ Property { name: "textureMirroring"; revision: 1; type: "TextureMirroring" }
Signal { name: "scheduledUpdateCompleted" }
Method { name: "scheduleUpdate" }
}
Component {
+ name: "QQuickShortcut"
+ prototype: "QObject"
+ exports: ["QtQuick/Shortcut 2.5", "QtQuick/Shortcut 2.6"]
+ exportMetaObjectRevisions: [0, 1]
+ Property { name: "sequence"; type: "QVariant" }
+ Property { name: "nativeText"; revision: 1; type: "string"; isReadonly: true }
+ Property { name: "portableText"; revision: 1; type: "string"; isReadonly: true }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "autoRepeat"; type: "bool" }
+ Property { name: "context"; type: "Qt::ShortcutContext" }
+ Signal { name: "activated" }
+ Signal { name: "activatedAmbiguously" }
+ }
+ Component {
name: "QQuickSmoothedAnimation"
prototype: "QQuickNumberAnimation"
exports: ["QtQuick/SmoothedAnimation 2.0"]
@@ -3755,8 +3797,13 @@ Module {
name: "QQuickText"
defaultProperty: "data"
prototype: "QQuickImplicitSizeItem"
- exports: ["QtQuick/Text 2.0", "QtQuick/Text 2.2", "QtQuick/Text 2.3"]
- exportMetaObjectRevisions: [0, 2, 3]
+ exports: [
+ "QtQuick/Text 2.0",
+ "QtQuick/Text 2.2",
+ "QtQuick/Text 2.3",
+ "QtQuick/Text 2.6"
+ ]
+ exportMetaObjectRevisions: [0, 2, 3, 6]
Enum {
name: "HAlignment"
values: {
@@ -3861,6 +3908,11 @@ Module {
Property { name: "fontSizeMode"; type: "FontSizeMode" }
Property { name: "renderType"; type: "RenderType" }
Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
Signal {
name: "textChanged"
Parameter { name: "text"; type: "string" }
@@ -3911,6 +3963,11 @@ Module {
name: "lineLaidOut"
Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true }
}
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
Method { name: "doLayout" }
Method {
name: "linkAt"
@@ -3929,9 +3986,10 @@ Module {
"QtQuick/TextEdit 2.0",
"QtQuick/TextEdit 2.1",
"QtQuick/TextEdit 2.2",
- "QtQuick/TextEdit 2.3"
+ "QtQuick/TextEdit 2.3",
+ "QtQuick/TextEdit 2.6"
]
- exportMetaObjectRevisions: [0, 1, 2, 3]
+ exportMetaObjectRevisions: [0, 1, 2, 3, 6]
Enum {
name: "HAlignment"
values: {
@@ -4026,6 +4084,11 @@ Module {
isPointer: true
}
Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
Signal { name: "contentSizeChanged" }
Signal {
name: "colorChanged"
@@ -4097,6 +4160,12 @@ Module {
revision: 2
Parameter { name: "link"; type: "string" }
}
+ Signal { name: "editingFinished"; revision: 6 }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
Method { name: "selectAll" }
Method { name: "selectWord" }
Method {
@@ -4185,9 +4254,10 @@ Module {
exports: [
"QtQuick/TextInput 2.0",
"QtQuick/TextInput 2.2",
- "QtQuick/TextInput 2.4"
+ "QtQuick/TextInput 2.4",
+ "QtQuick/TextInput 2.6"
]
- exportMetaObjectRevisions: [0, 2, 3]
+ exportMetaObjectRevisions: [0, 2, 3, 6]
Enum {
name: "EchoMode"
values: {
@@ -4283,6 +4353,11 @@ Module {
Property { name: "contentWidth"; type: "double"; isReadonly: true }
Property { name: "contentHeight"; type: "double"; isReadonly: true }
Property { name: "renderType"; type: "RenderType" }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
Signal { name: "accepted" }
Signal { name: "editingFinished"; revision: 2 }
Signal {
@@ -4339,6 +4414,11 @@ Module {
Parameter { name: "mode"; type: "SelectionMode" }
}
Signal { name: "contentSizeChanged" }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
Method { name: "selectAll" }
Method { name: "selectWord" }
Method {
@@ -4583,1515 +4663,4 @@ Module {
prototype: "QObject"
Signal { name: "changed" }
}
- Component {
- name: "Qt"
- Enum {
- name: "GlobalColor"
- values: {
- "color0": 0,
- "color1": 1,
- "black": 2,
- "white": 3,
- "darkGray": 4,
- "gray": 5,
- "lightGray": 6,
- "red": 7,
- "green": 8,
- "blue": 9,
- "cyan": 10,
- "magenta": 11,
- "yellow": 12,
- "darkRed": 13,
- "darkGreen": 14,
- "darkBlue": 15,
- "darkCyan": 16,
- "darkMagenta": 17,
- "darkYellow": 18,
- "transparent": 19
- }
- }
- Enum {
- name: "KeyboardModifiers"
- values: {
- "NoModifier": 0,
- "ShiftModifier": 33554432,
- "ControlModifier": 67108864,
- "AltModifier": 134217728,
- "MetaModifier": 268435456,
- "KeypadModifier": 536870912,
- "GroupSwitchModifier": 1073741824,
- "KeyboardModifierMask": -33554432
- }
- }
- Enum {
- name: "MouseButtons"
- values: {
- "NoButton": 0,
- "LeftButton": 1,
- "RightButton": 2,
- "MidButton": 4,
- "MiddleButton": 4,
- "BackButton": 8,
- "XButton1": 8,
- "ExtraButton1": 8,
- "ForwardButton": 16,
- "XButton2": 16,
- "ExtraButton2": 16,
- "TaskButton": 32,
- "ExtraButton3": 32,
- "ExtraButton4": 64,
- "ExtraButton5": 128,
- "ExtraButton6": 256,
- "ExtraButton7": 512,
- "ExtraButton8": 1024,
- "ExtraButton9": 2048,
- "ExtraButton10": 4096,
- "ExtraButton11": 8192,
- "ExtraButton12": 16384,
- "ExtraButton13": 32768,
- "ExtraButton14": 65536,
- "ExtraButton15": 131072,
- "ExtraButton16": 262144,
- "ExtraButton17": 524288,
- "ExtraButton18": 1048576,
- "ExtraButton19": 2097152,
- "ExtraButton20": 4194304,
- "ExtraButton21": 8388608,
- "ExtraButton22": 16777216,
- "ExtraButton23": 33554432,
- "ExtraButton24": 67108864,
- "AllButtons": 134217727,
- "MaxMouseButton": 67108864,
- "MouseButtonMask": -1
- }
- }
- Enum {
- name: "Orientation"
- values: {
- "Horizontal": 1,
- "Vertical": 2
- }
- }
- Enum {
- name: "Orientations"
- values: {
- "Horizontal": 1,
- "Vertical": 2
- }
- }
- Enum {
- name: "FocusPolicy"
- values: {
- "NoFocus": 0,
- "TabFocus": 1,
- "ClickFocus": 2,
- "StrongFocus": 11,
- "WheelFocus": 15
- }
- }
- Enum {
- name: "SortOrder"
- values: {
- "AscendingOrder": 0,
- "DescendingOrder": 1
- }
- }
- Enum {
- name: "Alignment"
- values: {
- "AlignLeft": 1,
- "AlignLeading": 1,
- "AlignRight": 2,
- "AlignTrailing": 2,
- "AlignHCenter": 4,
- "AlignJustify": 8,
- "AlignAbsolute": 16,
- "AlignHorizontal_Mask": 31,
- "AlignTop": 32,
- "AlignBottom": 64,
- "AlignVCenter": 128,
- "AlignBaseline": 256,
- "AlignVertical_Mask": 480,
- "AlignCenter": 132
- }
- }
- Enum {
- name: "TextElideMode"
- values: {
- "ElideLeft": 0,
- "ElideRight": 1,
- "ElideMiddle": 2,
- "ElideNone": 3
- }
- }
- Enum {
- name: "WindowType"
- values: {
- "Widget": 0,
- "Window": 1,
- "Dialog": 3,
- "Sheet": 5,
- "Drawer": 7,
- "Popup": 9,
- "Tool": 11,
- "ToolTip": 13,
- "SplashScreen": 15,
- "Desktop": 17,
- "SubWindow": 18,
- "ForeignWindow": 33,
- "CoverWindow": 65,
- "WindowType_Mask": 255,
- "MSWindowsFixedSizeDialogHint": 256,
- "MSWindowsOwnDC": 512,
- "BypassWindowManagerHint": 1024,
- "X11BypassWindowManagerHint": 1024,
- "FramelessWindowHint": 2048,
- "WindowTitleHint": 4096,
- "WindowSystemMenuHint": 8192,
- "WindowMinimizeButtonHint": 16384,
- "WindowMaximizeButtonHint": 32768,
- "WindowMinMaxButtonsHint": 49152,
- "WindowContextHelpButtonHint": 65536,
- "WindowShadeButtonHint": 131072,
- "WindowStaysOnTopHint": 262144,
- "WindowTransparentForInput": 524288,
- "WindowOverridesSystemGestures": 1048576,
- "WindowDoesNotAcceptFocus": 2097152,
- "CustomizeWindowHint": 33554432,
- "WindowStaysOnBottomHint": 67108864,
- "WindowCloseButtonHint": 134217728,
- "MacWindowToolBarButtonHint": 268435456,
- "BypassGraphicsProxyWidget": 536870912,
- "WindowOkButtonHint": 524288,
- "WindowCancelButtonHint": 1048576,
- "NoDropShadowWindowHint": 1073741824,
- "WindowFullscreenButtonHint": -2147483648
- }
- }
- Enum {
- name: "WindowFlags"
- values: {
- "Widget": 0,
- "Window": 1,
- "Dialog": 3,
- "Sheet": 5,
- "Drawer": 7,
- "Popup": 9,
- "Tool": 11,
- "ToolTip": 13,
- "SplashScreen": 15,
- "Desktop": 17,
- "SubWindow": 18,
- "ForeignWindow": 33,
- "CoverWindow": 65,
- "WindowType_Mask": 255,
- "MSWindowsFixedSizeDialogHint": 256,
- "MSWindowsOwnDC": 512,
- "BypassWindowManagerHint": 1024,
- "X11BypassWindowManagerHint": 1024,
- "FramelessWindowHint": 2048,
- "WindowTitleHint": 4096,
- "WindowSystemMenuHint": 8192,
- "WindowMinimizeButtonHint": 16384,
- "WindowMaximizeButtonHint": 32768,
- "WindowMinMaxButtonsHint": 49152,
- "WindowContextHelpButtonHint": 65536,
- "WindowShadeButtonHint": 131072,
- "WindowStaysOnTopHint": 262144,
- "WindowTransparentForInput": 524288,
- "WindowOverridesSystemGestures": 1048576,
- "WindowDoesNotAcceptFocus": 2097152,
- "CustomizeWindowHint": 33554432,
- "WindowStaysOnBottomHint": 67108864,
- "WindowCloseButtonHint": 134217728,
- "MacWindowToolBarButtonHint": 268435456,
- "BypassGraphicsProxyWidget": 536870912,
- "WindowOkButtonHint": 524288,
- "WindowCancelButtonHint": 1048576,
- "NoDropShadowWindowHint": 1073741824,
- "WindowFullscreenButtonHint": -2147483648
- }
- }
- Enum {
- name: "WindowState"
- values: {
- "WindowNoState": 0,
- "WindowMinimized": 1,
- "WindowMaximized": 2,
- "WindowFullScreen": 4,
- "WindowActive": 8
- }
- }
- Enum {
- name: "WindowStates"
- values: {
- "WindowNoState": 0,
- "WindowMinimized": 1,
- "WindowMaximized": 2,
- "WindowFullScreen": 4,
- "WindowActive": 8
- }
- }
- Enum {
- name: "ApplicationState"
- values: {
- "ApplicationSuspended": 0,
- "ApplicationHidden": 1,
- "ApplicationInactive": 2,
- "ApplicationActive": 4
- }
- }
- Enum {
- name: "ScreenOrientation"
- values: {
- "PrimaryOrientation": 0,
- "PortraitOrientation": 1,
- "LandscapeOrientation": 2,
- "InvertedPortraitOrientation": 4,
- "InvertedLandscapeOrientation": 8
- }
- }
- Enum {
- name: "ScreenOrientations"
- values: {
- "PrimaryOrientation": 0,
- "PortraitOrientation": 1,
- "LandscapeOrientation": 2,
- "InvertedPortraitOrientation": 4,
- "InvertedLandscapeOrientation": 8
- }
- }
- Enum {
- name: "WidgetAttribute"
- values: {
- "WA_Disabled": 0,
- "WA_UnderMouse": 1,
- "WA_MouseTracking": 2,
- "WA_ContentsPropagated": 3,
- "WA_OpaquePaintEvent": 4,
- "WA_NoBackground": 4,
- "WA_StaticContents": 5,
- "WA_LaidOut": 7,
- "WA_PaintOnScreen": 8,
- "WA_NoSystemBackground": 9,
- "WA_UpdatesDisabled": 10,
- "WA_Mapped": 11,
- "WA_MacNoClickThrough": 12,
- "WA_InputMethodEnabled": 14,
- "WA_WState_Visible": 15,
- "WA_WState_Hidden": 16,
- "WA_ForceDisabled": 32,
- "WA_KeyCompression": 33,
- "WA_PendingMoveEvent": 34,
- "WA_PendingResizeEvent": 35,
- "WA_SetPalette": 36,
- "WA_SetFont": 37,
- "WA_SetCursor": 38,
- "WA_NoChildEventsFromChildren": 39,
- "WA_WindowModified": 41,
- "WA_Resized": 42,
- "WA_Moved": 43,
- "WA_PendingUpdate": 44,
- "WA_InvalidSize": 45,
- "WA_MacBrushedMetal": 46,
- "WA_MacMetalStyle": 46,
- "WA_CustomWhatsThis": 47,
- "WA_LayoutOnEntireRect": 48,
- "WA_OutsideWSRange": 49,
- "WA_GrabbedShortcut": 50,
- "WA_TransparentForMouseEvents": 51,
- "WA_PaintUnclipped": 52,
- "WA_SetWindowIcon": 53,
- "WA_NoMouseReplay": 54,
- "WA_DeleteOnClose": 55,
- "WA_RightToLeft": 56,
- "WA_SetLayoutDirection": 57,
- "WA_NoChildEventsForParent": 58,
- "WA_ForceUpdatesDisabled": 59,
- "WA_WState_Created": 60,
- "WA_WState_CompressKeys": 61,
- "WA_WState_InPaintEvent": 62,
- "WA_WState_Reparented": 63,
- "WA_WState_ConfigPending": 64,
- "WA_WState_Polished": 66,
- "WA_WState_DND": 67,
- "WA_WState_OwnSizePolicy": 68,
- "WA_WState_ExplicitShowHide": 69,
- "WA_ShowModal": 70,
- "WA_MouseNoMask": 71,
- "WA_GroupLeader": 72,
- "WA_NoMousePropagation": 73,
- "WA_Hover": 74,
- "WA_InputMethodTransparent": 75,
- "WA_QuitOnClose": 76,
- "WA_KeyboardFocusChange": 77,
- "WA_AcceptDrops": 78,
- "WA_DropSiteRegistered": 79,
- "WA_ForceAcceptDrops": 79,
- "WA_WindowPropagation": 80,
- "WA_NoX11EventCompression": 81,
- "WA_TintedBackground": 82,
- "WA_X11OpenGLOverlay": 83,
- "WA_AlwaysShowToolTips": 84,
- "WA_MacOpaqueSizeGrip": 85,
- "WA_SetStyle": 86,
- "WA_SetLocale": 87,
- "WA_MacShowFocusRect": 88,
- "WA_MacNormalSize": 89,
- "WA_MacSmallSize": 90,
- "WA_MacMiniSize": 91,
- "WA_LayoutUsesWidgetRect": 92,
- "WA_StyledBackground": 93,
- "WA_MSWindowsUseDirect3D": 94,
- "WA_CanHostQMdiSubWindowTitleBar": 95,
- "WA_MacAlwaysShowToolWindow": 96,
- "WA_StyleSheet": 97,
- "WA_ShowWithoutActivating": 98,
- "WA_X11BypassTransientForHint": 99,
- "WA_NativeWindow": 100,
- "WA_DontCreateNativeAncestors": 101,
- "WA_MacVariableSize": 102,
- "WA_DontShowOnScreen": 103,
- "WA_X11NetWmWindowTypeDesktop": 104,
- "WA_X11NetWmWindowTypeDock": 105,
- "WA_X11NetWmWindowTypeToolBar": 106,
- "WA_X11NetWmWindowTypeMenu": 107,
- "WA_X11NetWmWindowTypeUtility": 108,
- "WA_X11NetWmWindowTypeSplash": 109,
- "WA_X11NetWmWindowTypeDialog": 110,
- "WA_X11NetWmWindowTypeDropDownMenu": 111,
- "WA_X11NetWmWindowTypePopupMenu": 112,
- "WA_X11NetWmWindowTypeToolTip": 113,
- "WA_X11NetWmWindowTypeNotification": 114,
- "WA_X11NetWmWindowTypeCombo": 115,
- "WA_X11NetWmWindowTypeDND": 116,
- "WA_MacFrameworkScaled": 117,
- "WA_SetWindowModality": 118,
- "WA_WState_WindowOpacitySet": 119,
- "WA_TranslucentBackground": 120,
- "WA_AcceptTouchEvents": 121,
- "WA_WState_AcceptedTouchBeginEvent": 122,
- "WA_TouchPadAcceptSingleTouchEvents": 123,
- "WA_X11DoNotAcceptFocus": 126,
- "WA_MacNoShadow": 127,
- "WA_AlwaysStackOnTop": 128,
- "WA_AttributeCount": 129
- }
- }
- Enum {
- name: "ApplicationAttribute"
- values: {
- "AA_ImmediateWidgetCreation": 0,
- "AA_MSWindowsUseDirect3DByDefault": 1,
- "AA_DontShowIconsInMenus": 2,
- "AA_NativeWindows": 3,
- "AA_DontCreateNativeWidgetSiblings": 4,
- "AA_MacPluginApplication": 5,
- "AA_DontUseNativeMenuBar": 6,
- "AA_MacDontSwapCtrlAndMeta": 7,
- "AA_Use96Dpi": 8,
- "AA_X11InitThreads": 10,
- "AA_SynthesizeTouchForUnhandledMouseEvents": 11,
- "AA_SynthesizeMouseForUnhandledTouchEvents": 12,
- "AA_UseHighDpiPixmaps": 13,
- "AA_ForceRasterWidgets": 14,
- "AA_UseDesktopOpenGL": 15,
- "AA_UseOpenGLES": 16,
- "AA_UseSoftwareOpenGL": 17,
- "AA_ShareOpenGLContexts": 18,
- "AA_AttributeCount": 19
- }
- }
- Enum {
- name: "ImageConversionFlags"
- values: {
- "ColorMode_Mask": 3,
- "AutoColor": 0,
- "ColorOnly": 3,
- "MonoOnly": 2,
- "AlphaDither_Mask": 12,
- "ThresholdAlphaDither": 0,
- "OrderedAlphaDither": 4,
- "DiffuseAlphaDither": 8,
- "NoAlpha": 12,
- "Dither_Mask": 48,
- "DiffuseDither": 0,
- "OrderedDither": 16,
- "ThresholdDither": 32,
- "DitherMode_Mask": 192,
- "AutoDither": 0,
- "PreferDither": 64,
- "AvoidDither": 128,
- "NoOpaqueDetection": 256,
- "NoFormatConversion": 512
- }
- }
- Enum {
- name: "BGMode"
- values: {
- "TransparentMode": 0,
- "OpaqueMode": 1
- }
- }
- Enum {
- name: "Key"
- values: {
- "Key_Escape": 16777216,
- "Key_Tab": 16777217,
- "Key_Backtab": 16777218,
- "Key_Backspace": 16777219,
- "Key_Return": 16777220,
- "Key_Enter": 16777221,
- "Key_Insert": 16777222,
- "Key_Delete": 16777223,
- "Key_Pause": 16777224,
- "Key_Print": 16777225,
- "Key_SysReq": 16777226,
- "Key_Clear": 16777227,
- "Key_Home": 16777232,
- "Key_End": 16777233,
- "Key_Left": 16777234,
- "Key_Up": 16777235,
- "Key_Right": 16777236,
- "Key_Down": 16777237,
- "Key_PageUp": 16777238,
- "Key_PageDown": 16777239,
- "Key_Shift": 16777248,
- "Key_Control": 16777249,
- "Key_Meta": 16777250,
- "Key_Alt": 16777251,
- "Key_CapsLock": 16777252,
- "Key_NumLock": 16777253,
- "Key_ScrollLock": 16777254,
- "Key_F1": 16777264,
- "Key_F2": 16777265,
- "Key_F3": 16777266,
- "Key_F4": 16777267,
- "Key_F5": 16777268,
- "Key_F6": 16777269,
- "Key_F7": 16777270,
- "Key_F8": 16777271,
- "Key_F9": 16777272,
- "Key_F10": 16777273,
- "Key_F11": 16777274,
- "Key_F12": 16777275,
- "Key_F13": 16777276,
- "Key_F14": 16777277,
- "Key_F15": 16777278,
- "Key_F16": 16777279,
- "Key_F17": 16777280,
- "Key_F18": 16777281,
- "Key_F19": 16777282,
- "Key_F20": 16777283,
- "Key_F21": 16777284,
- "Key_F22": 16777285,
- "Key_F23": 16777286,
- "Key_F24": 16777287,
- "Key_F25": 16777288,
- "Key_F26": 16777289,
- "Key_F27": 16777290,
- "Key_F28": 16777291,
- "Key_F29": 16777292,
- "Key_F30": 16777293,
- "Key_F31": 16777294,
- "Key_F32": 16777295,
- "Key_F33": 16777296,
- "Key_F34": 16777297,
- "Key_F35": 16777298,
- "Key_Super_L": 16777299,
- "Key_Super_R": 16777300,
- "Key_Menu": 16777301,
- "Key_Hyper_L": 16777302,
- "Key_Hyper_R": 16777303,
- "Key_Help": 16777304,
- "Key_Direction_L": 16777305,
- "Key_Direction_R": 16777312,
- "Key_Space": 32,
- "Key_Any": 32,
- "Key_Exclam": 33,
- "Key_QuoteDbl": 34,
- "Key_NumberSign": 35,
- "Key_Dollar": 36,
- "Key_Percent": 37,
- "Key_Ampersand": 38,
- "Key_Apostrophe": 39,
- "Key_ParenLeft": 40,
- "Key_ParenRight": 41,
- "Key_Asterisk": 42,
- "Key_Plus": 43,
- "Key_Comma": 44,
- "Key_Minus": 45,
- "Key_Period": 46,
- "Key_Slash": 47,
- "Key_0": 48,
- "Key_1": 49,
- "Key_2": 50,
- "Key_3": 51,
- "Key_4": 52,
- "Key_5": 53,
- "Key_6": 54,
- "Key_7": 55,
- "Key_8": 56,
- "Key_9": 57,
- "Key_Colon": 58,
- "Key_Semicolon": 59,
- "Key_Less": 60,
- "Key_Equal": 61,
- "Key_Greater": 62,
- "Key_Question": 63,
- "Key_At": 64,
- "Key_A": 65,
- "Key_B": 66,
- "Key_C": 67,
- "Key_D": 68,
- "Key_E": 69,
- "Key_F": 70,
- "Key_G": 71,
- "Key_H": 72,
- "Key_I": 73,
- "Key_J": 74,
- "Key_K": 75,
- "Key_L": 76,
- "Key_M": 77,
- "Key_N": 78,
- "Key_O": 79,
- "Key_P": 80,
- "Key_Q": 81,
- "Key_R": 82,
- "Key_S": 83,
- "Key_T": 84,
- "Key_U": 85,
- "Key_V": 86,
- "Key_W": 87,
- "Key_X": 88,
- "Key_Y": 89,
- "Key_Z": 90,
- "Key_BracketLeft": 91,
- "Key_Backslash": 92,
- "Key_BracketRight": 93,
- "Key_AsciiCircum": 94,
- "Key_Underscore": 95,
- "Key_QuoteLeft": 96,
- "Key_BraceLeft": 123,
- "Key_Bar": 124,
- "Key_BraceRight": 125,
- "Key_AsciiTilde": 126,
- "Key_nobreakspace": 160,
- "Key_exclamdown": 161,
- "Key_cent": 162,
- "Key_sterling": 163,
- "Key_currency": 164,
- "Key_yen": 165,
- "Key_brokenbar": 166,
- "Key_section": 167,
- "Key_diaeresis": 168,
- "Key_copyright": 169,
- "Key_ordfeminine": 170,
- "Key_guillemotleft": 171,
- "Key_notsign": 172,
- "Key_hyphen": 173,
- "Key_registered": 174,
- "Key_macron": 175,
- "Key_degree": 176,
- "Key_plusminus": 177,
- "Key_twosuperior": 178,
- "Key_threesuperior": 179,
- "Key_acute": 180,
- "Key_mu": 181,
- "Key_paragraph": 182,
- "Key_periodcentered": 183,
- "Key_cedilla": 184,
- "Key_onesuperior": 185,
- "Key_masculine": 186,
- "Key_guillemotright": 187,
- "Key_onequarter": 188,
- "Key_onehalf": 189,
- "Key_threequarters": 190,
- "Key_questiondown": 191,
- "Key_Agrave": 192,
- "Key_Aacute": 193,
- "Key_Acircumflex": 194,
- "Key_Atilde": 195,
- "Key_Adiaeresis": 196,
- "Key_Aring": 197,
- "Key_AE": 198,
- "Key_Ccedilla": 199,
- "Key_Egrave": 200,
- "Key_Eacute": 201,
- "Key_Ecircumflex": 202,
- "Key_Ediaeresis": 203,
- "Key_Igrave": 204,
- "Key_Iacute": 205,
- "Key_Icircumflex": 206,
- "Key_Idiaeresis": 207,
- "Key_ETH": 208,
- "Key_Ntilde": 209,
- "Key_Ograve": 210,
- "Key_Oacute": 211,
- "Key_Ocircumflex": 212,
- "Key_Otilde": 213,
- "Key_Odiaeresis": 214,
- "Key_multiply": 215,
- "Key_Ooblique": 216,
- "Key_Ugrave": 217,
- "Key_Uacute": 218,
- "Key_Ucircumflex": 219,
- "Key_Udiaeresis": 220,
- "Key_Yacute": 221,
- "Key_THORN": 222,
- "Key_ssharp": 223,
- "Key_division": 247,
- "Key_ydiaeresis": 255,
- "Key_AltGr": 16781571,
- "Key_Multi_key": 16781600,
- "Key_Codeinput": 16781623,
- "Key_SingleCandidate": 16781628,
- "Key_MultipleCandidate": 16781629,
- "Key_PreviousCandidate": 16781630,
- "Key_Mode_switch": 16781694,
- "Key_Kanji": 16781601,
- "Key_Muhenkan": 16781602,
- "Key_Henkan": 16781603,
- "Key_Romaji": 16781604,
- "Key_Hiragana": 16781605,
- "Key_Katakana": 16781606,
- "Key_Hiragana_Katakana": 16781607,
- "Key_Zenkaku": 16781608,
- "Key_Hankaku": 16781609,
- "Key_Zenkaku_Hankaku": 16781610,
- "Key_Touroku": 16781611,
- "Key_Massyo": 16781612,
- "Key_Kana_Lock": 16781613,
- "Key_Kana_Shift": 16781614,
- "Key_Eisu_Shift": 16781615,
- "Key_Eisu_toggle": 16781616,
- "Key_Hangul": 16781617,
- "Key_Hangul_Start": 16781618,
- "Key_Hangul_End": 16781619,
- "Key_Hangul_Hanja": 16781620,
- "Key_Hangul_Jamo": 16781621,
- "Key_Hangul_Romaja": 16781622,
- "Key_Hangul_Jeonja": 16781624,
- "Key_Hangul_Banja": 16781625,
- "Key_Hangul_PreHanja": 16781626,
- "Key_Hangul_PostHanja": 16781627,
- "Key_Hangul_Special": 16781631,
- "Key_Dead_Grave": 16781904,
- "Key_Dead_Acute": 16781905,
- "Key_Dead_Circumflex": 16781906,
- "Key_Dead_Tilde": 16781907,
- "Key_Dead_Macron": 16781908,
- "Key_Dead_Breve": 16781909,
- "Key_Dead_Abovedot": 16781910,
- "Key_Dead_Diaeresis": 16781911,
- "Key_Dead_Abovering": 16781912,
- "Key_Dead_Doubleacute": 16781913,
- "Key_Dead_Caron": 16781914,
- "Key_Dead_Cedilla": 16781915,
- "Key_Dead_Ogonek": 16781916,
- "Key_Dead_Iota": 16781917,
- "Key_Dead_Voiced_Sound": 16781918,
- "Key_Dead_Semivoiced_Sound": 16781919,
- "Key_Dead_Belowdot": 16781920,
- "Key_Dead_Hook": 16781921,
- "Key_Dead_Horn": 16781922,
- "Key_Back": 16777313,
- "Key_Forward": 16777314,
- "Key_Stop": 16777315,
- "Key_Refresh": 16777316,
- "Key_VolumeDown": 16777328,
- "Key_VolumeMute": 16777329,
- "Key_VolumeUp": 16777330,
- "Key_BassBoost": 16777331,
- "Key_BassUp": 16777332,
- "Key_BassDown": 16777333,
- "Key_TrebleUp": 16777334,
- "Key_TrebleDown": 16777335,
- "Key_MediaPlay": 16777344,
- "Key_MediaStop": 16777345,
- "Key_MediaPrevious": 16777346,
- "Key_MediaNext": 16777347,
- "Key_MediaRecord": 16777348,
- "Key_MediaPause": 16777349,
- "Key_MediaTogglePlayPause": 16777350,
- "Key_HomePage": 16777360,
- "Key_Favorites": 16777361,
- "Key_Search": 16777362,
- "Key_Standby": 16777363,
- "Key_OpenUrl": 16777364,
- "Key_LaunchMail": 16777376,
- "Key_LaunchMedia": 16777377,
- "Key_Launch0": 16777378,
- "Key_Launch1": 16777379,
- "Key_Launch2": 16777380,
- "Key_Launch3": 16777381,
- "Key_Launch4": 16777382,
- "Key_Launch5": 16777383,
- "Key_Launch6": 16777384,
- "Key_Launch7": 16777385,
- "Key_Launch8": 16777386,
- "Key_Launch9": 16777387,
- "Key_LaunchA": 16777388,
- "Key_LaunchB": 16777389,
- "Key_LaunchC": 16777390,
- "Key_LaunchD": 16777391,
- "Key_LaunchE": 16777392,
- "Key_LaunchF": 16777393,
- "Key_MonBrightnessUp": 16777394,
- "Key_MonBrightnessDown": 16777395,
- "Key_KeyboardLightOnOff": 16777396,
- "Key_KeyboardBrightnessUp": 16777397,
- "Key_KeyboardBrightnessDown": 16777398,
- "Key_PowerOff": 16777399,
- "Key_WakeUp": 16777400,
- "Key_Eject": 16777401,
- "Key_ScreenSaver": 16777402,
- "Key_WWW": 16777403,
- "Key_Memo": 16777404,
- "Key_LightBulb": 16777405,
- "Key_Shop": 16777406,
- "Key_History": 16777407,
- "Key_AddFavorite": 16777408,
- "Key_HotLinks": 16777409,
- "Key_BrightnessAdjust": 16777410,
- "Key_Finance": 16777411,
- "Key_Community": 16777412,
- "Key_AudioRewind": 16777413,
- "Key_BackForward": 16777414,
- "Key_ApplicationLeft": 16777415,
- "Key_ApplicationRight": 16777416,
- "Key_Book": 16777417,
- "Key_CD": 16777418,
- "Key_Calculator": 16777419,
- "Key_ToDoList": 16777420,
- "Key_ClearGrab": 16777421,
- "Key_Close": 16777422,
- "Key_Copy": 16777423,
- "Key_Cut": 16777424,
- "Key_Display": 16777425,
- "Key_DOS": 16777426,
- "Key_Documents": 16777427,
- "Key_Excel": 16777428,
- "Key_Explorer": 16777429,
- "Key_Game": 16777430,
- "Key_Go": 16777431,
- "Key_iTouch": 16777432,
- "Key_LogOff": 16777433,
- "Key_Market": 16777434,
- "Key_Meeting": 16777435,
- "Key_MenuKB": 16777436,
- "Key_MenuPB": 16777437,
- "Key_MySites": 16777438,
- "Key_News": 16777439,
- "Key_OfficeHome": 16777440,
- "Key_Option": 16777441,
- "Key_Paste": 16777442,
- "Key_Phone": 16777443,
- "Key_Calendar": 16777444,
- "Key_Reply": 16777445,
- "Key_Reload": 16777446,
- "Key_RotateWindows": 16777447,
- "Key_RotationPB": 16777448,
- "Key_RotationKB": 16777449,
- "Key_Save": 16777450,
- "Key_Send": 16777451,
- "Key_Spell": 16777452,
- "Key_SplitScreen": 16777453,
- "Key_Support": 16777454,
- "Key_TaskPane": 16777455,
- "Key_Terminal": 16777456,
- "Key_Tools": 16777457,
- "Key_Travel": 16777458,
- "Key_Video": 16777459,
- "Key_Word": 16777460,
- "Key_Xfer": 16777461,
- "Key_ZoomIn": 16777462,
- "Key_ZoomOut": 16777463,
- "Key_Away": 16777464,
- "Key_Messenger": 16777465,
- "Key_WebCam": 16777466,
- "Key_MailForward": 16777467,
- "Key_Pictures": 16777468,
- "Key_Music": 16777469,
- "Key_Battery": 16777470,
- "Key_Bluetooth": 16777471,
- "Key_WLAN": 16777472,
- "Key_UWB": 16777473,
- "Key_AudioForward": 16777474,
- "Key_AudioRepeat": 16777475,
- "Key_AudioRandomPlay": 16777476,
- "Key_Subtitle": 16777477,
- "Key_AudioCycleTrack": 16777478,
- "Key_Time": 16777479,
- "Key_Hibernate": 16777480,
- "Key_View": 16777481,
- "Key_TopMenu": 16777482,
- "Key_PowerDown": 16777483,
- "Key_Suspend": 16777484,
- "Key_ContrastAdjust": 16777485,
- "Key_LaunchG": 16777486,
- "Key_LaunchH": 16777487,
- "Key_TouchpadToggle": 16777488,
- "Key_TouchpadOn": 16777489,
- "Key_TouchpadOff": 16777490,
- "Key_MicMute": 16777491,
- "Key_Red": 16777492,
- "Key_Green": 16777493,
- "Key_Yellow": 16777494,
- "Key_Blue": 16777495,
- "Key_ChannelUp": 16777496,
- "Key_ChannelDown": 16777497,
- "Key_Guide": 16777498,
- "Key_Info": 16777499,
- "Key_Settings": 16777500,
- "Key_MicVolumeUp": 16777501,
- "Key_MicVolumeDown": 16777502,
- "Key_New": 16777504,
- "Key_Open": 16777505,
- "Key_Find": 16777506,
- "Key_Undo": 16777507,
- "Key_Redo": 16777508,
- "Key_MediaLast": 16842751,
- "Key_Select": 16842752,
- "Key_Yes": 16842753,
- "Key_No": 16842754,
- "Key_Cancel": 16908289,
- "Key_Printer": 16908290,
- "Key_Execute": 16908291,
- "Key_Sleep": 16908292,
- "Key_Play": 16908293,
- "Key_Zoom": 16908294,
- "Key_Exit": 16908298,
- "Key_Context1": 17825792,
- "Key_Context2": 17825793,
- "Key_Context3": 17825794,
- "Key_Context4": 17825795,
- "Key_Call": 17825796,
- "Key_Hangup": 17825797,
- "Key_Flip": 17825798,
- "Key_ToggleCallHangup": 17825799,
- "Key_VoiceDial": 17825800,
- "Key_LastNumberRedial": 17825801,
- "Key_Camera": 17825824,
- "Key_CameraFocus": 17825825,
- "Key_unknown": 33554431
- }
- }
- Enum {
- name: "ArrowType"
- values: {
- "NoArrow": 0,
- "UpArrow": 1,
- "DownArrow": 2,
- "LeftArrow": 3,
- "RightArrow": 4
- }
- }
- Enum {
- name: "PenStyle"
- values: {
- "NoPen": 0,
- "SolidLine": 1,
- "DashLine": 2,
- "DotLine": 3,
- "DashDotLine": 4,
- "DashDotDotLine": 5,
- "CustomDashLine": 6
- }
- }
- Enum {
- name: "PenCapStyle"
- values: {
- "FlatCap": 0,
- "SquareCap": 16,
- "RoundCap": 32,
- "MPenCapStyle": 48
- }
- }
- Enum {
- name: "PenJoinStyle"
- values: {
- "MiterJoin": 0,
- "BevelJoin": 64,
- "RoundJoin": 128,
- "SvgMiterJoin": 256,
- "MPenJoinStyle": 448
- }
- }
- Enum {
- name: "BrushStyle"
- values: {
- "NoBrush": 0,
- "SolidPattern": 1,
- "Dense1Pattern": 2,
- "Dense2Pattern": 3,
- "Dense3Pattern": 4,
- "Dense4Pattern": 5,
- "Dense5Pattern": 6,
- "Dense6Pattern": 7,
- "Dense7Pattern": 8,
- "HorPattern": 9,
- "VerPattern": 10,
- "CrossPattern": 11,
- "BDiagPattern": 12,
- "FDiagPattern": 13,
- "DiagCrossPattern": 14,
- "LinearGradientPattern": 15,
- "RadialGradientPattern": 16,
- "ConicalGradientPattern": 17,
- "TexturePattern": 24
- }
- }
- Enum {
- name: "SizeMode"
- values: {
- "AbsoluteSize": 0,
- "RelativeSize": 1
- }
- }
- Enum {
- name: "CursorShape"
- values: {
- "ArrowCursor": 0,
- "UpArrowCursor": 1,
- "CrossCursor": 2,
- "WaitCursor": 3,
- "IBeamCursor": 4,
- "SizeVerCursor": 5,
- "SizeHorCursor": 6,
- "SizeBDiagCursor": 7,
- "SizeFDiagCursor": 8,
- "SizeAllCursor": 9,
- "BlankCursor": 10,
- "SplitVCursor": 11,
- "SplitHCursor": 12,
- "PointingHandCursor": 13,
- "ForbiddenCursor": 14,
- "WhatsThisCursor": 15,
- "BusyCursor": 16,
- "OpenHandCursor": 17,
- "ClosedHandCursor": 18,
- "DragCopyCursor": 19,
- "DragMoveCursor": 20,
- "DragLinkCursor": 21,
- "LastCursor": 21,
- "BitmapCursor": 24,
- "CustomCursor": 25
- }
- }
- Enum {
- name: "TextFormat"
- values: {
- "PlainText": 0,
- "RichText": 1,
- "AutoText": 2
- }
- }
- Enum {
- name: "AspectRatioMode"
- values: {
- "IgnoreAspectRatio": 0,
- "KeepAspectRatio": 1,
- "KeepAspectRatioByExpanding": 2
- }
- }
- Enum {
- name: "DockWidgetArea"
- values: {
- "LeftDockWidgetArea": 1,
- "RightDockWidgetArea": 2,
- "TopDockWidgetArea": 4,
- "BottomDockWidgetArea": 8,
- "DockWidgetArea_Mask": 15,
- "AllDockWidgetAreas": 15,
- "NoDockWidgetArea": 0
- }
- }
- Enum {
- name: "DockWidgetAreas"
- values: {
- "LeftDockWidgetArea": 1,
- "RightDockWidgetArea": 2,
- "TopDockWidgetArea": 4,
- "BottomDockWidgetArea": 8,
- "DockWidgetArea_Mask": 15,
- "AllDockWidgetAreas": 15,
- "NoDockWidgetArea": 0
- }
- }
- Enum {
- name: "ToolBarArea"
- values: {
- "LeftToolBarArea": 1,
- "RightToolBarArea": 2,
- "TopToolBarArea": 4,
- "BottomToolBarArea": 8,
- "ToolBarArea_Mask": 15,
- "AllToolBarAreas": 15,
- "NoToolBarArea": 0
- }
- }
- Enum {
- name: "ToolBarAreas"
- values: {
- "LeftToolBarArea": 1,
- "RightToolBarArea": 2,
- "TopToolBarArea": 4,
- "BottomToolBarArea": 8,
- "ToolBarArea_Mask": 15,
- "AllToolBarAreas": 15,
- "NoToolBarArea": 0
- }
- }
- Enum {
- name: "DateFormat"
- values: {
- "TextDate": 0,
- "ISODate": 1,
- "SystemLocaleDate": 2,
- "LocalDate": 2,
- "LocaleDate": 3,
- "SystemLocaleShortDate": 4,
- "SystemLocaleLongDate": 5,
- "DefaultLocaleShortDate": 6,
- "DefaultLocaleLongDate": 7,
- "RFC2822Date": 8
- }
- }
- Enum {
- name: "TimeSpec"
- values: {
- "LocalTime": 0,
- "UTC": 1,
- "OffsetFromUTC": 2,
- "TimeZone": 3
- }
- }
- Enum {
- name: "DayOfWeek"
- values: {
- "Monday": 1,
- "Tuesday": 2,
- "Wednesday": 3,
- "Thursday": 4,
- "Friday": 5,
- "Saturday": 6,
- "Sunday": 7
- }
- }
- Enum {
- name: "ScrollBarPolicy"
- values: {
- "ScrollBarAsNeeded": 0,
- "ScrollBarAlwaysOff": 1,
- "ScrollBarAlwaysOn": 2
- }
- }
- Enum {
- name: "CaseSensitivity"
- values: {
- "CaseInsensitive": 0,
- "CaseSensitive": 1
- }
- }
- Enum {
- name: "Corner"
- values: {
- "TopLeftCorner": 0,
- "TopRightCorner": 1,
- "BottomLeftCorner": 2,
- "BottomRightCorner": 3
- }
- }
- Enum {
- name: "Edge"
- values: {
- "TopEdge": 1,
- "LeftEdge": 2,
- "RightEdge": 4,
- "BottomEdge": 8
- }
- }
- Enum {
- name: "Edges"
- values: {
- "TopEdge": 1,
- "LeftEdge": 2,
- "RightEdge": 4,
- "BottomEdge": 8
- }
- }
- Enum {
- name: "ConnectionType"
- values: {
- "AutoConnection": 0,
- "DirectConnection": 1,
- "QueuedConnection": 2,
- "BlockingQueuedConnection": 3,
- "UniqueConnection": 128
- }
- }
- Enum {
- name: "ShortcutContext"
- values: {
- "WidgetShortcut": 0,
- "WindowShortcut": 1,
- "ApplicationShortcut": 2,
- "WidgetWithChildrenShortcut": 3
- }
- }
- Enum {
- name: "FillRule"
- values: {
- "OddEvenFill": 0,
- "WindingFill": 1
- }
- }
- Enum {
- name: "MaskMode"
- values: {
- "MaskInColor": 0,
- "MaskOutColor": 1
- }
- }
- Enum {
- name: "ClipOperation"
- values: {
- "NoClip": 0,
- "ReplaceClip": 1,
- "IntersectClip": 2
- }
- }
- Enum {
- name: "ItemSelectionMode"
- values: {
- "ContainsItemShape": 0,
- "IntersectsItemShape": 1,
- "ContainsItemBoundingRect": 2,
- "IntersectsItemBoundingRect": 3
- }
- }
- Enum {
- name: "TransformationMode"
- values: {
- "FastTransformation": 0,
- "SmoothTransformation": 1
- }
- }
- Enum {
- name: "Axis"
- values: {
- "XAxis": 0,
- "YAxis": 1,
- "ZAxis": 2
- }
- }
- Enum {
- name: "FocusReason"
- values: {
- "MouseFocusReason": 0,
- "TabFocusReason": 1,
- "BacktabFocusReason": 2,
- "ActiveWindowFocusReason": 3,
- "PopupFocusReason": 4,
- "ShortcutFocusReason": 5,
- "MenuBarFocusReason": 6,
- "OtherFocusReason": 7,
- "NoFocusReason": 8
- }
- }
- Enum {
- name: "ContextMenuPolicy"
- values: {
- "NoContextMenu": 0,
- "DefaultContextMenu": 1,
- "ActionsContextMenu": 2,
- "CustomContextMenu": 3,
- "PreventContextMenu": 4
- }
- }
- Enum {
- name: "InputMethodQuery"
- values: {
- "ImEnabled": 1,
- "ImCursorRectangle": 2,
- "ImMicroFocus": 2,
- "ImFont": 4,
- "ImCursorPosition": 8,
- "ImSurroundingText": 16,
- "ImCurrentSelection": 32,
- "ImMaximumTextLength": 64,
- "ImAnchorPosition": 128,
- "ImHints": 256,
- "ImPreferredLanguage": 512,
- "ImAbsolutePosition": 1024,
- "ImTextBeforeCursor": 2048,
- "ImTextAfterCursor": 4096,
- "ImPlatformData": -2147483648,
- "ImQueryInput": 186,
- "ImQueryAll": -1
- }
- }
- Enum {
- name: "InputMethodQueries"
- values: {
- "ImEnabled": 1,
- "ImCursorRectangle": 2,
- "ImMicroFocus": 2,
- "ImFont": 4,
- "ImCursorPosition": 8,
- "ImSurroundingText": 16,
- "ImCurrentSelection": 32,
- "ImMaximumTextLength": 64,
- "ImAnchorPosition": 128,
- "ImHints": 256,
- "ImPreferredLanguage": 512,
- "ImAbsolutePosition": 1024,
- "ImTextBeforeCursor": 2048,
- "ImTextAfterCursor": 4096,
- "ImPlatformData": -2147483648,
- "ImQueryInput": 186,
- "ImQueryAll": -1
- }
- }
- Enum {
- name: "InputMethodHint"
- values: {
- "ImhNone": 0,
- "ImhHiddenText": 1,
- "ImhSensitiveData": 2,
- "ImhNoAutoUppercase": 4,
- "ImhPreferNumbers": 8,
- "ImhPreferUppercase": 16,
- "ImhPreferLowercase": 32,
- "ImhNoPredictiveText": 64,
- "ImhDate": 128,
- "ImhTime": 256,
- "ImhPreferLatin": 512,
- "ImhMultiLine": 1024,
- "ImhDigitsOnly": 65536,
- "ImhFormattedNumbersOnly": 131072,
- "ImhUppercaseOnly": 262144,
- "ImhLowercaseOnly": 524288,
- "ImhDialableCharactersOnly": 1048576,
- "ImhEmailCharactersOnly": 2097152,
- "ImhUrlCharactersOnly": 4194304,
- "ImhLatinOnly": 8388608,
- "ImhExclusiveInputMask": -65536
- }
- }
- Enum {
- name: "InputMethodHints"
- values: {
- "ImhNone": 0,
- "ImhHiddenText": 1,
- "ImhSensitiveData": 2,
- "ImhNoAutoUppercase": 4,
- "ImhPreferNumbers": 8,
- "ImhPreferUppercase": 16,
- "ImhPreferLowercase": 32,
- "ImhNoPredictiveText": 64,
- "ImhDate": 128,
- "ImhTime": 256,
- "ImhPreferLatin": 512,
- "ImhMultiLine": 1024,
- "ImhDigitsOnly": 65536,
- "ImhFormattedNumbersOnly": 131072,
- "ImhUppercaseOnly": 262144,
- "ImhLowercaseOnly": 524288,
- "ImhDialableCharactersOnly": 1048576,
- "ImhEmailCharactersOnly": 2097152,
- "ImhUrlCharactersOnly": 4194304,
- "ImhLatinOnly": 8388608,
- "ImhExclusiveInputMask": -65536
- }
- }
- Enum {
- name: "ToolButtonStyle"
- values: {
- "ToolButtonIconOnly": 0,
- "ToolButtonTextOnly": 1,
- "ToolButtonTextBesideIcon": 2,
- "ToolButtonTextUnderIcon": 3,
- "ToolButtonFollowStyle": 4
- }
- }
- Enum {
- name: "LayoutDirection"
- values: {
- "LeftToRight": 0,
- "RightToLeft": 1,
- "LayoutDirectionAuto": 2
- }
- }
- Enum {
- name: "DropAction"
- values: {
- "CopyAction": 1,
- "MoveAction": 2,
- "LinkAction": 4,
- "ActionMask": 255,
- "TargetMoveAction": 32770,
- "IgnoreAction": 0
- }
- }
- Enum {
- name: "DropActions"
- values: {
- "CopyAction": 1,
- "MoveAction": 2,
- "LinkAction": 4,
- "ActionMask": 255,
- "TargetMoveAction": 32770,
- "IgnoreAction": 0
- }
- }
- Enum {
- name: "CheckState"
- values: {
- "Unchecked": 0,
- "PartiallyChecked": 1,
- "Checked": 2
- }
- }
- Enum {
- name: "ItemFlags"
- values: {
- "NoItemFlags": 0,
- "ItemIsSelectable": 1,
- "ItemIsEditable": 2,
- "ItemIsDragEnabled": 4,
- "ItemIsDropEnabled": 8,
- "ItemIsUserCheckable": 16,
- "ItemIsEnabled": 32,
- "ItemIsTristate": 64,
- "ItemNeverHasChildren": 128
- }
- }
- Enum {
- name: "MatchFlags"
- values: {
- "MatchExactly": 0,
- "MatchContains": 1,
- "MatchStartsWith": 2,
- "MatchEndsWith": 3,
- "MatchRegExp": 4,
- "MatchWildcard": 5,
- "MatchFixedString": 8,
- "MatchCaseSensitive": 16,
- "MatchWrap": 32,
- "MatchRecursive": 64
- }
- }
- Enum {
- name: "WindowModality"
- values: {
- "NonModal": 0,
- "WindowModal": 1,
- "ApplicationModal": 2
- }
- }
- Enum {
- name: "TextInteractionFlag"
- values: {
- "NoTextInteraction": 0,
- "TextSelectableByMouse": 1,
- "TextSelectableByKeyboard": 2,
- "LinksAccessibleByMouse": 4,
- "LinksAccessibleByKeyboard": 8,
- "TextEditable": 16,
- "TextEditorInteraction": 19,
- "TextBrowserInteraction": 13
- }
- }
- Enum {
- name: "TextInteractionFlags"
- values: {
- "NoTextInteraction": 0,
- "TextSelectableByMouse": 1,
- "TextSelectableByKeyboard": 2,
- "LinksAccessibleByMouse": 4,
- "LinksAccessibleByKeyboard": 8,
- "TextEditable": 16,
- "TextEditorInteraction": 19,
- "TextBrowserInteraction": 13
- }
- }
- Enum {
- name: "SizeHint"
- values: {
- "MinimumSize": 0,
- "PreferredSize": 1,
- "MaximumSize": 2,
- "MinimumDescent": 3,
- "NSizeHints": 4
- }
- }
- Enum {
- name: "GestureState"
- values: {
- "NoGesture": 0,
- "GestureStarted": 1,
- "GestureUpdated": 2,
- "GestureFinished": 3,
- "GestureCanceled": 4
- }
- }
- Enum {
- name: "GestureType"
- values: {
- "TapGesture": 1,
- "TapAndHoldGesture": 2,
- "PanGesture": 3,
- "PinchGesture": 4,
- "SwipeGesture": 5,
- "CustomGesture": 256,
- "LastGestureType": -1
- }
- }
- Enum {
- name: "NativeGestureType"
- values: {
- "BeginNativeGesture": 0,
- "EndNativeGesture": 1,
- "PanNativeGesture": 2,
- "ZoomNativeGesture": 3,
- "SmartZoomNativeGesture": 4,
- "RotateNativeGesture": 5,
- "SwipeNativeGesture": 6
- }
- }
- Enum {
- name: "CursorMoveStyle"
- values: {
- "LogicalMoveStyle": 0,
- "VisualMoveStyle": 1
- }
- }
- Enum {
- name: "TimerType"
- values: {
- "PreciseTimer": 0,
- "CoarseTimer": 1,
- "VeryCoarseTimer": 2
- }
- }
- Enum {
- name: "ScrollPhase"
- values: {
- "ScrollBegin": 1,
- "ScrollUpdate": 2,
- "ScrollEnd": 3
- }
- }
- Enum {
- name: "MouseEventSource"
- values: {
- "MouseEventNotSynthesized": 0,
- "MouseEventSynthesizedBySystem": 1,
- "MouseEventSynthesizedByQt": 2
- }
- }
- }
- Component { name: "QEasingCurve"; prototype: "QQmlEasingValueType" }
}
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 2cd15c7340..118343588a 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -1,6 +1,7 @@
CXX_MODULE = qml
TARGET = qtquick2plugin
TARGETPATH = QtQuick.2
+IMPORT_VERSION = 2.6
SOURCES += \
plugin.cpp
diff --git a/src/imports/settings/plugins.qmltypes b/src/imports/settings/plugins.qmltypes
index 87503fbda5..eaa310edc9 100644
--- a/src/imports/settings/plugins.qmltypes
+++ b/src/imports/settings/plugins.qmltypes
@@ -1,4 +1,4 @@
-import QtQuick.tooling 1.1
+import QtQuick.tooling 1.2
// This file describes the plugin-supplied types contained in the library.
// It is used for QML tooling purposes only.
@@ -7,6 +7,7 @@ import QtQuick.tooling 1.1
// 'qmlplugindump -nonrelocatable Qt.labs.settings 1.0'
Module {
+ dependencies: []
Component {
name: "QQmlSettings"
prototype: "QObject"
diff --git a/src/imports/settings/qqmlsettings_p.h b/src/imports/settings/qqmlsettings_p.h
index a1207eb81c..d3eeaafb62 100644
--- a/src/imports/settings/qqmlsettings_p.h
+++ b/src/imports/settings/qqmlsettings_p.h
@@ -34,6 +34,17 @@
#ifndef QQMLSETTINGS_P_H
#define QQMLSETTINGS_P_H
+//
+// W A R N I N G
+// -------------
+//
+// This file is not part of the Qt API. It exists purely as an
+// implementation detail. This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
#include <QtQml/qqml.h>
#include <QtCore/qobject.h>
#include <QtCore/qscopedpointer.h>
diff --git a/src/im