aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMatthew Vogt <matthew.vogt@nokia.com>2012-02-16 14:43:03 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-24 04:51:31 +0100
commitb855240b782395f94315f43ea3e7e182299fac48 (patch)
treebc594c04449be8cd14cd0ab0bb72dafc2be0ffb2 /src
parent6a42a6e0a9a1abdda0d07a5a20b4ac7e45348684 (diff)
Rename QDeclarative symbols to QQuick and QQml
Symbols beginning with QDeclarative are already exported by the quick1 module. Users can apply the bin/rename-qtdeclarative-symbols.sh script to modify client code using the previous names of the renamed symbols. Task-number: QTBUG-23737 Change-Id: Ifaa482663767634931e8711a8e9bf6e404859e66 Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/declarative/debugger/debugger.pri32
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebug.cpp1072
-rw-r--r--src/declarative/debugger/qdeclarativeenginedebug_p.h397
-rw-r--r--src/declarative/qml/parser/parser.pri19
-rw-r--r--src/declarative/qml/qdeclarative.h451
-rw-r--r--src/declarative/qml/qdeclarativecompiler_p.h466
-rw-r--r--src/declarative/qml/qdeclarativeextensioninterface.h75
-rw-r--r--src/declarative/qml/qdeclarativeinfo.h103
-rw-r--r--src/declarative/qml/qml.pri125
-rw-r--r--src/declarative/qml/v4/qv4irbuilder_p.h240
-rw-r--r--src/declarative/util/util.pri5
-rw-r--r--src/imports/folderlistmodel/folderlistmodel.pro8
-rw-r--r--src/imports/folderlistmodel/plugin.cpp12
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.cpp (renamed from src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp)82
-rw-r--r--src/imports/folderlistmodel/qquickfolderlistmodel.h (renamed from src/imports/folderlistmodel/qdeclarativefolderlistmodel.h)26
-rw-r--r--src/imports/localstorage/localstorage.pro4
-rw-r--r--src/imports/localstorage/plugin.cpp46
-rw-r--r--src/imports/qimportbase.pri2
-rw-r--r--src/imports/qtquick2/plugin.cpp8
-rw-r--r--src/imports/qtquick2/qtquick2.pro4
-rw-r--r--src/imports/testlib/main.cpp28
-rw-r--r--src/imports/testlib/signalspy.h6
-rw-r--r--src/imports/testlib/testcase.h6
-rw-r--r--src/imports/testlib/testlib.pro6
-rw-r--r--src/imports/xmllistmodel/plugin.cpp14
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel.cpp (renamed from src/imports/xmllistmodel/qdeclarativexmllistmodel.cpp)276
-rw-r--r--src/imports/xmllistmodel/qqmlxmllistmodel_p.h (renamed from src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h)52
-rw-r--r--src/imports/xmllistmodel/xmllistmodel.pro8
-rw-r--r--src/plugins/accessible/quick/main.cpp4
-rw-r--r--src/plugins/accessible/quick/qaccessiblequickitem.cpp4
-rw-r--r--src/plugins/accessible/quick/qaccessiblequickitem.h6
-rw-r--r--src/plugins/accessible/quick/qaccessiblequickview.cpp4
-rw-r--r--src/plugins/accessible/quick/qaccessiblequickview.h2
-rw-r--r--src/plugins/accessible/quick/quick.pro2
-rw-r--r--src/plugins/accessible/shared/qaccessiblebase.pri4
-rw-r--r--src/plugins/accessible/shared/qqmlaccessible.cpp (renamed from src/plugins/accessible/shared/qdeclarativeaccessible.cpp)18
-rw-r--r--src/plugins/accessible/shared/qqmlaccessible.h (renamed from src/plugins/accessible/shared/qdeclarativeaccessible.h)18
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro4
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp12
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h12
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/qostdevice.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_ost/usbostcomm.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/highlight.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro6
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp6
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h4
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp4
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h16
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp2
-rw-r--r--src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h2
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro6
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp16
-rw-r--r--src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h12
-rw-r--r--src/plugins/qmltooling/shared/abstracttool.cpp2
-rw-r--r--src/plugins/qmltooling/shared/abstracttool.h2
-rw-r--r--src/plugins/qmltooling/shared/abstractviewinspector.cpp30
-rw-r--r--src/plugins/qmltooling/shared/abstractviewinspector.h14
-rw-r--r--src/plugins/qmltooling/shared/qmlinspectorconstants.h4
-rw-r--r--src/plugins/qmltooling/shared/qqmlinspectorprotocol.h (renamed from src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h)8
-rw-r--r--src/qml/animations/animations.pri (renamed from src/declarative/animations/animations.pri)0
-rw-r--r--src/qml/animations/qabstractanimationjob.cpp (renamed from src/declarative/animations/qabstractanimationjob.cpp)58
-rw-r--r--src/qml/animations/qabstractanimationjob_p.h (renamed from src/declarative/animations/qabstractanimationjob_p.h)17
-rw-r--r--src/qml/animations/qanimationgroupjob.cpp (renamed from src/declarative/animations/qanimationgroupjob.cpp)2
-rw-r--r--src/qml/animations/qanimationgroupjob_p.h (renamed from src/declarative/animations/qanimationgroupjob_p.h)6
-rw-r--r--src/qml/animations/qanimationjobutil_p.h (renamed from src/declarative/animations/qanimationjobutil_p.h)2
-rw-r--r--src/qml/animations/qparallelanimationgroupjob.cpp (renamed from src/declarative/animations/qparallelanimationgroupjob.cpp)2
-rw-r--r--src/qml/animations/qparallelanimationgroupjob_p.h (renamed from src/declarative/animations/qparallelanimationgroupjob_p.h)6
-rw-r--r--src/qml/animations/qpauseanimationjob.cpp (renamed from src/declarative/animations/qpauseanimationjob.cpp)2
-rw-r--r--src/qml/animations/qpauseanimationjob_p.h (renamed from src/declarative/animations/qpauseanimationjob_p.h)6
-rw-r--r--src/qml/animations/qsequentialanimationgroupjob.cpp (renamed from src/declarative/animations/qsequentialanimationgroupjob.cpp)2
-rw-r--r--src/qml/animations/qsequentialanimationgroupjob_p.h (renamed from src/declarative/animations/qsequentialanimationgroupjob_p.h)6
-rw-r--r--src/qml/debugger/debugger.pri32
-rw-r--r--src/qml/debugger/qdebugmessageservice.cpp (renamed from src/declarative/debugger/qdebugmessageservice.cpp)16
-rw-r--r--src/qml/debugger/qdebugmessageservice_p.h (renamed from src/declarative/debugger/qdebugmessageservice_p.h)8
-rw-r--r--src/qml/debugger/qpacketprotocol.cpp (renamed from src/declarative/debugger/qpacketprotocol.cpp)2
-rw-r--r--src/qml/debugger/qpacketprotocol_p.h (renamed from src/declarative/debugger/qpacketprotocol_p.h)10
-rw-r--r--src/qml/debugger/qqmldebug.h (renamed from src/declarative/debugger/qdeclarativedebug.h)18
-rw-r--r--src/qml/debugger/qqmldebugclient.cpp (renamed from src/declarative/debugger/qdeclarativedebugclient.cpp)128
-rw-r--r--src/qml/debugger/qqmldebugclient_p.h (renamed from src/declarative/debugger/qdeclarativedebugclient_p.h)42
-rw-r--r--src/qml/debugger/qqmldebughelper.cpp (renamed from src/declarative/debugger/qdeclarativedebughelper.cpp)22
-rw-r--r--src/qml/debugger/qqmldebughelper_p.h (renamed from src/declarative/debugger/qdeclarativedebughelper_p.h)18
-rw-r--r--src/qml/debugger/qqmldebugserver.cpp (renamed from src/declarative/debugger/qdeclarativedebugserver.cpp)189
-rw-r--r--src/qml/debugger/qqmldebugserver_p.h (renamed from src/declarative/debugger/qdeclarativedebugserver_p.h)46
-rw-r--r--src/qml/debugger/qqmldebugserverconnection_p.h (renamed from src/declarative/debugger/qdeclarativedebugserverconnection_p.h)23
-rw-r--r--src/qml/debugger/qqmldebugservice.cpp (renamed from src/declarative/debugger/qdeclarativedebugservice.cpp)82
-rw-r--r--src/qml/debugger/qqmldebugservice_p.h (renamed from src/declarative/debugger/qdeclarativedebugservice_p.h)28
-rw-r--r--src/qml/debugger/qqmldebugservice_p_p.h (renamed from src/declarative/debugger/qdeclarativedebugservice_p_p.h)20
-rw-r--r--src/qml/debugger/qqmldebugstatesdelegate_p.h (renamed from src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h)28
-rw-r--r--src/qml/debugger/qqmlenginedebug.cpp1072
-rw-r--r--src/qml/debugger/qqmlenginedebug_p.h397
-rw-r--r--src/qml/debugger/qqmlenginedebugservice.cpp (renamed from src/declarative/debugger/qdeclarativeenginedebugservice.cpp)232
-rw-r--r--src/qml/debugger/qqmlenginedebugservice_p.h (renamed from src/declarative/debugger/qdeclarativeenginedebugservice_p.h)60
-rw-r--r--src/qml/debugger/qqmlinspectorinterface_p.h (renamed from src/declarative/debugger/qdeclarativeinspectorinterface_p.h)18
-rw-r--r--src/qml/debugger/qqmlinspectorservice.cpp (renamed from src/declarative/debugger/qdeclarativeinspectorservice.cpp)56
-rw-r--r--src/qml/debugger/qqmlinspectorservice_p.h (renamed from src/declarative/debugger/qdeclarativeinspectorservice_p.h)24
-rw-r--r--src/qml/debugger/qqmlprofilerservice.cpp (renamed from src/declarative/debugger/qdeclarativeprofilerservice.cpp)138
-rw-r--r--src/qml/debugger/qqmlprofilerservice_p.h (renamed from src/declarative/debugger/qdeclarativeprofilerservice_p.h)32
-rw-r--r--src/qml/debugger/qv8debugservice.cpp (renamed from src/declarative/debugger/qv8debugservice.cpp)12
-rw-r--r--src/qml/debugger/qv8debugservice_p.h (renamed from src/declarative/debugger/qv8debugservice_p.h)6
-rw-r--r--src/qml/debugger/qv8profilerservice.cpp (renamed from src/declarative/debugger/qv8profilerservice.cpp)16
-rw-r--r--src/qml/debugger/qv8profilerservice_p.h (renamed from src/declarative/debugger/qv8profilerservice_p.h)8
-rw-r--r--src/qml/qml.pro (renamed from src/declarative/declarative.pro)15
-rw-r--r--src/qml/qml/ftw/ftw.pri (renamed from src/declarative/qml/ftw/ftw.pri)14
-rw-r--r--src/qml/qml/ftw/qbitfield_p.h (renamed from src/declarative/qml/ftw/qbitfield_p.h)2
-rw-r--r--src/qml/qml/ftw/qdeletewatcher_p.h (renamed from src/declarative/qml/ftw/qdeletewatcher_p.h)2
-rw-r--r--src/qml/qml/ftw/qfastmetabuilder.cpp (renamed from src/declarative/qml/ftw/qfastmetabuilder.cpp)2
-rw-r--r--src/qml/qml/ftw/qfastmetabuilder_p.h (renamed from src/declarative/qml/ftw/qfastmetabuilder_p.h)2
-rw-r--r--src/qml/qml/ftw/qfieldlist_p.h (renamed from src/declarative/qml/ftw/qfieldlist_p.h)2
-rw-r--r--src/qml/qml/ftw/qfinitestack_p.h (renamed from src/declarative/qml/ftw/qfinitestack_p.h)2
-rw-r--r--src/qml/qml/ftw/qflagpointer_p.h (renamed from src/declarative/qml/ftw/qflagpointer_p.h)2
-rw-r--r--src/qml/qml/ftw/qhashedstring.cpp (renamed from src/declarative/qml/ftw/qhashedstring.cpp)2
-rw-r--r--src/qml/qml/ftw/qhashedstring_p.h (renamed from src/declarative/qml/ftw/qhashedstring_p.h)2
-rw-r--r--src/qml/qml/ftw/qhashfield_p.h (renamed from src/declarative/qml/ftw/qhashfield_p.h)2
-rw-r--r--src/qml/qml/ftw/qintrusivelist.cpp (renamed from src/declarative/qml/ftw/qintrusivelist.cpp)2
-rw-r--r--src/qml/qml/ftw/qintrusivelist_p.h (renamed from src/declarative/qml/ftw/qintrusivelist_p.h)2
-rw-r--r--src/qml/qml/ftw/qlazilyallocated_p.h (renamed from src/declarative/qml/ftw/qlazilyallocated_p.h)2
-rw-r--r--src/qml/qml/ftw/qpodvector_p.h (renamed from src/declarative/qml/ftw/qpodvector_p.h)2
-rw-r--r--src/qml/qml/ftw/qpointervaluepair_p.h (renamed from src/declarative/qml/ftw/qpointervaluepair_p.h)2
-rw-r--r--src/qml/qml/ftw/qqmlpool.cpp (renamed from src/declarative/qml/ftw/qdeclarativepool.cpp)12
-rw-r--r--src/qml/qml/ftw/qqmlpool_p.h (renamed from src/declarative/qml/ftw/qdeclarativepool_p.h)60
-rw-r--r--src/qml/qml/ftw/qqmlrefcount_p.h (renamed from src/declarative/qml/ftw/qdeclarativerefcount_p.h)54
-rw-r--r--src/qml/qml/ftw/qqmlthread.cpp (renamed from src/declarative/qml/ftw/qdeclarativethread.cpp)76
-rw-r--r--src/qml/qml/ftw/qqmlthread_p.h (renamed from src/declarative/qml/ftw/qdeclarativethread_p.h)70
-rw-r--r--src/qml/qml/ftw/qqmltrace.cpp (renamed from src/declarative/qml/ftw/qdeclarativetrace.cpp)52
-rw-r--r--src/qml/qml/ftw/qqmltrace_p.h (renamed from src/declarative/qml/ftw/qdeclarativetrace_p.h)78
-rw-r--r--src/qml/qml/ftw/qrecursionwatcher_p.h (renamed from src/declarative/qml/ftw/qrecursionwatcher_p.h)2
-rw-r--r--src/qml/qml/ftw/qrecyclepool_p.h (renamed from src/declarative/qml/ftw/qrecyclepool_p.h)2
-rw-r--r--src/qml/qml/parser/parser.pri19
-rw-r--r--src/qml/qml/parser/qqmljs.g (renamed from src/declarative/qml/parser/qdeclarativejs.g)46
-rw-r--r--src/qml/qml/parser/qqmljsast.cpp (renamed from src/declarative/qml/parser/qdeclarativejsast.cpp)10
-rw-r--r--src/qml/qml/parser/qqmljsast_p.h (renamed from src/declarative/qml/parser/qdeclarativejsast_p.h)196
-rw-r--r--src/qml/qml/parser/qqmljsastfwd_p.h (renamed from src/declarative/qml/parser/qdeclarativejsastfwd_p.h)10
-rw-r--r--src/qml/qml/parser/qqmljsastvisitor.cpp (renamed from src/declarative/qml/parser/qdeclarativejsastvisitor.cpp)8
-rw-r--r--src/qml/qml/parser/qqmljsastvisitor_p.h (renamed from src/declarative/qml/parser/qdeclarativejsastvisitor_p.h)16
-rw-r--r--src/qml/qml/parser/qqmljsengine_p.cpp (renamed from src/declarative/qml/parser/qdeclarativejsengine_p.cpp)14
-rw-r--r--src/qml/qml/parser/qqmljsengine_p.h (renamed from src/declarative/qml/parser/qdeclarativejsengine_p.h)18
-rw-r--r--src/qml/qml/parser/qqmljsglobal_p.h (renamed from src/declarative/qml/parser/qdeclarativejsglobal_p.h)10
-rw-r--r--src/qml/qml/parser/qqmljsgrammar.cpp (renamed from src/declarative/qml/parser/qdeclarativejsgrammar.cpp)18
-rw-r--r--src/qml/qml/parser/qqmljsgrammar_p.h (renamed from src/declarative/qml/parser/qdeclarativejsgrammar_p.h)8
-rw-r--r--src/qml/qml/parser/qqmljskeywords_p.h (renamed from src/declarative/qml/parser/qdeclarativejskeywords_p.h)8
-rw-r--r--src/qml/qml/parser/qqmljslexer.cpp (renamed from src/declarative/qml/parser/qdeclarativejslexer.cpp)32
-rw-r--r--src/qml/qml/parser/qqmljslexer_p.h (renamed from src/declarative/qml/parser/qdeclarativejslexer_p.h)16
-rw-r--r--src/qml/qml/parser/qqmljsmemorypool_p.h (renamed from src/declarative/qml/parser/qdeclarativejsmemorypool_p.h)12
-rw-r--r--src/qml/qml/parser/qqmljsparser.cpp (renamed from src/declarative/qml/parser/qdeclarativejsparser.cpp)26
-rw-r--r--src/qml/qml/parser/qqmljsparser_p.h (renamed from src/declarative/qml/parser/qdeclarativejsparser_p.h)22
-rw-r--r--src/qml/qml/qlistmodelinterface.cpp (renamed from src/declarative/qml/qlistmodelinterface.cpp)4
-rw-r--r--src/qml/qml/qlistmodelinterface_p.h (renamed from src/declarative/qml/qlistmodelinterface_p.h)6
-rw-r--r--src/qml/qml/qml.pri125
-rw-r--r--src/qml/qml/qqml.h451
-rw-r--r--src/qml/qml/qqmlaccessors.cpp (renamed from src/declarative/qml/qdeclarativeaccessors.cpp)34
-rw-r--r--src/qml/qml/qqmlaccessors_p.h (renamed from src/declarative/qml/qdeclarativeaccessors_p.h)45
-rw-r--r--src/qml/qml/qqmlbinding.cpp (renamed from src/declarative/qml/qdeclarativebinding.cpp)220
-rw-r--r--src/qml/qml/qqmlbinding_p.h (renamed from src/declarative/qml/qdeclarativebinding_p.h)124
-rw-r--r--src/qml/qml/qqmlbinding_p_p.h (renamed from src/declarative/qml/qdeclarativebinding_p_p.h)26
-rw-r--r--src/qml/qml/qqmlboundsignal.cpp (renamed from src/declarative/qml/qdeclarativeboundsignal.cpp)104
-rw-r--r--src/qml/qml/qqmlboundsignal_p.h (renamed from src/declarative/qml/qdeclarativeboundsignal_p.h)36
-rw-r--r--src/qml/qml/qqmlcleanup.cpp (renamed from src/declarative/qml/qdeclarativecleanup.cpp)38
-rw-r--r--src/qml/qml/qqmlcleanup_p.h (renamed from src/declarative/qml/qdeclarativecleanup_p.h)30
-rw-r--r--src/qml/qml/qqmlcompileddata.cpp (renamed from src/declarative/qml/qdeclarativecompileddata.cpp)76
-rw-r--r--src/qml/qml/qqmlcompiler.cpp (renamed from src/declarative/qml/qdeclarativecompiler.cpp)612
-rw-r--r--src/qml/qml/qqmlcompiler_p.h466
-rw-r--r--src/qml/qml/qqmlcomponent.cpp (renamed from src/declarative/qml/qdeclarativecomponent.cpp)419
-rw-r--r--src/qml/qml/qqmlcomponent.h (renamed from src/declarative/qml/qdeclarativecomponent.h)80
-rw-r--r--src/qml/qml/qqmlcomponent_p.h (renamed from src/declarative/qml/qdeclarativecomponent_p.h)62
-rw-r--r--src/qml/qml/qqmlcomponentattached_p.h (renamed from src/declarative/qml/qdeclarativecomponentattached_p.h)26
-rw-r--r--src/qml/qml/qqmlcontext.cpp (renamed from src/declarative/qml/qdeclarativecontext.cpp)274
-rw-r--r--src/qml/qml/qqmlcontext.h (renamed from src/declarative/qml/qdeclarativecontext.h)60
-rw-r--r--src/qml/qml/qqmlcontext_p.h (renamed from src/declarative/qml/qdeclarativecontext_p.h)178
-rw-r--r--src/qml/qml/qqmlcustomparser.cpp (renamed from src/declarative/qml/qdeclarativecustomparser.cpp)102
-rw-r--r--src/qml/qml/qqmlcustomparser_p.h (renamed from src/declarative/qml/qdeclarativecustomparser_p.h)94
-rw-r--r--src/qml/qml/qqmlcustomparser_p_p.h (renamed from src/declarative/qml/qdeclarativecustomparser_p_p.h)28
-rw-r--r--src/qml/qml/qqmldata_p.h (renamed from src/declarative/qml/qdeclarativedata_p.h)76
-rw-r--r--src/qml/qml/qqmldirparser.cpp (renamed from src/declarative/qml/qdeclarativedirparser.cpp)54
-rw-r--r--src/qml/qml/qqmldirparser_p.h (renamed from src/declarative/qml/qdeclarativedirparser_p.h)26
-rw-r--r--src/qml/qml/qqmlengine.cpp (renamed from src/declarative/qml/qdeclarativeengine.cpp)650
-rw-r--r--src/qml/qml/qqmlengine.h (renamed from src/declarative/qml/qdeclarativeengine.h)64
-rw-r--r--src/qml/qml/qqmlengine_p.h (renamed from src/declarative/qml/qdeclarativeengine_p.h)276
-rw-r--r--src/qml/qml/qqmlerror.cpp (renamed from src/declarative/qml/qdeclarativeerror.cpp)62
-rw-r--r--src/qml/qml/qqmlerror.h (renamed from src/declarative/qml/qdeclarativeerror.h)26
-rw-r--r--src/qml/qml/qqmlexpression.cpp (renamed from src/declarative/qml/qdeclarativeexpression.cpp)342
-rw-r--r--src/qml/qml/qqmlexpression.h (renamed from src/declarative/qml/qdeclarativeexpression.h)66
-rw-r--r--src/qml/qml/qqmlexpression_p.h (renamed from src/declarative/qml/qdeclarativeexpression_p.h)194
-rw-r--r--src/qml/qml/qqmlextensioninterface.h (renamed from src/declarative/qml/qdeclarativepropertyvaluesource.h)30
-rw-r--r--src/qml/qml/qqmlextensionplugin.cpp (renamed from src/declarative/qml/qdeclarativeextensionplugin.cpp)24
-rw-r--r--src/qml/qml/qqmlextensionplugin.h (renamed from src/declarative/qml/qdeclarativeextensionplugin.h)28
-rw-r--r--src/qml/qml/qqmlglobal_p.h (renamed from src/declarative/qml/qdeclarativeglobal_p.h)18
-rw-r--r--src/qml/qml/qqmlguard_p.h (renamed from src/declarative/qml/qdeclarativeguard_p.h)74
-rw-r--r--src/qml/qml/qqmlimageprovider.cpp (renamed from src/declarative/qml/qdeclarativeimageprovider.cpp)56
-rw-r--r--src/qml/qml/qqmlimageprovider.h (renamed from src/declarative/qml/qdeclarativeimageprovider.h)27
-rw-r--r--src/qml/qml/qqmlimport.cpp (renamed from src/declarative/qml/qdeclarativeimport.cpp)366
-rw-r--r--src/qml/qml/qqmlimport_p.h (renamed from src/declarative/qml/qdeclarativeimport_p.h)78
-rw-r--r--src/qml/qml/qqmlincubator.cpp (renamed from src/declarative/qml/qdeclarativeincubator.cpp)250
-rw-r--r--src/qml/qml/qqmlincubator.h (renamed from src/declarative/qml/qdeclarativeincubator.h)52
-rw-r--r--src/qml/qml/qqmlincubator_p.h (renamed from src/declarative/qml/qdeclarativeincubator_p.h)52
-rw-r--r--src/qml/qml/qqmlinfo.cpp (renamed from src/declarative/qml/qdeclarativeinfo.cpp)62
-rw-r--r--src/qml/qml/qqmlinfo.h103
-rw-r--r--src/qml/qml/qqmlinstruction.cpp (renamed from src/declarative/qml/qdeclarativeinstruction.cpp)148
-rw-r--r--src/qml/qml/qqmlinstruction_p.h (renamed from src/declarative/qml/qdeclarativeinstruction_p.h)36
-rw-r--r--src/qml/qml/qqmlintegercache.cpp (renamed from src/declarative/qml/qdeclarativeintegercache.cpp)16
-rw-r--r--src/qml/qml/qqmlintegercache_p.h (renamed from src/declarative/qml/qdeclarativeintegercache_p.h)24
-rw-r--r--src/qml/qml/qqmllist.cpp (renamed from src/declarative/qml/qdeclarativelist.cpp)142
-rw-r--r--src/qml/qml/qqmllist.h (renamed from src/declarative/qml/qdeclarativelist.h)62
-rw-r--r--src/qml/qml/qqmllist_p.h (renamed from src/declarative/qml/qdeclarativelist_p.h)24
-rw-r--r--src/qml/qml/qqmllocale.cpp (renamed from src/declarative/qml/qdeclarativelocale.cpp)42
-rw-r--r--src/qml/qml/qqmllocale_p.h (renamed from src/declarative/qml/qdeclarativelocale_p.h)18
-rw-r--r--src/qml/qml/qqmlmetatype.cpp (renamed from src/declarative/qml/qdeclarativemetatype.cpp)388
-rw-r--r--src/qml/qml/qqmlmetatype_p.h (renamed from src/declarative/qml/qdeclarativemetatype_p.h)118
-rw-r--r--src/qml/qml/qqmlnetworkaccessmanagerfactory.cpp (renamed from src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.cpp)16
-rw-r--r--src/qml/qml/qqmlnetworkaccessmanagerfactory.h (renamed from src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h)13
-rw-r--r--src/qml/qml/qqmlnotifier.cpp (renamed from src/declarative/qml/qdeclarativenotifier.cpp)18
-rw-r--r--src/qml/qml/qqmlnotifier_p.h (renamed from src/declarative/qml/qdeclarativenotifier_p.h)84
-rw-r--r--src/qml/qml/qqmlnullablevalue_p_p.h (renamed from src/declarative/qml/qdeclarativenullablevalue_p_p.h)20
-rw-r--r--src/qml/qml/qqmlopenmetaobject.cpp (renamed from src/declarative/qml/qdeclarativeopenmetaobject.cpp)104
-rw-r--r--src/qml/qml/qqmlopenmetaobject_p.h (renamed from src/declarative/qml/qdeclarativeopenmetaobject_p.h)46
-rw-r--r--src/qml/qml/qqmlparserstatus.cpp (renamed from src/declarative/qml/qdeclarativeparserstatus.cpp)28
-rw-r--r--src/qml/qml/qqmlparserstatus.h (renamed from src/declarative/qml/qdeclarativeparserstatus.h)27
-rw-r--r--src/qml/qml/qqmlprivate.h (renamed from src/declarative/qml/qdeclarativeprivate.h)48
-rw-r--r--src/qml/qml/qqmlproperty.cpp (renamed from src/declarative/qml/qdeclarativeproperty.cpp)548
-rw-r--r--src/qml/qml/qqmlproperty.h (renamed from src/declarative/qml/qdeclarativeproperty.h)55
-rw-r--r--src/qml/qml/qqmlproperty_p.h (renamed from src/declarative/qml/qdeclarativeproperty_p.h)110
-rw-r--r--src/qml/qml/qqmlpropertycache.cpp (renamed from src/declarative/qml/qdeclarativepropertycache.cpp)296
-rw-r--r--src/qml/qml/qqmlpropertycache_p.h (renamed from src/declarative/qml/qdeclarativepropertycache_p.h)178
-rw-r--r--src/qml/qml/qqmlpropertyvalueinterceptor.cpp (renamed from src/declarative/qml/qdeclarativepropertyvalueinterceptor.cpp)20
-rw-r--r--src/qml/qml/qqmlpropertyvalueinterceptor_p.h (renamed from src/declarative/qml/qdeclarativepropertyvalueinterceptor_p.h)21
-rw-r--r--src/qml/qml/qqmlpropertyvaluesource.cpp (renamed from src/declarative/qml/qdeclarativepropertyvaluesource.cpp)18
-rw-r--r--src/qml/qml/qqmlpropertyvaluesource.h67
-rw-r--r--src/qml/qml/qqmlproxymetaobject.cpp (renamed from src/declarative/qml/qdeclarativeproxymetaobject.cpp)14
-rw-r--r--src/qml/qml/qqmlproxymetaobject_p.h (renamed from src/declarative/qml/qdeclarativeproxymetaobject_p.h)16
-rw-r--r--src/qml/qml/qqmlrewrite.cpp (renamed from src/declarative/qml/qdeclarativerewrite.cpp)22
-rw-r--r--src/qml/qml/qqmlrewrite_p.h (renamed from src/declarative/qml/qdeclarativerewrite_p.h)24
-rw-r--r--src/qml/qml/qqmlscript.cpp (renamed from src/declarative/qml/qdeclarativescript.cpp)394
-rw-r--r--src/qml/qml/qqmlscript_p.h (renamed from src/declarative/qml/qdeclarativescript_p.h)104
-rw-r--r--src/qml/qml/qqmlscriptstring.cpp (renamed from src/declarative/qml/qdeclarativescriptstring.cpp)42
-rw-r--r--src/qml/qml/qqmlscriptstring.h (renamed from src/declarative/qml/qdeclarativescriptstring.h)35
-rw-r--r--src/qml/qml/qqmlscriptstring_p.h (renamed from src/declarative/qml/qdeclarativescriptstring_p.h)16
-rw-r--r--src/qml/qml/qqmlstringconverters.cpp (renamed from src/declarative/qml/qdeclarativestringconverters.cpp)26
-rw-r--r--src/qml/qml/qqmlstringconverters_p.h (renamed from src/declarative/qml/qdeclarativestringconverters_p.h)34
-rw-r--r--src/qml/qml/qqmltypeloader.cpp (renamed from src/declarative/qml/qdeclarativetypeloader.cpp)618
-rw-r--r--src/qml/qml/qqmltypeloader_p.h (renamed from src/declarative/qml/qdeclarativetypeloader_p.h)246
-rw-r--r--src/qml/qml/qqmltypenamecache.cpp (renamed from src/declarative/qml/qdeclarativetypenamecache.cpp)22
-rw-r--r--src/qml/qml/qqmltypenamecache_p.h (renamed from src/declarative/qml/qdeclarativetypenamecache_p.h)64
-rw-r--r--src/qml/qml/qqmltypenotavailable.cpp (renamed from src/declarative/qml/qdeclarativetypenotavailable.cpp)8
-rw-r--r--src/qml/qml/qqmltypenotavailable_p.h (renamed from src/declarative/qml/qdeclarativetypenotavailable_p.h)16
-rw-r--r--src/qml/qml/qqmlvaluetype.cpp (renamed from src/declarative/qml/qdeclarativevaluetype.cpp)310
-rw-r--r--src/qml/qml/qqmlvaluetype_p.h (renamed from src/declarative/qml/qdeclarativevaluetype_p.h)122
-rw-r--r--src/qml/qml/qqmlvme.cpp (renamed from src/declarative/qml/qdeclarativevme.cpp)340
-rw-r--r--src/qml/qml/qqmlvme_p.h (renamed from src/declarative/qml/qdeclarativevme_p.h)106
-rw-r--r--src/qml/qml/qqmlvmemetaobject.cpp (renamed from src/declarative/qml/qdeclarativevmemetaobject.cpp)260
-rw-r--r--src/qml/qml/qqmlvmemetaobject_p.h (renamed from src/declarative/qml/qdeclarativevmemetaobject_p.h)58
-rw-r--r--src/qml/qml/qqmlwatcher.cpp (renamed from src/declarative/qml/qdeclarativewatcher.cpp)82
-rw-r--r--src/qml/qml/qqmlwatcher_p.h (renamed from src/declarative/qml/qdeclarativewatcher_p.h)22
-rw-r--r--src/qml/qml/qqmlxmlhttprequest.cpp (renamed from src/declarative/qml/qdeclarativexmlhttprequest.cpp)264
-rw-r--r--src/qml/qml/qqmlxmlhttprequest_p.h (renamed from src/declarative/qml/qdeclarativexmlhttprequest_p.h)10
-rw-r--r--src/qml/qml/qquickapplication.cpp (renamed from src/declarative/qml/qdeclarativeapplication.cpp)28
-rw-r--r--src/qml/qml/qquickapplication_p.h (renamed from src/declarative/qml/qdeclarativeapplication_p.h)26
-rw-r--r--src/qml/qml/qquicklistmodel.cpp (renamed from src/declarative/qml/qdeclarativelistmodel.cpp)248
-rw-r--r--src/qml/qml/qquicklistmodel_p.h (renamed from src/declarative/qml/qdeclarativelistmodel_p.h)60
-rw-r--r--src/qml/qml/qquicklistmodel_p_p.h (renamed from src/declarative/qml/qdeclarativelistmodel_p_p.h)46
-rw-r--r--src/qml/qml/qquicklistmodelworkeragent.cpp (renamed from src/declarative/qml/qdeclarativelistmodelworkeragent.cpp)64
-rw-r--r--src/qml/qml/qquicklistmodelworkeragent_p.h (renamed from src/declarative/qml/qdeclarativelistmodelworkeragent_p.h)44
-rw-r--r--src/qml/qml/qquickworkerscript.cpp (renamed from src/declarative/qml/qdeclarativeworkerscript.cpp)162
-rw-r--r--src/qml/qml/qquickworkerscript_p.h (renamed from src/declarative/qml/qdeclarativeworkerscript_p.h)50
-rw-r--r--src/qml/qml/rewriter/rewriter.pri (renamed from src/declarative/qml/rewriter/rewriter.pri)0
-rw-r--r--src/qml/qml/rewriter/textwriter.cpp (renamed from src/declarative/qml/rewriter/textwriter.cpp)4
-rw-r--r--src/qml/qml/rewriter/textwriter_p.h (renamed from src/declarative/qml/rewriter/textwriter_p.h)8
-rw-r--r--src/qml/qml/v4/qv4bindings.cpp (renamed from src/declarative/qml/v4/qv4bindings.cpp)86
-rw-r--r--src/qml/qml/v4/qv4bindings_p.h (renamed from src/declarative/qml/v4/qv4bindings_p.h)40
-rw-r--r--src/qml/qml/v4/qv4compiler.cpp (renamed from src/declarative/qml/v4/qv4compiler.cpp)35
-rw-r--r--src/qml/qml/v4/qv4compiler_p.h (renamed from src/declarative/qml/v4/qv4compiler_p.h)28
-rw-r--r--src/qml/qml/v4/qv4compiler_p_p.h (renamed from src/declarative/qml/v4/qv4compiler_p_p.h)90
-rw-r--r--src/qml/qml/v4/qv4instruction.cpp (renamed from src/declarative/qml/v4/qv4instruction.cpp)6
-rw-r--r--src/qml/qml/v4/qv4instruction_p.h (renamed from src/declarative/qml/v4/qv4instruction_p.h)10
-rw-r--r--src/qml/qml/v4/qv4ir.cpp (renamed from src/declarative/qml/v4/qv4ir.cpp)50
-rw-r--r--src/qml/qml/v4/qv4ir_p.h (renamed from src/declarative/qml/v4/qv4ir_p.h)78
-rw-r--r--src/qml/qml/v4/qv4irbuilder.cpp (renamed from src/declarative/qml/v4/qv4irbuilder.cpp)45
-rw-r--r--src/qml/qml/v4/qv4irbuilder_p.h240
-rw-r--r--src/qml/qml/v4/qv4program_p.h (renamed from src/declarative/qml/v4/qv4program_p.h)4
-rw-r--r--src/qml/qml/v4/v4.pri (renamed from src/declarative/qml/v4/v4.pri)0
-rw-r--r--src/qml/qml/v8/notes.txt (renamed from src/declarative/qml/v8/notes.txt)2
-rw-r--r--src/qml/qml/v8/qjsconverter_impl_p.h (renamed from src/declarative/qml/v8/qjsconverter_impl_p.h)2
-rw-r--r--src/qml/qml/v8/qjsconverter_p.h (renamed from src/declarative/qml/v8/qjsconverter_p.h)0
-rw-r--r--src/qml/qml/v8/qjsengine.cpp (renamed from src/declarative/qml/v8/qjsengine.cpp)0
-rw-r--r--src/qml/qml/v8/qjsengine.h (renamed from src/declarative/qml/v8/qjsengine.h)4
-rw-r--r--src/qml/qml/v8/qjsengine_p.h (renamed from src/declarative/qml/v8/qjsengine_p.h)0
-rw-r--r--src/qml/qml/v8/qjsvalue.cpp (renamed from src/declarative/qml/v8/qjsvalue.cpp)0
-rw-r--r--src/qml/qml/v8/qjsvalue.h (renamed from src/declarative/qml/v8/qjsvalue.h)5
-rw-r--r--src/qml/qml/v8/qjsvalue_impl_p.h (renamed from src/declarative/qml/v8/qjsvalue_impl_p.h)0
-rw-r--r--src/qml/qml/v8/qjsvalue_p.h (renamed from src/declarative/qml/v8/qjsvalue_p.h)0
-rw-r--r--src/qml/qml/v8/qjsvalueiterator.cpp (renamed from src/declarative/qml/v8/qjsvalueiterator.cpp)0
-rw-r--r--src/qml/qml/v8/qjsvalueiterator.h (renamed from src/declarative/qml/v8/qjsvalueiterator.h)4
-rw-r--r--src/qml/qml/v8/qjsvalueiterator_impl_p.h (renamed from src/declarative/qml/v8/qjsvalueiterator_impl_p.h)2
-rw-r--r--src/qml/qml/v8/qjsvalueiterator_p.h (renamed from src/declarative/qml/v8/qjsvalueiterator_p.h)2
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions.cpp (renamed from src/declarative/qml/v8/qdeclarativebuiltinfunctions.cpp)88
-rw-r--r--src/qml/qml/v8/qqmlbuiltinfunctions_p.h (renamed from src/declarative/qml/v8/qdeclarativebuiltinfunctions_p.h)10
-rw-r--r--src/qml/qml/v8/qscript_impl_p.h (renamed from src/declarative/qml/v8/qscript_impl_p.h)0
-rw-r--r--src/qml/qml/v8/qscriptisolate_p.h (renamed from src/declarative/qml/v8/qscriptisolate_p.h)0
-rw-r--r--src/qml/qml/v8/qscriptoriginalglobalobject_p.h (renamed from src/declarative/qml/v8/qscriptoriginalglobalobject_p.h)0
-rw-r--r--src/qml/qml/v8/qscriptshareddata_p.h (renamed from src/declarative/qml/v8/qscriptshareddata_p.h)0
-rw-r--r--src/qml/qml/v8/qscripttools_p.h (renamed from src/declarative/qml/v8/qscripttools_p.h)0
-rw-r--r--src/qml/qml/v8/qv8_p.h (renamed from src/declarative/qml/v8/qv8_p.h)2
-rw-r--r--src/qml/qml/v8/qv8bindings.cpp (renamed from src/declarative/qml/v8/qv8bindings.cpp)60
-rw-r--r--src/qml/qml/v8/qv8bindings_p.h (renamed from src/declarative/qml/v8/qv8bindings_p.h)48
-rw-r--r--src/qml/qml/v8/qv8contextwrapper.cpp (renamed from src/declarative/qml/v8/qv8contextwrapper.cpp)60
-rw-r--r--src/qml/qml/v8/qv8contextwrapper_p.h (renamed from src/declarative/qml/v8/qv8contextwrapper_p.h)12
-rw-r--r--src/qml/qml/v8/qv8debug_p.h (renamed from src/declarative/qml/v8/qv8debug_p.h)2
-rw-r--r--src/qml/qml/v8/qv8domerrors.cpp (renamed from src/declarative/qml/v8/qv8domerrors.cpp)2
-rw-r--r--src/qml/qml/v8/qv8domerrors_p.h (renamed from src/declarative/qml/v8/qv8domerrors_p.h)2
-rw-r--r--src/qml/qml/v8/qv8engine.cpp (renamed from src/declarative/qml/v8/qv8engine.cpp)54
-rw-r--r--src/qml/qml/v8/qv8engine_impl_p.h (renamed from src/declarative/qml/v8/qv8engine_impl_p.h)2
-rw-r--r--src/qml/qml/v8/qv8engine_p.h (renamed from src/declarative/qml/v8/qv8engine_p.h)78
-rw-r--r--src/qml/qml/v8/qv8include.cpp (renamed from src/declarative/qml/v8/qv8include.cpp)20
-rw-r--r--src/qml/qml/v8/qv8include_p.h (renamed from src/declarative/qml/v8/qv8include_p.h)14
-rw-r--r--src/qml/qml/v8/qv8listwrapper.cpp (renamed from src/declarative/qml/v8/qv8listwrapper.cpp)12
-rw-r--r--src/qml/qml/v8/qv8listwrapper_p.h (renamed from src/declarative/qml/v8/qv8listwrapper_p.h)6
-rw-r--r--src/qml/qml/v8/qv8profiler_p.h (renamed from src/declarative/qml/v8/qv8profiler_p.h)2
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper.cpp (renamed from src/declarative/qml/v8/qv8qobjectwrapper.cpp)250
-rw-r--r--src/qml/qml/v8/qv8qobjectwrapper_p.h (renamed from src/declarative/qml/v8/qv8qobjectwrapper_p.h)20
-rw-r--r--src/qml/qml/v8/qv8sequencewrapper.cpp (renamed from src/declarative/qml/v8/qv8sequencewrapper.cpp)4
-rw-r--r--src/qml/qml/v8/qv8sequencewrapper_p.h (renamed from src/declarative/qml/v8/qv8sequencewrapper_p.h)2
-rw-r--r--src/qml/qml/v8/qv8sequencewrapper_p_p.h (renamed from src/declarative/qml/v8/qv8sequencewrapper_p_p.h)16
-rw-r--r--src/qml/qml/v8/qv8sqlerrors.cpp (renamed from src/declarative/qml/v8/qv8sqlerrors.cpp)2
-rw-r--r--src/qml/qml/v8/qv8sqlerrors_p.h (renamed from src/declarative/qml/v8/qv8sqlerrors_p.h)2
-rw-r--r--src/qml/qml/v8/qv8stringwrapper.cpp (renamed from src/declarative/qml/v8/qv8stringwrapper.cpp)2
-rw-r--r--src/qml/qml/v8/qv8stringwrapper_p.h (renamed from src/declarative/qml/v8/qv8stringwrapper_p.h)12
-rw-r--r--src/qml/qml/v8/qv8typewrapper.cpp (renamed from src/declarative/qml/v8/qv8typewrapper.cpp)30
-rw-r--r--src/qml/qml/v8/qv8typewrapper_p.h (renamed from src/declarative/qml/v8/qv8typewrapper_p.h)10
-rw-r--r--src/qml/qml/v8/qv8valuetypewrapper.cpp (renamed from src/declarative/qml/v8/qv8valuetypewrapper.cpp)40
-rw-r--r--src/qml/qml/v8/qv8valuetypewrapper_p.h (renamed from src/declarative/qml/v8/qv8valuetypewrapper_p.h)10
-rw-r--r--src/qml/qml/v8/qv8variantresource_p.h (renamed from src/declarative/qml/v8/qv8variantresource_p.h)6
-rw-r--r--src/qml/qml/v8/qv8variantwrapper.cpp (renamed from src/declarative/qml/v8/qv8variantwrapper.cpp)10
-rw-r--r--src/qml/qml/v8/qv8variantwrapper_p.h (renamed from src/declarative/qml/v8/qv8variantwrapper_p.h)4
-rw-r--r--src/qml/qml/v8/qv8worker.cpp (renamed from src/declarative/qml/v8/qv8worker.cpp)14
-rw-r--r--src/qml/qml/v8/qv8worker_p.h (renamed from src/declarative/qml/v8/qv8worker_p.h)2
-rw-r--r--src/qml/qml/v8/script.pri (renamed from src/declarative/qml/v8/script.pri)0
-rw-r--r--src/qml/qml/v8/v8.pri (renamed from src/declarative/qml/v8/v8.pri)4
-rw-r--r--src/qml/qtqmlglobal.h67
-rw-r--r--src/qml/qtqmlglobal_p.h60
-rw-r--r--src/qml/util/qqmlpropertymap.cpp (renamed from src/declarative/util/qdeclarativepropertymap.cpp)100
-rw-r--r--src/qml/util/qqmlpropertymap.h (renamed from src/declarative/util/qdeclarativepropertymap.h)20
-rw-r--r--src/qml/util/util.pri5
-rw-r--r--src/qmldevtools/qmldevtools.pro2
-rw-r--r--src/qmltest/qmltest.pro2
-rw-r--r--src/qmltest/quicktest.cpp18
-rw-r--r--src/qmltest/quicktestevent.cpp4
-rw-r--r--src/quick/designer/designersupport.cpp16
-rw-r--r--src/quick/designer/designersupport.h8
-rw-r--r--src/quick/items/context2d/qquickcanvascontext.cpp2
-rw-r--r--src/quick/items/context2d/qquickcanvascontext_p.h2
-rw-r--r--src/quick/items/context2d/qquickcanvasitem.cpp32
-rw-r--r--src/quick/items/context2d/qquickcanvasitem_p.h12
-rw-r--r--src/quick/items/context2d/qquickcanvasitemnode.cpp2
-rw-r--r--src/quick/items/context2d/qquickcanvasitemnode_p.h2
-rw-r--r--src/quick/items/context2d/qquickcontext2d.cpp14
-rw-r--r--src/quick/items/context2d/qquickcontext2d_p.h8
-rw-r--r--src/quick/items/context2d/qquickcontext2dcommandbuffer.cpp4
-rw-r--r--src/quick/items/context2d/qquickcontext2dcommandbuffer_p.h4
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture.cpp2
-rw-r--r--src/quick/items/context2d/qquickcontext2dtexture_p.h2
-rw-r--r--src/quick/items/context2d/qquickcontext2dtile.cpp2
-rw-r--r--src/quick/items/context2d/qquickcontext2dtile_p.h2
-rw-r--r--src/quick/items/items.pri6
-rw-r--r--src/quick/items/qquickaccessibleattached.cpp2
-rw-r--r--src/quick/items/qquickaccessibleattached_p.h2
-rw-r--r--src/quick/items/qquickanchors.cpp4
-rw-r--r--src/quick/items/qquickanchors_p.h4
-rw-r--r--src/quick/items/qquickanchors_p_p.h2
-rw-r--r--src/quick/items/qquickanimatedimage.cpp12
-rw-r--r--src/quick/items/qquickanimatedimage_p.h2
-rw-r--r--src/quick/items/qquickanimatedimage_p_p.h2
-rw-r--r--src/quick/items/qquickborderimage.cpp29
-rw-r--r--src/quick/items/qquickborderimage_p.h2
-rw-r--r--src/quick/items/qquickborderimage_p_p.h4
-rw-r--r--src/quick/items/qquickcanvas.cpp20
-rw-r--r--src/quick/items/qquickcanvas.h8
-rw-r--r--src/quick/items/qquickcanvas_p.h6
-rw-r--r--src/quick/items/qquickclipnode.cpp2
-rw-r--r--src/quick/items/qquickclipnode_p.h2
-rw-r--r--src/quick/items/qquickdrag.cpp12
-rw-r--r--src/quick/items/qquickdrag_p.h10
-rw-r--r--src/quick/items/qquickdroparea.cpp10
-rw-r--r--src/quick/items/qquickdroparea_p.h6
-rw-r--r--src/quick/items/qquickevents.cpp2
-rw-r--r--src/quick/items/qquickevents_p_p.h4
-rw-r--r--src/quick/items/qquickflickable.cpp38
-rw-r--r--src/quick/items/qquickflickable_p.h10
-rw-r--r--src/quick/items/qquickflickable_p_p.h28
-rw-r--r--src/quick/items/qquickflipable.cpp14
-rw-r--r--src/quick/items/qquickflipable_p.h2
-rw-r--r--src/quick/items/qquickfocusscope.cpp2
-rw-r--r--src/quick/items/qquickfocusscope_p.h2
-rw-r--r--src/quick/items/qquickgridview.cpp34
-rw-r--r--src/quick/items/qquickgridview_p.h6
-rw-r--r--src/quick/items/qquickimage.cpp8
-rw-r--r--src/quick/items/qquickimage_p.h2
-rw-r--r--src/quick/items/qquickimage_p_p.h2
-rw-r--r--src/quick/items/qquickimagebase.cpp10
-rw-r--r--src/quick/items/qquickimagebase_p.h2
-rw-r--r--src/quick/items/qquickimagebase_p_p.h6
-rw-r--r--src/quick/items/qquickimplicitsizeitem.cpp2
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p.h2
-rw-r--r--src/quick/items/qquickimplicitsizeitem_p_p.h2
-rw-r--r--src/quick/items/qquickitem.cpp115
-rw-r--r--src/quick/items/qquickitem.h36
-rw-r--r--src/quick/items/qquickitem_p.h86
-rw-r--r--src/quick/items/qquickitemanimation.cpp (renamed from src/quick/items/qquickanimation.cpp)82
-rw-r--r--src/quick/items/qquickitemanimation_p.h (renamed from src/quick/items/qquickanimation_p.h)40
-rw-r--r--src/quick/items/qquickitemanimation_p_p.h (renamed from src/quick/items/qquickanimation_p_p.h)36
-rw-r--r--src/quick/items/qquickitemchangelistener_p.h2
-rw-r--r--src/quick/items/qquickitemsmodule.cpp50
-rw-r--r--src/quick/items/qquickitemsmodule_p.h4
-rw-r--r--src/quick/items/qquickitemview.cpp118
-rw-r--r--src/quick/items/qquickitemview_p.h78
-rw-r--r--src/quick/items/qquickitemview_p_p.h56
-rw-r--r--src/quick/items/qquicklistview.cpp60
-rw-r--r--src/quick/items/qquicklistview_p.h14
-rw-r--r--src/quick/items/qquickloader.cpp78
-rw-r--r--src/quick/items/qquickloader_p.h10
-rw-r--r--src/quick/items/qquickloader_p_p.h20
-rw-r--r--src/quick/items/qquickmousearea.cpp14
-rw-r--r--src/quick/items/qquickmousearea_p.h4
-rw-r--r--src/quick/items/qquickmousearea_p_p.h4
-rw-r--r--src/quick/items/qquickmultipointtoucharea.cpp4
-rw-r--r--src/quick/items/qquickmultipointtoucharea_p.h20
-rw-r--r--src/quick/items/qquickninepatchnode.cpp2
-rw-r--r--src/quick/items/qquickninepatchnode_p.h2
-rw-r--r--src/quick/items/qquickpainteditem.cpp2
-rw-r--r--src/quick/items/qquickpainteditem.h2
-rw-r--r--src/quick/items/qquickpainteditem_p.h2
-rw-r--r--src/quick/items/qquickpathview.cpp69
-rw-r--r--src/quick/items/qquickpathview_p.h30
-rw-r--r--src/quick/items/qquickpathview_p_p.h30
-rw-r--r--src/quick/items/qquickpositioners.cpp62
-rw-r--r--src/quick/items/qquickpositioners_p.h16
-rw-r--r--src/quick/items/qquickpositioners_p_p.h20
-rw-r--r--src/quick/items/qquickrectangle.cpp16
-rw-r--r--src/quick/items/qquickrectangle_p.h6
-rw-r--r--src/quick/items/qquickrectangle_p_p.h2
-rw-r--r--src/quick/items/qquickrepeater.cpp40
-rw-r--r--src/quick/items/qquickrepeater_p.h12
-rw-r--r--src/quick/items/qquickrepeater_p_p.h4
-rw-r--r--src/quick/items/qquickscalegrid.cpp4
-rw-r--r--src/quick/items/qquickscalegrid_p_p.h6
-rw-r--r--src/quick/items/qquickscreen.cpp2
-rw-r--r--src/quick/items/qquickscreen_p.h6
-rw-r--r--src/quick/items/qquickshadereffect.cpp2
-rw-r--r--src/quick/items/qquickshadereffect_p.h2
-rw-r--r--src/quick/items/qquickshadereffectmesh.cpp2
-rw-r--r--src/quick/items/qquickshadereffectmesh_p.h4
-rw-r--r--src/quick/items/qquickshadereffectnode.cpp2
-rw-r--r--src/quick/items/qquickshadereffectnode_p.h2
-rw-r--r--src/quick/items/qquickshadereffectsource.cpp2
-rw-r--r--src/quick/items/qquickshadereffectsource_p.h2
-rw-r--r--src/quick/items/qquicksprite.cpp2
-rw-r--r--src/quick/items/qquicksprite_p.h6
-rw-r--r--src/quick/items/qquickspriteengine.cpp30
-rw-r--r--src/quick/items/qquickspriteengine_p.h36
-rw-r--r--src/quick/items/qquickspriteimage.cpp10
-rw-r--r--src/quick/items/qquickspriteimage_p.h4
-rw-r--r--src/quick/items/qquickstateoperations.cpp358
-rw-r--r--src/quick/items/qquickstateoperations_p.h98
-rw-r--r--src/quick/items/qquicktext.cpp59
-rw-r--r--src/quick/items/qquicktext_p.h2
-rw-r--r--src/quick/items/qquicktext_p_p.h16
-rw-r--r--src/quick/items/qquicktextedit.cpp24
-rw-r--r--src/quick/items/qquicktextedit_p.h8
-rw-r--r--src/quick/items/qquicktextedit_p_p.h6
-rw-r--r--src/quick/items/qquicktextinput.cpp20
-rw-r--r--src/quick/items/qquicktextinput_p.h10
-rw-r--r--src/quick/items/qquicktextinput_p_p.h8
-rw-r--r--src/quick/items/qquicktextnode.cpp4
-rw-r--r--src/quick/items/qquicktextnode_p.h2
-rw-r--r--src/quick/items/qquicktranslate.cpp2
-rw-r--r--src/quick/items/qquicktranslate_p.h2
-rw-r--r--src/quick/items/qquickview.cpp62
-rw-r--r--src/quick/items/qquickview.h16
-rw-r--r--src/quick/items/qquickview_p.h14
-rw-r--r--src/quick/items/qquickvisualadaptormodel.cpp38
-rw-r--r--src/quick/items/qquickvisualadaptormodel_p.h6
-rw-r--r--src/quick/items/qquickvisualdatamodel.cpp168
-rw-r--r--src/quick/items/qquickvisualdatamodel_p.h54
-rw-r--r--src/quick/items/qquickvisualdatamodel_p_p.h98
-rw-r--r--src/quick/items/qquickvisualitemmodel.cpp28
-rw-r--r--src/quick/items/qquickvisualitemmodel_p.h12
-rw-r--r--src/quick/items/qquickwindowmanager.cpp4
-rw-r--r--src/quick/items/qquickwindowmanager_p.h2
-rw-r--r--src/quick/items/qquickwindowmodule_p.h2
-rw-r--r--src/quick/items/syncexcludes4
-rw-r--r--src/quick/particles/qquickcumulativedirection.cpp4
-rw-r--r--src/quick/particles/qquickcumulativedirection_p.h6
-rw-r--r--src/quick/particles/qquickcustomaffector.cpp14
-rw-r--r--src/quick/particles/qquickcustomaffector_p.h2
-rw-r--r--src/quick/particles/qquickcustomparticle.cpp2
-rw-r--r--src/quick/particles/qquickcustomparticle_p.h2
-rw-r--r--src/quick/particles/qquickimageparticle.cpp8
-rw-r--r--src/quick/particles/qquickimageparticle_p.h10
-rw-r--r--src/quick/particles/qquickitemparticle.cpp2
-rw-r--r--src/quick/particles/qquickitemparticle_p.h12
-rw-r--r--src/quick/particles/qquickmaskextruder.cpp4
-rw-r--r--src/quick/particles/qquickmaskextruder_p.h4
-rw-r--r--src/quick/particles/qquickparticleemitter.cpp8
-rw-r--r--src/quick/particles/qquickparticleemitter_p.h2
-rw-r--r--src/quick/particles/qquickparticlegroup.cpp8
-rw-r--r--src/quick/particles/qquickparticlegroup_p.h10
-rw-r--r--src/quick/particles/qquickparticlesmodule_p.h2
-rw-r--r--src/quick/particles/qquickparticlesystem.cpp9
-rw-r--r--src/quick/particles/qquickparticlesystem_p.h8
-rw-r--r--src/quick/particles/qquickspritegoal_p.h2
-rw-r--r--src/quick/particles/qquicktrailemitter.cpp10
-rw-r--r--src/quick/particles/qquicktrailemitter_p.h2
-rw-r--r--src/quick/particles/qquickturbulence_p.h2
-rw-r--r--src/quick/particles/qquickv8particledata.cpp4
-rw-r--r--src/quick/particles/qquickv8particledata_p.h2
-rw-r--r--src/quick/qtquick2.cpp86
-rw-r--r--src/quick/qtquick2_p.h4
-rw-r--r--src/quick/qtquickglobal.h2
-rw-r--r--src/quick/qtquickglobal_p.h2
-rw-r--r--src/quick/quick.pro12
-rw-r--r--src/quick/scenegraph/coreapi/qsgdefaultrenderer.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgdefaultrenderer_p.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsggeometry_p.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgmaterial.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnode.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgnodeupdater_p.h2
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer.cpp2
-rw-r--r--src/quick/scenegraph/coreapi/qsgrenderer_p.h2
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer.cpp2
-rw-r--r--src/quick/scenegraph/qsgadaptationlayer_p.h2
-rw-r--r--src/quick/scenegraph/qsgcontext.cpp16
-rw-r--r--src/quick/scenegraph/qsgcontext_p.h8
-rw-r--r--src/quick/scenegraph/qsgcontextplugin.cpp6
-rw-r--r--src/quick/scenegraph/qsgcontextplugin_p.h8
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultdistancefieldglyphcache_p.h2
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p.h2
-rw-r--r--src/quick/scenegraph/qsgdefaultglyphnode_p_p.h2
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultimagenode_p.h2
-rw-r--r--src/quick/scenegraph/qsgdefaultrectanglenode.cpp2
-rw-r--r--src/quick/scenegraph/qsgdefaultrectanglenode_p.h2
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode.cpp2
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.cpp2
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p.h2
-rw-r--r--src/quick/scenegraph/qsgdistancefieldglyphnode_p_p.h2
-rw-r--r--src/quick/scenegraph/qsgflashnode.cpp2
-rw-r--r--src/quick/scenegraph/qsgflashnode_p.h2
-rw-r--r--src/quick/scenegraph/qsgpathsimplifier.cpp2
-rw-r--r--src/quick/scenegraph/qsgpathsimplifier_p.h2
-rw-r--r--src/quick/scenegraph/qsgshareddistancefieldglyphcache.cpp2
-rw-r--r--src/quick/scenegraph/qsgshareddistancefieldglyphcache_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgareaallocator.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgareaallocator_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgdistancefieldutil_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgengine.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgengine.h2
-rw-r--r--src/quick/scenegraph/util/qsgflatcolormaterial.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgflatcolormaterial.h2
-rw-r--r--src/quick/scenegraph/util/qsgpainternode.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgpainternode_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgsimplematerial.h2
-rw-r--r--src/quick/scenegraph/util/qsgsimplerectnode.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgsimplerectnode.h2
-rw-r--r--src/quick/scenegraph/util/qsgsimpletexturenode.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgsimpletexturenode.h2
-rw-r--r--src/quick/scenegraph/util/qsgtexture.cpp5
-rw-r--r--src/quick/scenegraph/util/qsgtexture.h2
-rw-r--r--src/quick/scenegraph/util/qsgtexture_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial.h2
-rw-r--r--src/quick/scenegraph/util/qsgtexturematerial_p.h2
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgtextureprovider.h2
-rw-r--r--src/quick/scenegraph/util/qsgvertexcolormaterial.cpp2
-rw-r--r--src/quick/scenegraph/util/qsgvertexcolormaterial.h2
-rw-r--r--src/quick/util/qdeclarativeutilmodule.cpp103
-rw-r--r--src/quick/util/qquickanimation.cpp (renamed from src/quick/util/qdeclarativeanimation.cpp)716
-rw-r--r--src/quick/util/qquickanimation_p.h (renamed from src/quick/util/qdeclarativeanimation_p.h)234
-rw-r--r--src/quick/util/qquickanimation_p_p.h (renamed from src/quick/util/qdeclarativeanimation_p_p.h)124
-rw-r--r--src/quick/util/qquickanimationcontroller.cpp (renamed from src/quick/util/qdeclarativeanimationcontroller.cpp)68
-rw-r--r--src/quick/util/qquickanimationcontroller_p.h (renamed from src/quick/util/qdeclarativeanimationcontroller_p.h)32
-rw-r--r--src/quick/util/qquickbehavior.cpp (renamed from src/quick/util/qdeclarativebehavior.cpp)86
-rw-r--r--src/quick/util/qquickbehavior_p.h (renamed from src/quick/util/qdeclarativebehavior_p.h)36
-rw-r--r--src/quick/util/qquickbind.cpp (renamed from src/quick/util/qdeclarativebind.cpp)108
-rw-r--r--src/quick/util/qquickbind_p.h (renamed from src/quick/util/qdeclarativebind_p.h)26
-rw-r--r--src/quick/util/qquickchangeset.cpp (renamed from src/quick/util/qdeclarativechangeset.cpp)52
-rw-r--r--src/quick/util/qquickchangeset_p.h (renamed from src/quick/util/qdeclarativechangeset_p.h)30
-rw-r--r--src/quick/util/qquickconnections.cpp (renamed from src/quick/util/qdeclarativeconnections.cpp)100
-rw-r--r--src/quick/util/qquickconnections_p.h (renamed from src/quick/util/qdeclarativeconnections_p.h)32
-rw-r--r--src/quick/util/qquickfontloader.cpp (renamed from src/quick/util/qdeclarativefontloader.cpp)94
-rw-r--r--src/quick/util/qquickfontloader_p.h (renamed from src/quick/util/qdeclarativefontloader_p.h)24
-rw-r--r--src/quick/util/qquicklistaccessor.cpp (renamed from src/quick/util/qdeclarativelistaccessor.cpp)34
-rw-r--r--src/quick/util/qquicklistaccessor_p.h (renamed from src/quick/util/qdeclarativelistaccessor_p.h)18
-rw-r--r--src/quick/util/qquicklistcompositor.cpp (renamed from src/quick/util/qdeclarativelistcompositor.cpp)276
-rw-r--r--src/quick/util/qquicklistcompositor_p.h (renamed from src/quick/util/qdeclarativelistcompositor_p.h)58
-rw-r--r--src/quick/util/qquickpackage.cpp (renamed from src/quick/util/qdeclarativepackage.cpp)72
-rw-r--r--src/quick/util/qquickpackage_p.h (renamed from src/quick/util/qdeclarativepackage_p.h)40
-rw-r--r--src/quick/util/qquickpath.cpp (renamed from src/quick/util/qdeclarativepath.cpp)330
-rw-r--r--src/quick/util/qquickpath_p.h (renamed from src/quick/util/qdeclarativepath_p.h)146
-rw-r--r--src/quick/util/qquickpath_p_p.h (renamed from src/quick/util/qdeclarativepath_p_p.h)28
-rw-r--r--src/quick/util/qquickpathinterpolator.cpp (renamed from src/quick/util/qdeclarativepathinterpolator.cpp)26
-rw-r--r--src/quick/util/qquickpathinterpolator_p.h (renamed from src/quick/util/qdeclarativepathinterpolator_p.h)26
-rw-r--r--src/quick/util/qquickpixmapcache.cpp (renamed from src/quick/util/qdeclarativepixmapcache.cpp)486
-rw-r--r--src/quick/util/qquickpixmapcache_p.h (renamed from src/quick/util/qdeclarativepixmapcache_p.h)50
-rw-r--r--src/quick/util/qquickpropertychanges.cpp (renamed from src/quick/util/qdeclarativepropertychanges.cpp)312
-rw-r--r--src/quick/util/qquickpropertychanges_p.h (renamed from src/quick/util/qdeclarativepropertychanges_p.h)34
-rw-r--r--src/quick/util/qquicksmoothedanimation.cpp (renamed from src/quick/util/qdeclarativesmoothedanimation.cpp)110
-rw-r--r--src/quick/util/qquicksmoothedanimation_p.h (renamed from src/quick/util/qdeclarativesmoothedanimation_p.h)30
-rw-r--r--src/quick/util/qquicksmoothedanimation_p_p.h (renamed from src/quick/util/qdeclarativesmoothedanimation_p_p.h)34
-rw-r--r--src/quick/util/qquickspringanimation.cpp (renamed from src/quick/util/qdeclarativespringanimation.cpp)108
-rw-r--r--src/quick/util/qquickspringanimation_p.h (renamed from src/quick/util/qdeclarativespringanimation_p.h)30
-rw-r--r--src/quick/util/qquickstate.cpp (renamed from src/quick/util/qdeclarativestate.cpp)294
-rw-r--r--src/quick/util/qquickstate_p.h (renamed from src/quick/util/qdeclarativestate_p.h)120
-rw-r--r--src/quick/util/qquickstate_p_p.h (renamed from src/quick/util/qdeclarativestate_p_p.h)108
-rw-r--r--src/quick/util/qquickstatechangescript.cpp (renamed from src/quick/util/qdeclarativestateoperations.cpp)67
-rw-r--r--src/quick/util/qquickstatechangescript_p.h (renamed from src/quick/util/qdeclarativestateoperations_p.h)30
-rw-r--r--src/quick/util/qquickstategroup.cpp (renamed from src/quick/util/qdeclarativestategroup.cpp)176
-rw-r--r--src/quick/util/qquickstategroup_p.h (renamed from src/quick/util/qdeclarativestategroup_p.h)42
-rw-r--r--src/quick/util/qquickstyledtext.cpp (renamed from src/quick/util/qdeclarativestyledtext.cpp)102
-rw-r--r--src/quick/util/qquickstyledtext_p.h (renamed from src/quick/util/qdeclarativestyledtext_p.h)40
-rw-r--r--src/quick/util/qquicksvgparser.cpp (renamed from src/quick/util/qdeclarativesvgparser.cpp)6
-rw-r--r--src/quick/util/qquicksvgparser_p.h (renamed from src/quick/util/qdeclarativesvgparser_p.h)8
-rw-r--r--src/quick/util/qquicksystempalette.cpp (renamed from src/quick/util/qdeclarativesystempalette.cpp)90
-rw-r--r--src/quick/util/qquicksystempalette_p.h (renamed from src/quick/util/qdeclarativesystempalette_p.h)28
-rw-r--r--src/quick/util/qquicktimeline.cpp (renamed from src/quick/util/qdeclarativetimeline.cpp)232
-rw-r--r--src/quick/util/qquicktimeline_p_p.h (renamed from src/quick/util/qdeclarativetimeline_p_p.h)106
-rw-r--r--src/quick/util/qquicktimer.cpp (renamed from src/quick/util/qdeclarativetimer.cpp)78
-rw-r--r--src/quick/util/qquicktimer_p.h (renamed from src/quick/util/qdeclarativetimer_p.h)20
-rw-r--r--src/quick/util/qquicktransition.cpp (renamed from src/quick/util/qdeclarativetransition.cpp)146
-rw-r--r--src/quick/util/qquicktransition_p.h (renamed from src/quick/util/qdeclarativetransition_p.h)48
-rw-r--r--src/quick/util/qquicktransitionmanager.cpp (renamed from src/quick/util/qdeclarativetransitionmanager.cpp)98
-rw-r--r--src/quick/util/qquicktransitionmanager_p_p.h (renamed from src/quick/util/qdeclarativetransitionmanager_p_p.h)32
-rw-r--r--src/quick/util/qquickutilmodule.cpp103
-rw-r--r--src/quick/util/qquickutilmodule_p.h (renamed from src/quick/util/qdeclarativeutilmodule_p.h)12
-rw-r--r--src/quick/util/util.pri116
-rw-r--r--src/src.pro2
642 files changed, 16411 insertions, 16250 deletions
diff --git a/src/declarative/debugger/debugger.pri b/src/declarative/debugger/debugger.pri
deleted file mode 100644
index 8e29e9fdf6..0000000000
--- a/src/declarative/debugger/debugger.pri
+++ /dev/null
@@ -1,32 +0,0 @@
-SOURCES += \
- $$PWD/qpacketprotocol.cpp \
- $$PWD/qdeclarativedebugservice.cpp \
- $$PWD/qdeclarativedebugclient.cpp \
- $$PWD/qdeclarativeenginedebug.cpp \
- $$PWD/qdeclarativeprofilerservice.cpp \
- $$PWD/qdeclarativedebughelper.cpp \
- $$PWD/qdeclarativedebugserver.cpp \
- $$PWD/qdeclarativeinspectorservice.cpp \
- $$PWD/qv8debugservice.cpp \
- $$PWD/qv8profilerservice.cpp \
- $$PWD/qdeclarativeenginedebugservice.cpp \
- $$PWD/qdebugmessageservice.cpp
-
-HEADERS += \
- $$PWD/qpacketprotocol_p.h \
- $$PWD/qdeclarativedebugservice_p.h \
- $$PWD/qdeclarativedebugservice_p_p.h \
- $$PWD/qdeclarativedebugclient_p.h \
- $$PWD/qdeclarativeenginedebug_p.h \
- $$PWD/qdeclarativeprofilerservice_p.h \
- $$PWD/qdeclarativedebughelper_p.h \
- $$PWD/qdeclarativedebugserver_p.h \
- $$PWD/qdeclarativedebugserverconnection_p.h \
- $$PWD/qdeclarativedebugstatesdelegate_p.h \
- $$PWD/qdeclarativeinspectorservice_p.h \
- $$PWD/qdeclarativeinspectorinterface_p.h \
- $$PWD/qv8debugservice_p.h \
- $$PWD/qv8profilerservice_p.h \
- $$PWD/qdeclarativeenginedebugservice_p.h \
- $$PWD/qdeclarativedebug.h \
- $$PWD/qdebugmessageservice_p.h
diff --git a/src/declarative/debugger/qdeclarativeenginedebug.cpp b/src/declarative/debugger/qdeclarativeenginedebug.cpp
deleted file mode 100644
index 462f99937e..0000000000
--- a/src/declarative/debugger/qdeclarativeenginedebug.cpp
+++ /dev/null
@@ -1,1072 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "qdeclarativeenginedebug_p.h"
-
-#include "qdeclarativedebugclient_p.h"
-
-#include "qdeclarativeenginedebugservice_p.h"
-
-#include <private/qobject_p.h>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeEngineDebugClient : public QDeclarativeDebugClient
-{
-public:
- QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client, QDeclarativeEngineDebugPrivate *p);
-
-protected:
- virtual void stateChanged(State state);
- virtual void messageReceived(const QByteArray &);
-
-private:
- QDeclarativeEngineDebugPrivate *priv;
- friend class QDeclarativeEngineDebugPrivate;
-};
-
-class QDeclarativeEngineDebugPrivate : public QObjectPrivate
-{
- Q_DECLARE_PUBLIC(QDeclarativeEngineDebug)
-public:
- QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *);
- ~QDeclarativeEngineDebugPrivate();
-
- void stateChanged(QDeclarativeEngineDebug::State status);
- void message(const QByteArray &);
-
- QDeclarativeEngineDebugClient *client;
- int nextId;
- int getId();
-
- void decode(QDataStream &, QDeclarativeDebugContextReference &);
- void decode(QDataStream &, QDeclarativeDebugObjectReference &, bool simple);
-
- static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugEnginesQuery *);
- static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugRootContextQuery *);
- static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugObjectQuery *);
- static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugExpressionQuery *);
- static void remove(QDeclarativeEngineDebug *, QDeclarativeDebugWatch *);
-
- QHash<int, QDeclarativeDebugEnginesQuery *> enginesQuery;
- QHash<int, QDeclarativeDebugRootContextQuery *> rootContextQuery;
- QHash<int, QDeclarativeDebugObjectQuery *> objectQuery;
- QHash<int, QDeclarativeDebugExpressionQuery *> expressionQuery;
-
- QHash<int, QDeclarativeDebugWatch *> watched;
-};
-
-QDeclarativeEngineDebugClient::QDeclarativeEngineDebugClient(QDeclarativeDebugConnection *client,
- QDeclarativeEngineDebugPrivate *p)
- : QDeclarativeDebugClient(QLatin1String("QDeclarativeEngine"), client), priv(p)
-{
-}
-
-void QDeclarativeEngineDebugClient::stateChanged(State status)
-{
- if (priv)
- priv->stateChanged(static_cast<QDeclarativeEngineDebug::State>(status));
-}
-
-void QDeclarativeEngineDebugClient::messageReceived(const QByteArray &data)
-{
- if (priv)
- priv->message(data);
-}
-
-QDeclarativeEngineDebugPrivate::QDeclarativeEngineDebugPrivate(QDeclarativeDebugConnection *c)
- : client(new QDeclarativeEngineDebugClient(c, this)), nextId(0)
-{
-}
-
-QDeclarativeEngineDebugPrivate::~QDeclarativeEngineDebugPrivate()
-{
- if (client)
- client->priv = 0;
- delete client;
-
- QHash<int, QDeclarativeDebugEnginesQuery*>::iterator enginesIter = enginesQuery.begin();
- for (; enginesIter != enginesQuery.end(); ++enginesIter) {
- enginesIter.value()->m_client = 0;
- if (enginesIter.value()->state() == QDeclarativeDebugQuery::Waiting)
- enginesIter.value()->setState(QDeclarativeDebugQuery::Error);
- }
-
- QHash<int, QDeclarativeDebugRootContextQuery*>::iterator rootContextIter = rootContextQuery.begin();
- for (; rootContextIter != rootContextQuery.end(); ++rootContextIter) {
- rootContextIter.value()->m_client = 0;
- if (rootContextIter.value()->state() == QDeclarativeDebugQuery::Waiting)
- rootContextIter.value()->setState(QDeclarativeDebugQuery::Error);
- }
-
- QHash<int, QDeclarativeDebugObjectQuery*>::iterator objectIter = objectQuery.begin();
- for (; objectIter != objectQuery.end(); ++objectIter) {
- objectIter.value()->m_client = 0;
- if (objectIter.value()->state() == QDeclarativeDebugQuery::Waiting)
- objectIter.value()->setState(QDeclarativeDebugQuery::Error);
- }
-
- QHash<int, QDeclarativeDebugExpressionQuery*>::iterator exprIter = expressionQuery.begin();
- for (; exprIter != expressionQuery.end(); ++exprIter) {
- exprIter.value()->m_client = 0;
- if (exprIter.value()->state() == QDeclarativeDebugQuery::Waiting)
- exprIter.value()->setState(QDeclarativeDebugQuery::Error);
- }
-
- QHash<int, QDeclarativeDebugWatch*>::iterator watchIter = watched.begin();
- for (; watchIter != watched.end(); ++watchIter) {
- watchIter.value()->m_client = 0;
- watchIter.value()->setState(QDeclarativeDebugWatch::Dead);
- }
-}
-
-int QDeclarativeEngineDebugPrivate::getId()
-{
- return nextId++;
-}
-
-void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugEnginesQuery *q)
-{
- if (c && q) {
- QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
- p->enginesQuery.remove(q->m_queryId);
- }
-}
-
-void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c,
- QDeclarativeDebugRootContextQuery *q)
-{
- if (c && q) {
- QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
- p->rootContextQuery.remove(q->m_queryId);
- }
-}
-
-void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugObjectQuery *q)
-{
- if (c && q) {
- QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
- p->objectQuery.remove(q->m_queryId);
- }
-}
-
-void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugExpressionQuery *q)
-{
- if (c && q) {
- QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
- p->expressionQuery.remove(q->m_queryId);
- }
-}
-
-void QDeclarativeEngineDebugPrivate::remove(QDeclarativeEngineDebug *c, QDeclarativeDebugWatch *w)
-{
- if (c && w) {
- QDeclarativeEngineDebugPrivate *p = (QDeclarativeEngineDebugPrivate *)QObjectPrivate::get(c);
- p->watched.remove(w->m_queryId);
- }
-}
-
-void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugObjectReference &o,
- bool simple)
-{
- QDeclarativeEngineDebugService::QDeclarativeObjectData data;
- ds >> data;
- o.m_debugId = data.objectId;
- o.m_class = data.objectType;
- o.m_idString = data.idString;
- o.m_name = data.objectName;
- o.m_source.m_url = data.url;
- o.m_source.m_lineNumber = data.lineNumber;
- o.m_source.m_columnNumber = data.columnNumber;
- o.m_contextDebugId = data.contextId;
-
- if (simple)
- return;
-
- int childCount;
- bool recur;
- ds >> childCount >> recur;
-
- for (int ii = 0; ii < childCount; ++ii) {
- o.m_children.append(QDeclarativeDebugObjectReference());
- decode(ds, o.m_children.last(), !recur);
- }
-
- int propCount;
- ds >> propCount;
-
- for (int ii = 0; ii < propCount; ++ii) {
- QDeclarativeEngineDebugService::QDeclarativeObjectProperty data;
- ds >> data;
- QDeclarativeDebugPropertyReference prop;
- prop.m_objectDebugId = o.m_debugId;
- prop.m_name = data.name;
- prop.m_binding = data.binding;
- prop.m_hasNotifySignal = data.hasNotifySignal;
- prop.m_valueTypeName = data.valueTypeName;
- switch (data.type) {
- case QDeclarativeEngineDebugService::QDeclarativeObjectProperty::Basic:
- case QDeclarativeEngineDebugService::QDeclarativeObjectProperty::List:
- case QDeclarativeEngineDebugService::QDeclarativeObjectProperty::SignalProperty:
- {
- prop.m_value = data.value;
- break;
- }
- case QDeclarativeEngineDebugService::QDeclarativeObjectProperty::Object:
- {
- QDeclarativeDebugObjectReference obj;
- obj.m_debugId = prop.m_value.toInt();
- prop.m_value = QVariant::fromValue(obj);
- break;
- }
- case QDeclarativeEngineDebugService::QDeclarativeObjectProperty::Unknown:
- break;
- }
- o.m_properties << prop;
- }
-}
-
-void QDeclarativeEngineDebugPrivate::decode(QDataStream &ds, QDeclarativeDebugContextReference &c)
-{
- ds >> c.m_name >> c.m_debugId;
-
- int contextCount;
- ds >> contextCount;
-
- for (int ii = 0; ii < contextCount; ++ii) {
- c.m_contexts.append(QDeclarativeDebugContextReference());
- decode(ds, c.m_contexts.last());
- }
-
- int objectCount;
- ds >> objectCount;
-
- for (int ii = 0; ii < objectCount; ++ii) {
- QDeclarativeDebugObjectReference obj;
- decode(ds, obj, true);
-
- obj.m_contextDebugId = c.m_debugId;
- c.m_objects << obj;
- }
-}
-
-void QDeclarativeEngineDebugPrivate::stateChanged(QDeclarativeEngineDebug::State status)
-{
- emit q_func()->stateChanged(status);
-}
-
-void QDeclarativeEngineDebugPrivate::message(const QByteArray &data)
-{
- QDataStream ds(data);
-
- QByteArray type;
- ds >> type;
-
- //qDebug() << "QDeclarativeEngineDebugPrivate::message()" << type;
-
- if (type == "LIST_ENGINES_R") {
- int queryId;
- ds >> queryId;
-
- QDeclarativeDebugEnginesQuery *query = enginesQuery.value(queryId);
- if (!query)
- return;
- enginesQuery.remove(queryId);
-
- int count;
- ds >> count;
-
- for (int ii = 0; ii < count; ++ii) {
- QDeclarativeDebugEngineReference ref;
- ds >> ref.m_name;
- ds >> ref.m_debugId;
- query->m_engines << ref;
- }
-
- query->m_client = 0;
- query->setState(QDeclarativeDebugQuery::Completed);
- } else if (type == "LIST_OBJECTS_R") {
- int queryId;
- ds >> queryId;
-
- QDeclarativeDebugRootContextQuery *query = rootContextQuery.value(queryId);
- if (!query)
- return;
- rootContextQuery.remove(queryId);
-
- if (!ds.atEnd())
- decode(ds, query->m_context);
-
- query->m_client = 0;
- query->setState(QDeclarativeDebugQuery::Completed);
- } else if (type == "FETCH_OBJECT_R") {
- int queryId;
- ds >> queryId;
-
- QDeclarativeDebugObjectQuery *query = objectQuery.value(queryId);
- if (!query)
- return;
- objectQuery.remove(queryId);
-
- if (!ds.atEnd())
- decode(ds, query->m_object, false);
-
- query->m_client = 0;
- query->setState(QDeclarativeDebugQuery::Completed);
- } else if (type == "EVAL_EXPRESSION_R") {
- int queryId;
- QVariant result;
- ds >> queryId >> result;
-
- QDeclarativeDebugExpressionQuery *query = expressionQuery.value(queryId);
- if (!query)
- return;
- expressionQuery.remove(queryId);
-
- query->m_result = result;
- query->m_client = 0;
- query->setState(QDeclarativeDebugQuery::Completed);
- } else if (type == "WATCH_PROPERTY_R") {
- int queryId;
- bool ok;
- ds >> queryId >> ok;
-
- QDeclarativeDebugWatch *watch = watched.value(queryId);
- if (!watch)
- return;
-
- watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
- } else if (type == "WATCH_OBJECT_R") {
- int queryId;
- bool ok;
- ds >> queryId >> ok;
-
- QDeclarativeDebugWatch *watch = watched.value(queryId);
- if (!watch)
- return;
-
- watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
- } else if (type == "WATCH_EXPR_OBJECT_R") {
- int queryId;
- bool ok;
- ds >> queryId >> ok;
-
- QDeclarativeDebugWatch *watch = watched.value(queryId);
- if (!watch)
- return;
-
- watch->setState(ok ? QDeclarativeDebugWatch::Active : QDeclarativeDebugWatch::Inactive);
- } else if (type == "UPDATE_WATCH") {
- int queryId;
- int debugId;
- QByteArray name;
- QVariant value;
- ds >> queryId >> debugId >> name >> value;
-
- QDeclarativeDebugWatch *watch = watched.value(queryId, 0);
- if (!watch)
- return;
- emit watch->valueChanged(name, value);
- } else if (type == "OBJECT_CREATED") {
- emit q_func()->newObjects();
- }
-}
-
-QDeclarativeEngineDebug::QDeclarativeEngineDebug(QDeclarativeDebugConnection *client, QObject *parent)
- : QObject(*(new QDeclarativeEngineDebugPrivate(client)), parent)
-{
-}
-
-QDeclarativeEngineDebug::~QDeclarativeEngineDebug()
-{
-}
-
-QDeclarativeEngineDebug::State QDeclarativeEngineDebug::state() const
-{
- Q_D(const QDeclarativeEngineDebug);
-
- return static_cast<QDeclarativeEngineDebug::State>(d->client->state());
-}
-
-QDeclarativeDebugPropertyWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugPropertyReference &property, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugPropertyWatch *watch = new QDeclarativeDebugPropertyWatch(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled) {
- int queryId = d->getId();
- watch->m_queryId = queryId;
- watch->m_client = this;
- watch->m_objectDebugId = property.objectDebugId();
- watch->m_name = property.name();
- d->watched.insert(queryId, watch);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("WATCH_PROPERTY") << queryId << property.objectDebugId() << property.name().toUtf8();
- d->client->sendMessage(message);
- } else {
- watch->m_state = QDeclarativeDebugWatch::Dead;
- }
-
- return watch;
-}
-
-QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugContextReference &, const QString &, QObject *)
-{
- qWarning("QDeclarativeEngineDebug::addWatch(): Not implemented");
- return 0;
-}
-
-QDeclarativeDebugObjectExpressionWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugObjectReference &object, const QString &expr, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
- QDeclarativeDebugObjectExpressionWatch *watch = new QDeclarativeDebugObjectExpressionWatch(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled) {
- int queryId = d->getId();
- watch->m_queryId = queryId;
- watch->m_client = this;
- watch->m_objectDebugId = object.debugId();
- watch->m_expr = expr;
- d->watched.insert(queryId, watch);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("WATCH_EXPR_OBJECT") << queryId << object.debugId() << expr;
- d->client->sendMessage(message);
- } else {
- watch->m_state = QDeclarativeDebugWatch::Dead;
- }
- return watch;
-}
-
-QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugObjectReference &object, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugWatch *watch = new QDeclarativeDebugWatch(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled) {
- int queryId = d->getId();
- watch->m_queryId = queryId;
- watch->m_client = this;
- watch->m_objectDebugId = object.debugId();
- d->watched.insert(queryId, watch);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("WATCH_OBJECT") << queryId << object.debugId();
- d->client->sendMessage(message);
- } else {
- watch->m_state = QDeclarativeDebugWatch::Dead;
- }
-
- return watch;
-}
-
-QDeclarativeDebugWatch *QDeclarativeEngineDebug::addWatch(const QDeclarativeDebugFileReference &, QObject *)
-{
- qWarning("QDeclarativeEngineDebug::addWatch(): Not implemented");
- return 0;
-}
-
-void QDeclarativeEngineDebug::removeWatch(QDeclarativeDebugWatch *watch)
-{
- Q_D(QDeclarativeEngineDebug);
-
- if (!watch || !watch->m_client)
- return;
-
- watch->m_client = 0;
- watch->setState(QDeclarativeDebugWatch::Inactive);
-
- d->watched.remove(watch->queryId());
-
- if (d->client && d->client->state() == QDeclarativeDebugClient::Enabled) {
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("NO_WATCH") << watch->queryId();
- d->client->sendMessage(message);
- }
-}
-
-QDeclarativeDebugEnginesQuery *QDeclarativeEngineDebug::queryAvailableEngines(QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugEnginesQuery *query = new QDeclarativeDebugEnginesQuery(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled) {
- query->m_client = this;
- int queryId = d->getId();
- query->m_queryId = queryId;
- d->enginesQuery.insert(queryId, query);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("LIST_ENGINES") << queryId;
- d->client->sendMessage(message);
- } else {
- query->m_state = QDeclarativeDebugQuery::Error;
- }
-
- return query;
-}
-
-QDeclarativeDebugRootContextQuery *QDeclarativeEngineDebug::queryRootContexts(const QDeclarativeDebugEngineReference &engine, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugRootContextQuery *query = new QDeclarativeDebugRootContextQuery(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled && engine.debugId() != -1) {
- query->m_client = this;
- int queryId = d->getId();
- query->m_queryId = queryId;
- d->rootContextQuery.insert(queryId, query);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("LIST_OBJECTS") << queryId << engine.debugId();
- d->client->sendMessage(message);
- } else {
- query->m_state = QDeclarativeDebugQuery::Error;
- }
-
- return query;
-}
-
-QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObject(const QDeclarativeDebugObjectReference &object, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
- query->m_client = this;
- int queryId = d->getId();
- query->m_queryId = queryId;
- d->objectQuery.insert(queryId, query);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
- << false << true;
- d->client->sendMessage(message);
- } else {
- query->m_state = QDeclarativeDebugQuery::Error;
- }
-
- return query;
-}
-
-QDeclarativeDebugObjectQuery *QDeclarativeEngineDebug::queryObjectRecursive(const QDeclarativeDebugObjectReference &object, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugObjectQuery *query = new QDeclarativeDebugObjectQuery(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled && object.debugId() != -1) {
- query->m_client = this;
- int queryId = d->getId();
- query->m_queryId = queryId;
- d->objectQuery.insert(queryId, query);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
- << true << true;
- d->client->sendMessage(message);
- } else {
- query->m_state = QDeclarativeDebugQuery::Error;
- }
-
- return query;
-}
-
-QDeclarativeDebugExpressionQuery *QDeclarativeEngineDebug::queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent)
-{
- Q_D(QDeclarativeEngineDebug);
-
- QDeclarativeDebugExpressionQuery *query = new QDeclarativeDebugExpressionQuery(parent);
- if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
- query->m_client = this;
- query->m_expr = expr;
- int queryId = d->getId();
- query->m_queryId = queryId;
- d->expressionQuery.insert(queryId, query);
-
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("EVAL_EXPRESSION") << queryId << objectDebugId << expr;
- d->client->sendMessage(message);
- } else {
- query->m_state = QDeclarativeDebugQuery::Error;
- }
-
- return query;
-}
-
-bool QDeclarativeEngineDebug::setBindingForObject(int objectDebugId, const QString &propertyName,
- const QVariant &bindingExpression,
- bool isLiteralValue,
- QString source, int line)
-{
- Q_D(QDeclarativeEngineDebug);
-
- if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue << source << line;
- d->client->sendMessage(message);
- return true;
- } else {
- return false;
- }
-}
-
-bool QDeclarativeEngineDebug::resetBindingForObject(int objectDebugId, const QString &propertyName)
-{
- Q_D(QDeclarativeEngineDebug);
-
- if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName;
- d->client->sendMessage(message);
- return true;
- } else {
- return false;
- }
-}
-
-bool QDeclarativeEngineDebug::setMethodBody(int objectDebugId, const QString &methodName,
- const QString &methodBody)
-{
- Q_D(QDeclarativeEngineDebug);
-
- if (d->client->state() == QDeclarativeDebugClient::Enabled && objectDebugId != -1) {
- QByteArray message;
- QDataStream ds(&message, QIODevice::WriteOnly);
- ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody;
- d->client->sendMessage(message);
- return true;
- } else {
- return false;
- }
-}
-
-QDeclarativeDebugWatch::QDeclarativeDebugWatch(QObject *parent)
- : QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
-{
-}
-
-QDeclarativeDebugWatch::~QDeclarativeDebugWatch()
-{
- if (m_client && m_queryId != -1)
- QDeclarativeEngineDebugPrivate::remove(m_client, this);
-}
-
-int QDeclarativeDebugWatch::queryId() const
-{
- return m_queryId;
-}
-
-int QDeclarativeDebugWatch::objectDebugId() const
-{
- return m_objectDebugId;
-}
-
-QDeclarativeDebugWatch::State QDeclarativeDebugWatch::state() const
-{
- return m_state;
-}
-
-void QDeclarativeDebugWatch::setState(State s)
-{
- if (m_state == s)
- return;
- m_state = s;
- emit stateChanged(m_state);
-}
-
-QDeclarativeDebugPropertyWatch::QDeclarativeDebugPropertyWatch(QObject *parent)
- : QDeclarativeDebugWatch(parent)
-{
-}
-
-QString QDeclarativeDebugPropertyWatch::name() const
-{
- return m_name;
-}
-
-
-QDeclarativeDebugObjectExpressionWatch::QDeclarativeDebugObjectExpressionWatch(QObject *parent)
- : QDeclarativeDebugWatch(parent)
-{
-}
-
-QString QDeclarativeDebugObjectExpressionWatch::expression() const
-{
- return m_expr;
-}
-
-
-QDeclarativeDebugQuery::QDeclarativeDebugQuery(QObject *parent)
- : QObject(parent), m_state(Waiting)
-{
-}
-
-QDeclarativeDebugQuery::State QDeclarativeDebugQuery::state() const
-{
- return m_state;
-}
-
-bool QDeclarativeDebugQuery::isWaiting() const
-{
- return m_state == Waiting;
-}
-
-void QDeclarativeDebugQuery::setState(State s)
-{
- if (m_state == s)
- return;
- m_state = s;
- emit stateChanged(m_state);
-}
-
-QDeclarativeDebugEnginesQuery::QDeclarativeDebugEnginesQuery(QObject *parent)
- : QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QDeclarativeDebugEnginesQuery::~QDeclarativeDebugEnginesQuery()
-{
- if (m_client && m_queryId != -1)
- QDeclarativeEngineDebugPrivate::remove(m_client, this);
-}
-
-QList<QDeclarativeDebugEngineReference> QDeclarativeDebugEnginesQuery::engines() const
-{
- return m_engines;
-}
-
-QDeclarativeDebugRootContextQuery::QDeclarativeDebugRootContextQuery(QObject *parent)
- : QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QDeclarativeDebugRootContextQuery::~QDeclarativeDebugRootContextQuery()
-{
- if (m_client && m_queryId != -1)
- QDeclarativeEngineDebugPrivate::remove(m_client, this);
-}
-
-QDeclarativeDebugContextReference QDeclarativeDebugRootContextQuery::rootContext() const
-{
- return m_context;
-}
-
-QDeclarativeDebugObjectQuery::QDeclarativeDebugObjectQuery(QObject *parent)
- : QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QDeclarativeDebugObjectQuery::~QDeclarativeDebugObjectQuery()
-{
- if (m_client && m_queryId != -1)
- QDeclarativeEngineDebugPrivate::remove(m_client, this);
-}
-
-QDeclarativeDebugObjectReference QDeclarativeDebugObjectQuery::object() const
-{
- return m_object;
-}
-
-QDeclarativeDebugExpressionQuery::QDeclarativeDebugExpressionQuery(QObject *parent)
- : QDeclarativeDebugQuery(parent), m_client(0), m_queryId(-1)
-{
-}
-
-QDeclarativeDebugExpressionQuery::~QDeclarativeDebugExpressionQuery()
-{
- if (m_client && m_queryId != -1)
- QDeclarativeEngineDebugPrivate::remove(m_client, this);
-}
-
-QVariant QDeclarativeDebugExpressionQuery::expression() const
-{
- return m_expr;
-}
-
-QVariant QDeclarativeDebugExpressionQuery::result() const
-{
- return m_result;
-}
-
-QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference()
- : m_debugId(-1)
-{
-}
-
-QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(int debugId)
- : m_debugId(debugId)
-{
-}
-
-QDeclarativeDebugEngineReference::QDeclarativeDebugEngineReference(const QDeclarativeDebugEngineReference &o)
- : m_debugId(o.m_debugId), m_name(o.m_name)
-{
-}
-
-QDeclarativeDebugEngineReference &
-QDeclarativeDebugEngineReference::operator=(const QDeclarativeDebugEngineReference &o)
-{
- m_debugId = o.m_debugId; m_name = o.m_name;
- return *this;
-}
-
-int QDeclarativeDebugEngineReference::debugId() const
-{
- return m_debugId;
-}
-
-QString QDeclarativeDebugEngineReference::name() const
-{
- return m_name;
-}
-
-QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference()
- : m_debugId(-1), m_contextDebugId(-1)
-{
-}
-
-QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(int debugId)
- : m_debugId(debugId), m_contextDebugId(-1)
-{
-}
-
-QDeclarativeDebugObjectReference::QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &o)
- : m_debugId(o.m_debugId), m_class(o.m_class), m_idString(o.m_idString),
- m_name(o.m_name), m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
- m_properties(o.m_properties), m_children(o.m_children)
-{
-}
-
-QDeclarativeDebugObjectReference &
-QDeclarativeDebugObjectReference::operator=(const QDeclarativeDebugObjectReference &o)
-{
- m_debugId = o.m_debugId; m_class = o.m_class; m_idString = o.m_idString;
- m_name = o.m_name; m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
- m_properties = o.m_properties; m_children = o.m_children;
- return *this;
-}
-
-int QDeclarativeDebugObjectReference::debugId() const
-{
- return m_debugId;
-}
-
-QString QDeclarativeDebugObjectReference::className() const
-{
- return m_class;
-}
-
-QString QDeclarativeDebugObjectReference::idString() const
-{
- return m_idString;
-}
-
-QString QDeclarativeDebugObjectReference::name() const
-{
- return m_name;
-}
-
-QDeclarativeDebugFileReference QDeclarativeDebugObjectReference::source() const
-{
- return m_source;
-}
-
-int QDeclarativeDebugObjectReference::contextDebugId() const
-{
- return m_contextDebugId;
-}
-
-QList<QDeclarativeDebugPropertyReference> QDeclarativeDebugObjectReference::properties() const
-{
- return m_properties;
-}
-
-QList<QDeclarativeDebugObjectReference> QDeclarativeDebugObjectReference::children() const
-{
- return m_children;
-}
-
-QDeclarativeDebugContextReference::QDeclarativeDebugContextReference()
- : m_debugId(-1)
-{
-}
-
-QDeclarativeDebugContextReference::QDeclarativeDebugContextReference(const QDeclarativeDebugContextReference &o)
- : m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
-{
-}
-
-QDeclarativeDebugContextReference &QDeclarativeDebugContextReference::operator=(const QDeclarativeDebugContextReference &o)
-{
- m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects;
- m_contexts = o.m_contexts;
- return *this;
-}
-
-int QDeclarativeDebugContextReference::debugId() const
-{
- return m_debugId;
-}
-
-QString QDeclarativeDebugContextReference::name() const
-{
- return m_name;
-}
-
-QList<QDeclarativeDebugObjectReference> QDeclarativeDebugContextReference::objects() const
-{
- return m_objects;
-}
-
-QList<QDeclarativeDebugContextReference> QDeclarativeDebugContextReference::contexts() const
-{
- return m_contexts;
-}
-
-QDeclarativeDebugFileReference::QDeclarativeDebugFileReference()
- : m_lineNumber(-1), m_columnNumber(-1)
-{
-}
-
-QDeclarativeDebugFileReference::QDeclarativeDebugFileReference(const QDeclarativeDebugFileReference &o)
- : m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
-{
-}
-
-QDeclarativeDebugFileReference &QDeclarativeDebugFileReference::operator=(const QDeclarativeDebugFileReference &o)
-{
- m_url = o.m_url; m_lineNumber = o.m_lineNumber; m_columnNumber = o.m_columnNumber;
- return *this;
-}
-
-QUrl QDeclarativeDebugFileReference::url() const
-{
- return m_url;
-}
-
-void QDeclarativeDebugFileReference::setUrl(const QUrl &u)
-{
- m_url = u;
-}
-
-int QDeclarativeDebugFileReference::lineNumber() const
-{
- return m_lineNumber;
-}
-
-void QDeclarativeDebugFileReference::setLineNumber(int l)
-{
- m_lineNumber = l;
-}
-
-int QDeclarativeDebugFileReference::columnNumber() const
-{
- return m_columnNumber;
-}
-
-void QDeclarativeDebugFileReference::setColumnNumber(int c)
-{
- m_columnNumber = c;
-}
-
-QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference()
- : m_objectDebugId(-1), m_hasNotifySignal(false)
-{
-}
-
-QDeclarativeDebugPropertyReference::QDeclarativeDebugPropertyReference(const QDeclarativeDebugPropertyReference &o)
- : m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
- m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
- m_hasNotifySignal(o.m_hasNotifySignal)
-{
-}
-
-QDeclarativeDebugPropertyReference &QDeclarativeDebugPropertyReference::operator=(const QDeclarativeDebugPropertyReference &o)
-{
- m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value;
- m_valueTypeName = o.m_valueTypeName; m_binding = o.m_binding;
- m_hasNotifySignal = o.m_hasNotifySignal;
- return *this;
-}
-
-int QDeclarativeDebugPropertyReference::objectDebugId() const
-{
- return m_objectDebugId;
-}
-
-QString QDeclarativeDebugPropertyReference::name() const
-{
- return m_name;
-}
-
-QString QDeclarativeDebugPropertyReference::valueTypeName() const
-{
- return m_valueTypeName;
-}
-
-QVariant QDeclarativeDebugPropertyReference::value() const
-{
- return m_value;
-}
-
-QString QDeclarativeDebugPropertyReference::binding() const
-{
- return m_binding;
-}
-
-bool QDeclarativeDebugPropertyReference::hasNotifySignal() const
-{
- return m_hasNotifySignal;
-}
-
-QT_END_NAMESPACE
-
diff --git a/src/declarative/debugger/qdeclarativeenginedebug_p.h b/src/declarative/debugger/qdeclarativeenginedebug_p.h
deleted file mode 100644
index 5ca2987da3..0000000000
--- a/src/declarative/debugger/qdeclarativeenginedebug_p.h
+++ /dev/null
@@ -1,397 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEENGINEDEBUG_H
-#define QDECLARATIVEENGINEDEBUG_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 <QtCore/qobject.h>
-#include <QtCore/qurl.h>
-#include <QtCore/qvariant.h>
-
-#include <private/qdeclarativeglobal_p.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-
-class QDeclarativeDebugConnection;
-class QDeclarativeDebugWatch;
-class QDeclarativeDebugPropertyWatch;
-class QDeclarativeDebugObjectExpressionWatch;
-class QDeclarativeDebugEnginesQuery;
-class QDeclarativeDebugRootContextQuery;
-class QDeclarativeDebugObjectQuery;
-class QDeclarativeDebugExpressionQuery;
-class QDeclarativeDebugPropertyReference;
-class QDeclarativeDebugContextReference;
-class QDeclarativeDebugObjectReference;
-class QDeclarativeDebugFileReference;
-class QDeclarativeDebugEngineReference;
-class QDeclarativeEngineDebugPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebug : public QObject
-{
- Q_OBJECT
-public:
- enum State { NotConnected, Unavailable, Enabled };
-
- explicit QDeclarativeEngineDebug(QDeclarativeDebugConnection *, QObject * = 0);
- ~QDeclarativeEngineDebug();
-
- State state() const;
-
- QDeclarativeDebugPropertyWatch *addWatch(const QDeclarativeDebugPropertyReference &,
- QObject *parent = 0);
- QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugContextReference &, const QString &,
- QObject *parent = 0);
- QDeclarativeDebugObjectExpressionWatch *addWatch(const QDeclarativeDebugObjectReference &, const QString &,
- QObject *parent = 0);
- QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugObjectReference &,
- QObject *parent = 0);
- QDeclarativeDebugWatch *addWatch(const QDeclarativeDebugFileReference &,
- QObject *parent = 0);
-
- void removeWatch(QDeclarativeDebugWatch *watch);
-
- QDeclarativeDebugEnginesQuery *queryAvailableEngines(QObject *parent = 0);
- QDeclarativeDebugRootContextQuery *queryRootContexts(const QDeclarativeDebugEngineReference &,
- QObject *parent = 0);
- QDeclarativeDebugObjectQuery *queryObject(const QDeclarativeDebugObjectReference &,
- QObject *parent = 0);
- QDeclarativeDebugObjectQuery *queryObjectRecursive(const QDeclarativeDebugObjectReference &,
- QObject *parent = 0);
- QDeclarativeDebugExpressionQuery *queryExpressionResult(int objectDebugId,
- const QString &expr,
- QObject *parent = 0);
- bool setBindingForObject(int objectDebugId, const QString &propertyName,
- const QVariant &bindingExpression, bool isLiteralValue,
- QString source = QString(), int line = -1);
- bool resetBindingForObject(int objectDebugId, const QString &propertyName);
- bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody);
-
-Q_SIGNALS:
- void newObjects();
- void stateChanged(State state);
-
-private:
- Q_DECLARE_PRIVATE(QDeclarativeEngineDebug)
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugWatch : public QObject
-{
- Q_OBJECT
-public:
- enum State { Waiting, Active, Inactive, Dead };
-
- QDeclarativeDebugWatch(QObject *);
- ~QDeclarativeDebugWatch();
-
- int queryId() const;
- int objectDebugId() const;
- State state() const;
-
-Q_SIGNALS:
- void stateChanged(QDeclarativeDebugWatch::State);
- //void objectChanged(int, const QDeclarativeDebugObjectReference &);
- //void valueChanged(int, const QVariant &);
-
- // Server sends value as string if it is a user-type variant
- void valueChanged(const QByteArray &name, const QVariant &value);
-
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- void setState(State);
- State m_state;
- int m_queryId;
- QDeclarativeEngineDebug *m_client;
- int m_objectDebugId;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyWatch : public QDeclarativeDebugWatch
-{
- Q_OBJECT
-public:
- QDeclarativeDebugPropertyWatch(QObject *parent);
-
- QString name() const;
-
-private:
- friend class QDeclarativeEngineDebug;
- QString m_name;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectExpressionWatch : public QDeclarativeDebugWatch
-{
- Q_OBJECT
-public:
- QDeclarativeDebugObjectExpressionWatch(QObject *parent);
-
- QString expression() const;
-
-private:
- friend class QDeclarativeEngineDebug;
- QString m_expr;
- int m_debugId;
-};
-
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugQuery : public QObject
-{
- Q_OBJECT
-public:
- enum State { Waiting, Error, Completed };
-
- State state() const;
- bool isWaiting() const;
-
-Q_SIGNALS:
- void stateChanged(QDeclarativeDebugQuery::State);
-
-protected:
- QDeclarativeDebugQuery(QObject *);
-
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- void setState(State);
- State m_state;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugFileReference
-{
-public:
- QDeclarativeDebugFileReference();
- QDeclarativeDebugFileReference(const QDeclarativeDebugFileReference &);
- QDeclarativeDebugFileReference &operator=(const QDeclarativeDebugFileReference &);
-
- QUrl url() const;
- void setUrl(const QUrl &);
- int lineNumber() const;
- void setLineNumber(int);
- int columnNumber() const;
- void setColumnNumber(int);
-
-private:
- friend class QDeclarativeEngineDebugPrivate;
- QUrl m_url;
- int m_lineNumber;
- int m_columnNumber;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEngineReference
-{
-public:
- QDeclarativeDebugEngineReference();
- QDeclarativeDebugEngineReference(int);
- QDeclarativeDebugEngineReference(const QDeclarativeDebugEngineReference &);
- QDeclarativeDebugEngineReference &operator=(const QDeclarativeDebugEngineReference &);
-
- int debugId() const;
- QString name() const;
-
-private:
- friend class QDeclarativeEngineDebugPrivate;
- int m_debugId;
- QString m_name;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectReference
-{
-public:
- QDeclarativeDebugObjectReference();
- QDeclarativeDebugObjectReference(int);
- QDeclarativeDebugObjectReference(const QDeclarativeDebugObjectReference &);
- QDeclarativeDebugObjectReference &operator=(const QDeclarativeDebugObjectReference &);
-
- int debugId() const;
- QString className() const;
- QString idString() const;
- QString name() const;
-
- QDeclarativeDebugFileReference source() const;
- int contextDebugId() const;
-
- QList<QDeclarativeDebugPropertyReference> properties() const;
- QList<QDeclarativeDebugObjectReference> children() const;
-
-private:
- friend class QDeclarativeEngineDebugPrivate;
- int m_debugId;
- QString m_class;
- QString m_idString;
- QString m_name;
- QDeclarativeDebugFileReference m_source;
- int m_contextDebugId;
- QList<QDeclarativeDebugPropertyReference> m_properties;
- QList<QDeclarativeDebugObjectReference> m_children;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugContextReference
-{
-public:
- QDeclarativeDebugContextReference();
- QDeclarativeDebugContextReference(const QDeclarativeDebugContextReference &);
- QDeclarativeDebugContextReference &operator=(const QDeclarativeDebugContextReference &);
-
- int debugId() const;
- QString name() const;
-
- QList<QDeclarativeDebugObjectReference> objects() const;
- QList<QDeclarativeDebugContextReference> contexts() const;
-
-private:
- friend class QDeclarativeEngineDebugPrivate;
- int m_debugId;
- QString m_name;
- QList<QDeclarativeDebugObjectReference> m_objects;
- QList<QDeclarativeDebugContextReference> m_contexts;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugPropertyReference
-{
-public:
- QDeclarativeDebugPropertyReference();
- QDeclarativeDebugPropertyReference(const QDeclarativeDebugPropertyReference &);
- QDeclarativeDebugPropertyReference &operator=(const QDeclarativeDebugPropertyReference &);
-
- int objectDebugId() const;
- QString name() const;
- QVariant value() const;
- QString valueTypeName() const;
- QString binding() const;
- bool hasNotifySignal() const;
-
-private:
- friend class QDeclarativeEngineDebugPrivate;
- int m_objectDebugId;
- QString m_name;
- QVariant m_value;
- QString m_valueTypeName;
- QString m_binding;
- bool m_hasNotifySignal;
-};
-
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugEnginesQuery : public QDeclarativeDebugQuery
-{
- Q_OBJECT
-public:
- virtual ~QDeclarativeDebugEnginesQuery();
- QList<QDeclarativeDebugEngineReference> engines() const;
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- QDeclarativeDebugEnginesQuery(QObject *);
- QDeclarativeEngineDebug *m_client;
- int m_queryId;
- QList<QDeclarativeDebugEngineReference> m_engines;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugRootContextQuery : public QDeclarativeDebugQuery
-{
- Q_OBJECT
-public:
- virtual ~QDeclarativeDebugRootContextQuery();
- QDeclarativeDebugContextReference rootContext() const;
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- QDeclarativeDebugRootContextQuery(QObject *);
- QDeclarativeEngineDebug *m_client;
- int m_queryId;
- QDeclarativeDebugContextReference m_context;
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugObjectQuery : public QDeclarativeDebugQuery
-{
- Q_OBJECT
-public:
- virtual ~QDeclarativeDebugObjectQuery();
- QDeclarativeDebugObjectReference object() const;
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- QDeclarativeDebugObjectQuery(QObject *);
- QDeclarativeEngineDebug *m_client;
- int m_queryId;
- QDeclarativeDebugObjectReference m_object;
-
-};
-
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativeDebugQuery
-{
- Q_OBJECT
-public:
- virtual ~QDeclarativeDebugExpressionQuery();
- QVariant expression() const;
- QVariant result() const;
-private:
- friend class QDeclarativeEngineDebug;
- friend class QDeclarativeEngineDebugPrivate;
- QDeclarativeDebugExpressionQuery(QObject *);
- QDeclarativeEngineDebug *m_client;
- int m_queryId;
- QVariant m_expr;
- QVariant m_result;
-};
-
-QT_END_NAMESPACE
-
-Q_DECLARE_METATYPE(QDeclarativeDebugEngineReference)
-Q_DECLARE_METATYPE(QDeclarativeDebugObjectReference)
-Q_DECLARE_METATYPE(QDeclarativeDebugContextReference)
-Q_DECLARE_METATYPE(QDeclarativeDebugPropertyReference)
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEENGINEDEBUG_H
diff --git a/src/declarative/qml/parser/parser.pri b/src/declarative/qml/parser/parser.pri
deleted file mode 100644
index 3ae0a6d8eb..0000000000
--- a/src/declarative/qml/parser/parser.pri
+++ /dev/null
@@ -1,19 +0,0 @@
-HEADERS += \
- $$PWD/qdeclarativejsast_p.h \
- $$PWD/qdeclarativejsastfwd_p.h \
- $$PWD/qdeclarativejsastvisitor_p.h \
- $$PWD/qdeclarativejsengine_p.h \
- $$PWD/qdeclarativejsgrammar_p.h \
- $$PWD/qdeclarativejslexer_p.h \
- $$PWD/qdeclarativejsmemorypool_p.h \
- $$PWD/qdeclarativejsparser_p.h \
- $$PWD/qdeclarativejsglobal_p.h \
- $$PWD/qdeclarativejskeywords_p.h
-
-SOURCES += \
- $$PWD/qdeclarativejsast.cpp \
- $$PWD/qdeclarativejsastvisitor.cpp \
- $$PWD/qdeclarativejsengine_p.cpp \
- $$PWD/qdeclarativejsgrammar.cpp \
- $$PWD/qdeclarativejslexer.cpp \
- $$PWD/qdeclarativejsparser.cpp
diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h
deleted file mode 100644
index 2d199b79e6..0000000000
--- a/src/declarative/qml/qdeclarative.h
+++ /dev/null
@@ -1,451 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVE_H
-#define QDECLARATIVE_H
-
-#include <QtDeclarative/qdeclarativeprivate.h>
-#include <QtDeclarative/qdeclarativeparserstatus.h>
-#include <QtDeclarative/qdeclarativepropertyvaluesource.h>
-#include <QtDeclarative/qdeclarativelist.h>
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qmetaobject.h>
-
-QT_BEGIN_HEADER
-
-#define QML_VERSION 0x020000
-#define QML_VERSION_STR "2.0"
-
-#define QML_DECLARE_TYPE(TYPE) \
- Q_DECLARE_METATYPE(TYPE *) \
- Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
-
-#define QML_DECLARE_TYPE_HASMETATYPE(TYPE) \
- Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
-
-#define QML_DECLARE_INTERFACE(INTERFACE) \
- QML_DECLARE_TYPE(INTERFACE)
-
-#define QML_DECLARE_INTERFACE_HASMETATYPE(INTERFACE) \
- QML_DECLARE_TYPE_HASMETATYPE(INTERFACE)
-
-enum { /* TYPEINFO flags */
- QML_HAS_ATTACHED_PROPERTIES = 0x01
-};
-
-#define QML_DECLARE_TYPEINFO(TYPE, FLAGS) \
-QT_BEGIN_NAMESPACE \
-template <> \
-class QDeclarativeTypeInfo<TYPE > \
-{ \
-public: \
- enum { \
- hasAttachedProperties = (((FLAGS) & QML_HAS_ATTACHED_PROPERTIES) == QML_HAS_ATTACHED_PROPERTIES) \
- }; \
-}; \
-QT_END_NAMESPACE
-
-QT_BEGIN_NAMESPACE
-
-
-class QDeclarativePropertyValueInterceptor;
-
-template<typename T>
-int qmlRegisterType()
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- 0, 0,
- QString(),
-
- 0, 0, 0, 0, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-int Q_DECLARATIVE_EXPORT qmlRegisterTypeNotAvailable(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& message);
-
-template<typename T>
-int qmlRegisterUncreatableType(const char *uri, int versionMajor, int versionMinor, const char *qmlName, const QString& reason)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- 0, 0,
- reason,
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-template<typename T>
-int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- sizeof(T), QDeclarativePrivate::createInto<T>,
- QString(),
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-template<typename T, int metaObjectRevision>
-int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 1,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- sizeof(T), QDeclarativePrivate::createInto<T>,
- QString(),
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- metaObjectRevision
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-template<typename T, int metaObjectRevision>
-int qmlRegisterRevision(const char *uri, int versionMajor, int versionMinor)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 1,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- sizeof(T), QDeclarativePrivate::createInto<T>,
- QString(),
-
- uri, versionMajor, versionMinor, 0, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- 0,
- metaObjectRevision
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-
-template<typename T, typename E>
-int qmlRegisterExtendedType()
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- 0, 0,
- QString(),
-
- 0, 0, 0, 0, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
-
- 0,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-template<typename T, typename E>
-int qmlRegisterExtendedType(const char *uri, int versionMajor, int versionMinor,
- const char *qmlName)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativeAttachedPropertiesFunc attached = QDeclarativePrivate::attachedPropertiesFunc<E>();
- const QMetaObject * attachedMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<E>();
- if (!attached) {
- attached = QDeclarativePrivate::attachedPropertiesFunc<T>();
- attachedMetaObject = QDeclarativePrivate::attachedPropertiesMetaObject<T>();
- }
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- sizeof(T), QDeclarativePrivate::createInto<T>,
- QString(),
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- attached,
- attachedMetaObject,
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- QDeclarativePrivate::createParent<E>, &E::staticMetaObject,
-
- 0,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-template<typename T>
-int qmlRegisterInterface(const char *typeName)
-{
- QByteArray name(typeName);
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterInterface qmlInterface = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
-
- qobject_interface_iid<T *>()
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::InterfaceRegistration, &qmlInterface);
-}
-
-template<typename T>
-int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor,
- const char *qmlName, QDeclarativeCustomParser *parser)
-{
- QByteArray name(T::staticMetaObject.className());
-
- QByteArray pointerName(name + '*');
- QByteArray listName("QDeclarativeListProperty<" + name + ">");
-
- QDeclarativePrivate::RegisterType type = {
- 0,
-
- qRegisterMetaType<T *>(pointerName.constData()),
- qRegisterMetaType<QDeclarativeListProperty<T> >(listName.constData()),
- sizeof(T), QDeclarativePrivate::createInto<T>,
- QString(),
-
- uri, versionMajor, versionMinor, qmlName, &T::staticMetaObject,
-
- QDeclarativePrivate::attachedPropertiesFunc<T>(),
- QDeclarativePrivate::attachedPropertiesMetaObject<T>(),
-
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativeParserStatus>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueSource>::cast(),
- QDeclarativePrivate::StaticCastSelector<T,QDeclarativePropertyValueInterceptor>::cast(),
-
- 0, 0,
-
- parser,
- 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type);
-}
-
-class QDeclarativeContext;
-class QDeclarativeEngine;
-class QJSValue;
-class QJSEngine;
-Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *);
-Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true);
-Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create);
-
-template<typename T>
-QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true)
-{
- static int idx = -1;
- return qmlAttachedPropertiesObject(&idx, obj, &T::staticMetaObject, create);
-}
-
-// For the use of QtQuick1 module
-Q_DECLARATIVE_EXPORT void qmlRegisterBaseTypes(const char *uri, int versionMajor, int versionMinor);
-
-inline int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor,
- QJSValue (*callback)(QDeclarativeEngine *, QJSEngine *))
-{
- QDeclarativePrivate::RegisterModuleApi api = {
- 0,
-
- uri, versionMajor, versionMinor,
-
- callback, 0
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::ModuleApiRegistration, &api);
-}
-
-inline int qmlRegisterModuleApi(const char *uri, int versionMajor, int versionMinor,
- QObject *(*callback)(QDeclarativeEngine *, QJSEngine *))
-{
- QDeclarativePrivate::RegisterModuleApi api = {
- 0,
-
- uri, versionMajor, versionMinor,
-
- 0, callback
- };
-
- return QDeclarativePrivate::qmlregister(QDeclarativePrivate::ModuleApiRegistration, &api);
-}
-
-QT_END_NAMESPACE
-
-QML_DECLARE_TYPE(QObject)
-Q_DECLARE_METATYPE(QVariant)
-
-QT_END_HEADER
-
-#endif // QDECLARATIVE_H
diff --git a/src/declarative/qml/qdeclarativecompiler_p.h b/src/declarative/qml/qdeclarativecompiler_p.h
deleted file mode 100644
index 637cd80569..0000000000
--- a/src/declarative/qml/qdeclarativecompiler_p.h
+++ /dev/null
@@ -1,466 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVECOMPILER_P_H
-#define QDECLARATIVECOMPILER_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 "qdeclarative.h"
-#include "qdeclarativeerror.h"
-#include <private/qv8_p.h>
-#include "qdeclarativeinstruction_p.h"
-#include "qdeclarativescript_p.h"
-#include "qdeclarativeengine_p.h"
-#include <private/qbitfield_p.h>
-#include "qdeclarativepropertycache_p.h"
-#include "qdeclarativeintegercache_p.h"
-#include "qdeclarativetypenamecache_p.h"
-#include "qdeclarativetypeloader_p.h"
-
-#include <QtCore/qbytearray.h>
-#include <QtCore/qset.h>
-#include <QtCore/QCoreApplication>
-
-QT_BEGIN_NAMESPACE
-
-class QDeclarativeEngine;
-class QDeclarativeComponent;
-class QDeclarativeContext;
-class QDeclarativeContextData;
-
-class Q_AUTOTEST_EXPORT QDeclarativeCompiledData : public QDeclarativeRefCount,
- public QDeclarativeCleanup
-{
-public:
- QDeclarativeCompiledData(QDeclarativeEngine *engine);
- virtual ~QDeclarativeCompiledData();
-
- QDeclarativeEngine *engine;
-
- QString name;
- QUrl url;
- QDeclarativeTypeNameCache *importCache;
-
- struct TypeReference
- {
- TypeReference()
- : type(0), typePropertyCache(0), component(0) {}
-
- QString className;
- QDeclarativeType *type;
- QDeclarativePropertyCache *typePropertyCache;
- QDeclarativeCompiledData *component;
-
- const QMetaObject *metaObject() const;
- QDeclarativePropertyCache *propertyCache() const;
- QDeclarativePropertyCache *createPropertyCache(QDeclarativeEngine *);
- };
- QList<TypeReference> types;
-
- struct V8Program {
- V8Program(const QByteArray &p, QDeclarativeCompiledData *c)
- : program(p), cdata(c) {}
-
- QByteArray program;
- v8::Persistent<v8::Array> bindings;
- QDeclarativeCompiledData *cdata;
- };
-
- QList<V8Program> programs;
-
- const QMetaObject *root;
- QAbstractDynamicMetaObject rootData;
- QDeclarativePropertyCache *rootPropertyCache;
- QList<QString> primitives;
- QList<QByteArray> datas;
- QByteArray bytecode;
- QList<QDeclarativePropertyCache *> propertyCaches;
- QList<QDeclarativeIntegerCache *> contextCaches;
- QList<QDeclarativeScriptData *> scripts;
- QList<QUrl> urls;
-
- struct Instruction {
-#define QML_INSTR_DATA_TYPEDEF(I, FMT) typedef QDeclarativeInstructionData<QDeclarativeInstruction::I> I;
- FOR_EACH_QML_INSTR(QML_INSTR_DATA_TYPEDEF)
-#undef QML_INSTR_DATA_TYPEDEF
- private:
- Instruction();
- };
-
- void dumpInstructions();
-
- template <int Instr>
- int addInstruction(const QDeclarativeInstructionData<Instr> &data)
- {
- QDeclarativeInstruction genericInstr;
- QDeclarativeInstructionMeta<Instr>::setData(genericInstr, data);
- return addInstructionHelper(static_cast<QDeclarativeInstruction::Type>(Instr), genericInstr);
- }
- int nextInstructionIndex();
- QDeclarativeInstruction *instruction(int index);
- QDeclarativeInstruction::Type instructionType(const QDeclarativeInstruction *instr);
-
- bool isInitialized() const { return hasEngine(); }
- void initialize(QDeclarativeEngine *);
-
-protected:
- virtual void destroy(); // From QDeclarativeRefCount
- virtual void clear(); // From QDeclarativeCleanup
-
-private:
- friend class QDeclarativeCompiler;
-
- int addInstructionHelper(QDeclarativeInstruction::Type type, QDeclarativeInstruction &instr);
- void dump(QDeclarativeInstruction *, int idx = -1);
- QDeclarativeCompiledData(const QDeclarativeCompiledData &other);
- QDeclarativeCompiledData &operator=(const QDeclarativeCompiledData &other);
- QByteArray packData;
- int pack(const char *, size_t);
-
- int indexForString(const QString &);
- int indexForByteArray(const QByteArray &);
- int indexForUrl(const QUrl &);
-};
-
-namespace QDeclarativeCompilerTypes {
- struct BindingContext
- {
- BindingContext()
- : stack(0), owner(0), object(0) {}
- BindingContext(QDeclarativeScript::Object *o)
- : stack(0), owner(0), object(o) {}
- BindingContext incr() const {
- BindingContext rv(object);
- rv.stack = stack + 1;
- return rv;
- }
- bool isSubContext() const { return stack != 0; }
- int stack;
- int owner;
- QDeclarativeScript::Object *object;
- };
-
- struct BindingReference
- {
- enum DataType { QtScript, V4, V8,
- Tr, TrId };
- DataType dataType;
- };
-
- struct JSBindingReference : public QDeclarativePool::Class,
- public BindingReference
- {
- JSBindingReference() : nextReference(0) {}
-
- QDeclarativeScript::Variant expression;
- QDeclarativeScript::Property *property;
- QDeclarativeScript::Value *value;
-
- int compiledIndex;
-
- QString rewrittenExpression;
- BindingContext bindingContext;
-
- JSBindingReference *nextReference;
- };
-
- struct TrBindingReference : public QDeclarativePool::POD,
- public BindingReference
- {
- QStringRef text;
- QStringRef comment;
- int n;
- };
-
- struct IdList : public QFieldList<QDeclarativeScript::Object,
- &QDeclarativeScript::Object::nextIdObject>
- {
- QDeclarativeScript::Object *value(const QString &id) const {
- for (QDeclarativeScript::Object *o = first(); o; o = next(o)) {
- if (o->id == id)
- return o;
- }
- return 0;
- }
- };
-
- struct DepthStack {
- DepthStack() : _depth(0), _maxDepth(0) {}
- DepthStack(const DepthStack &o) : _depth(o._depth), _maxDepth(o._maxDepth) {}
- DepthStack &operator=(const DepthStack &o) { _depth = o._depth; _maxDepth = o._maxDepth; return *this; }
-
- int depth() const { return _depth; }
- int maxDepth() const { return _maxDepth; }
-
- void push() { ++_depth; _maxDepth = qMax(_depth, _maxDepth); }
- void pop() { --_depth; Q_ASSERT(_depth >= 0); Q_ASSERT(_maxDepth > _depth); }
-
- void pushPop(int count) { _maxDepth = qMax(_depth + count, _maxDepth); }
- private:
- int _depth;
- int _maxDepth;
- };
-
- // Contains all the incremental compiler state about a component. As
- // a single QML file can have multiple components defined, there may be
- // more than one of these for each compile
- struct ComponentCompileState : public QDeclarativePool::Class
- {
- ComponentCompileState()
- : parserStatusCount(0), totalBindingsCount(0), pushedProperties(0), nested(false),
- v8BindingProgramLine(-1), root(0) {}
-
- IdList ids;
- int parserStatusCount;
- int totalBindingsCount;
- int pushedProperties;
- bool nested;
-
- QByteArray compiledBindingData;
- QByteArray v8BindingProgram;
- int v8BindingProgramLine;
-
- DepthStack objectDepth;
- DepthStack listDepth;
-
- typedef QDeclarativeCompilerTypes::JSBindingReference B;
- typedef QFieldList<B, &B::nextReference> JSBindingReferenceList;
- JSBindingReferenceList bindings;
- typedef QDeclarativeScript::Object O;
- typedef QFieldList<O, &O::nextAliasingObject> AliasingObjectsList;
- AliasingObjectsList aliasingObjects;
- QDeclarativeScript::Object *root;
- };
-};
-
-class QMetaObjectBuilder;
-class Q_AUTOTEST_EXPORT QDeclarativeCompiler
-{
- Q_DECLARE_TR_FUNCTIONS(QDeclarativeCompiler)
-public:
- QDeclarativeCompiler(QDeclarativePool *);
-
- bool compile(QDeclarativeEngine *, QDeclarativeTypeData *, QDeclarativeCompiledData *);
-
- bool isError() const;
- QList<QDeclarativeError> errors() const;
-
- static bool isAttachedPropertyName(const QString &);
- static bool isSignalPropertyName(const QString &);
- static bool isAttachedPropertyName(const QHashedStringRef &);
- static bool isSignalPropertyName(const QHashedStringRef &);
-
- int evaluateEnum(const QByteArray& script) const; // for QDeclarativeCustomParser::evaluateEnum
- const QMetaObject *resolveType(const QString& name) const; // for QDeclarativeCustomParser::resolveType
- int rewriteBinding(const QDeclarativeScript::Variant& value, const QString& name); // for QDeclarativeCustomParser::rewriteBinding
- QString rewriteSignalHandler(const QDeclarativeScript::Variant& value, const QString &name); // for QDeclarativeCustomParser::rewriteSignalHandler
-
-private:
- typedef QDeclarativeCompiledData::Instruction Instruction;
-
- static void reset(QDeclarativeCompiledData *);
-
- void compileTree(QDeclarativeScript::Object *tree);
-
-
- bool buildObject(QDeclarativeScript::Object *obj, const QDeclarativeCompilerTypes::BindingContext &);
- bool buildComponent(QDeclarativeScript::Object *obj, const QDeclarativeCompilerTypes::BindingContext &);
- bool buildSubObject(QDeclarativeScript::Object *obj, const QDeclarativeCompilerTypes::BindingContext &);
- bool buildSignal(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &);
- bool buildProperty(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &);
- bool buildPropertyInNamespace(QDeclarativeImportedNamespace *ns,
- QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &);
- bool buildIdProperty(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj);
- bool buildAttachedProperty(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildGroupedProperty(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildValueTypeProperty(QObject *type,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Object *baseObj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildListProperty(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildScriptStringProperty(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildPropertyAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildPropertyObjectAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Value *value,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildPropertyOnAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Object *baseObj,
- QDeclarativeScript::Value *value,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildPropertyLiteralAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Value *value,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool doesPropertyExist(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj);
- bool testLiteralAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Value *value);
- bool testQualifiedEnumAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Value *value,
- bool *isAssignment);
- enum DynamicMetaMode { IgnoreAliases, ResolveAliases, ForceCreation };
- bool mergeDynamicMetaProperties(QDeclarativeScript::Object *obj);
- bool buildDynamicMeta(QDeclarativeScript::Object *obj, DynamicMetaMode mode);
- bool checkDynamicMeta(QDeclarativeScript::Object *obj);
- bool buildBinding(QDeclarativeScript::Value *, QDeclarativeScript::Property *prop,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildLiteralBinding(QDeclarativeScript::Value *, QDeclarativeScript::Property *prop,
- const QDeclarativeCompilerTypes::BindingContext &ctxt);
- bool buildComponentFromRoot(QDeclarativeScript::Object *obj, const QDeclarativeCompilerTypes::BindingContext &);
- bool compileAlias(QFastMetaBuilder &,
- QByteArray &data,
- QDeclarativeScript::Object *obj,
- int propIndex, int aliasIndex,
- QDeclarativeScript::Object::DynamicProperty &);
- bool completeComponentBuild();
- bool checkValidId(QDeclarativeScript::Value *, const QString &);
-
-
- void genObject(QDeclarativeScript::Object *obj);
- void genObjectBody(QDeclarativeScript::Object *obj);
- void genValueTypeProperty(QDeclarativeScript::Object *obj,QDeclarativeScript::Property *);
- void genComponent(QDeclarativeScript::Object *obj);
- void genValueProperty(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj);
- void genListProperty(QDeclarativeScript::Property *prop, QDeclarativeScript::Object *obj);
- void genPropertyAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Property *valueTypeProperty = 0);
- void genLiteralAssignment(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Value *value);
- void genBindingAssignment(QDeclarativeScript::Value *binding,
- QDeclarativeScript::Property *prop,
- QDeclarativeScript::Object *obj,
- QDeclarativeScript::Property *valueTypeProperty = 0);
- int genContextCache();
-
- QDeclarativePropertyData genValueTypeData(QDeclarativeScript::Property *prop,
- QDeclarativeScript::Property *valueTypeProp);
-
- int componentTypeRef();
- int translationContextIndex();
-
- static QDeclarativeType *toQmlType(QDeclarativeScript::Object *from);
- bool canCoerce(int to, QDeclarativeScript::Object *from);
-
- QString elementName(QDeclarativeScript::Object *);
-
- QStringList deferredProperties(QDeclarativeScript::Object *);
-
- QDeclarativePropertyData *property(QDeclarativeScript::Object *, int);
- QDeclarativePropertyData *property(QDeclarativeScript::Object *, const QHashedStringRef &,
- bool *notInRevision = 0);
- QDeclarativePropertyData *signal(QDeclarativeScript::Object *, const QHashedStringRef &,
- bool *notInRevision = 0);
- int indexOfProperty(QDeclarativeScript::Object *, const QHashedStringRef &, bool *notInRevision = 0);
- int indexOfProperty(QDeclarativeScript::Object *, const QString &, bool *notInRevision = 0);
- int indexOfSignal(QDeclarativeScript::Object *, const QString &, bool *notInRevision = 0);
-
- void addId(const QString &, QDeclarativeScript::Object *);
-
- void dumpStats();
-
- void addBindingReference(QDeclarativeCompilerTypes::JSBindingReference *);
-
- QDeclarativeCompilerTypes::ComponentCompileState *compileState;
-
- QDeclarativePool *pool;
-
- QDeclarativeCompilerTypes::ComponentCompileState *componentState(QDeclarativeScript::Object *);
- void saveComponentState();
-
- QList<QDeclarativeError> exceptions;
- QDeclarativeCompiledData *output;
- QDeclarativeEngine *engine;
- QDeclarativeEnginePrivate *enginePrivate;
- QDeclarativeScript::Object *unitRoot;
- QDeclarativeTypeData *unit;
- int cachedComponentTypeRef;
- int cachedTranslationContextIndex;
-
- // Compiler component statistics. Only collected if QML_COMPILER_STATS=1
- struct ComponentStat
- {
- ComponentStat() : ids(0), objects(0) {}
-
- int lineNumber;
-
- int ids;
- QList<QDeclarativeScript::LocationSpan> scriptBindings;
- QList<QDeclarativeScript::LocationSpan> optimizedBindings;
- int objects;
- };
- struct ComponentStats : public QDeclarativePool::Class
- {
- ComponentStat componentStat;
- QList<ComponentStat> savedComponentStats;
- };
- ComponentStats *componentStats;
-};
-
-QT_END_NAMESPACE
-
-#endif // QDECLARATIVECOMPILER_P_H
diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h
deleted file mode 100644
index fcfaa7c402..0000000000
--- a/src/declarative/qml/qdeclarativeextensioninterface.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEEXTENSIONINTERFACE_H
-#define QDECLARATIVEEXTENSIONINTERFACE_H
-
-#include <QtCore/qobject.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-
-class QDeclarativeEngine;
-
-class Q_DECLARATIVE_EXPORT QDeclarativeTypesExtensionInterface
-{
-public:
- virtual ~QDeclarativeTypesExtensionInterface() {}
- virtual void registerTypes(const char *uri) = 0;
-};
-
-class Q_DECLARATIVE_EXPORT QDeclarativeExtensionInterface : public QDeclarativeTypesExtensionInterface
-{
-public:
- virtual ~QDeclarativeExtensionInterface() {}
- virtual void initializeEngine(QDeclarativeEngine *engine, const char *uri) = 0;
-};
-
-Q_DECLARE_INTERFACE(QDeclarativeTypesExtensionInterface, "org.qt-project.Qt.QDeclarativeTypesExtensionInterface/1.0")
-Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, "org.qt-project.Qt.QDeclarativeExtensionInterface/1.0")
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEEXTENSIONINTERFACE_H
diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h
deleted file mode 100644
index edd56df1a3..0000000000
--- a/src/declarative/qml/qdeclarativeinfo.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QDECLARATIVEINFO_H
-#define QDECLARATIVEINFO_H
-
-#include <QtCore/qdebug.h>
-#include <QtCore/qurl.h>
-#include <QtDeclarative/qdeclarativeerror.h>
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-
-class QDeclarativeInfoPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug
-{
-public:
- QDeclarativeInfo(const QDeclarativeInfo &);
- ~QDeclarativeInfo();
-
- inline QDeclarativeInfo &operator<<(QChar t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(bool t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(char t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(signed short t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(unsigned short t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(signed int t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(unsigned int t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(signed long t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(unsigned long t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(qint64 t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(quint64 t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(float t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(double t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(const char* t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(const QString & t) { QDebug::operator<<(t.toLocal8Bit().constData()); return *this; }
- inline QDeclarativeInfo &operator<<(const QStringRef & t) { return operator<<(t.toString()); }
- inline QDeclarativeInfo &operator<<(const QLatin1String &t) { QDebug::operator<<(t.latin1()); return *this; }
- inline QDeclarativeInfo &operator<<(const QByteArray & t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(const void * t) { QDebug::operator<<(t); return *this; }
- inline QDeclarativeInfo &operator<<(QTextStreamFunction f) { QDebug::operator<<(f); return *this; }
- inline QDeclarativeInfo &operator<<(QTextStreamManipulator m) { QDebug::operator<<(m); return *this; }
-#ifndef QT_NO_DEBUG_STREAM
- inline QDeclarativeInfo &operator<<(const QUrl &t) { static_cast<QDebug &>(*this) << t; return *this; }
-#endif
-
-private:
- friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
- friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
- friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
-
- QDeclarativeInfo(QDeclarativeInfoPrivate *);
- QDeclarativeInfoPrivate *d;
-};
-
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error);
-Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList<QDeclarativeError> &errors);
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QDECLARATIVEINFO_H
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri
deleted file mode 100644
index 8b03028c34..0000000000
--- a/src/declarative/qml/qml.pri
+++ /dev/null
@@ -1,125 +0,0 @@
-SOURCES += \
- $$PWD/qdeclarativeapplication.cpp \
- $$PWD/qdeclarativeinstruction.cpp \
- $$PWD/qdeclarativelistmodel.cpp \
- $$PWD/qdeclarativelistmodelworkeragent.cpp \
- $$PWD/qdeclarativeopenmetaobject.cpp \
- $$PWD/qdeclarativevmemetaobject.cpp \
- $$PWD/qdeclarativeengine.cpp \
- $$PWD/qdeclarativeexpression.cpp \
- $$PWD/qdeclarativebinding.cpp \
- $$PWD/qdeclarativeproperty.cpp \
- $$PWD/qdeclarativecomponent.cpp \
- $$PWD/qdeclarativeincubator.cpp \
- $$PWD/qdeclarativecontext.cpp \
- $$PWD/qdeclarativecustomparser.cpp \
- $$PWD/qdeclarativepropertyvaluesource.cpp \
- $$PWD/qdeclarativepropertyvalueinterceptor.cpp \
- $$PWD/qdeclarativeproxymetaobject.cpp \
- $$PWD/qdeclarativevme.cpp \
- $$PWD/qdeclarativecompiler.cpp \
- $$PWD/qdeclarativecompileddata.cpp \
- $$PWD/qdeclarativeboundsignal.cpp \
- $$PWD/qdeclarativemetatype.cpp \
- $$PWD/qdeclarativestringconverters.cpp \
- $$PWD/qdeclarativeparserstatus.cpp \
- $$PWD/qdeclarativetypeloader.cpp \
- $$PWD/qdeclarativeinfo.cpp \
- $$PWD/qdeclarativeerror.cpp \
- $$PWD/qdeclarativescript.cpp \
- $$PWD/qdeclarativerewrite.cpp \
- $$PWD/qdeclarativevaluetype.cpp \
- $$PWD/qdeclarativeaccessors.cpp \
- $$PWD/qdeclarativexmlhttprequest.cpp \
- $$PWD/qdeclarativewatcher.cpp \
- $$PWD/qdeclarativecleanup.cpp \
- $$PWD/qdeclarativepropertycache.cpp \
- $$PWD/qdeclarativenotifier.cpp \
- $$PWD/qdeclarativeintegercache.cpp \
- $$PWD/qdeclarativetypenotavailable.cpp \
- $$PWD/qdeclarativetypenamecache.cpp \
- $$PWD/qdeclarativescriptstring.cpp \
- $$PWD/qdeclarativeworkerscript.cpp \
- $$PWD/qdeclarativeimageprovider.cpp \
- $$PWD/qdeclarativenetworkaccessmanagerfactory.cpp \
- $$PWD/qdeclarativedirparser.cpp \
- $$PWD/qdeclarativeextensionplugin.cpp \
- $$PWD/qdeclarativeimport.cpp \
- $$PWD/qdeclarativelist.cpp \
- $$PWD/qdeclarativelocale.cpp \
- $$PWD/qlistmodelinterface.cpp
-
-HEADERS += \
- $$PWD/qdeclarativeglobal_p.h \
- $$PWD/qdeclarativeinstruction_p.h \
- $$PWD/qdeclarativelistmodel_p.h\
- $$PWD/qdeclarativelistmodel_p_p.h\
- $$PWD/qdeclarativelistmodelworkeragent_p.h \
- $$PWD/qdeclarativeopenmetaobject_p.h \
- $$PWD/qdeclarativevmemetaobject_p.h \
- $$PWD/qdeclarative.h \
- $$PWD/qdeclarativeapplication_p.h \
- $$PWD/qdeclarativebinding_p.h \
- $$PWD/qdeclarativebinding_p_p.h \
- $$PWD/qdeclarativeproperty.h \
- $$PWD/qdeclarativecomponent.h \
- $$PWD/qdeclarativecomponent_p.h \
- $$PWD/qdeclarativeincubator.h \
- $$PWD/qdeclarativeincubator_p.h \
- $$PWD/qdeclarativecustomparser_p.h \
- $$PWD/qdeclarativecustomparser_p_p.h \
- $$PWD/qdeclarativepropertyvaluesource.h \
- $$PWD/qdeclarativepropertyvalueinterceptor_p.h \
- $$PWD/qdeclarativeboundsignal_p.h \
- $$PWD/qdeclarativeparserstatus.h \
- $$PWD/qdeclarativeproxymetaobject_p.h \
- $$PWD/qdeclarativevme_p.h \
- $$PWD/qdeclarativecompiler_p.h \
- $$PWD/qdeclarativeengine_p.h \
- $$PWD/qdeclarativeexpression_p.h \
- $$PWD/qdeclarativeprivate.h \
- $$PWD/qdeclarativemetatype_p.h \
- $$PWD/qdeclarativeengine.h \
- $$PWD/qdeclarativecontext.h \
- $$PWD/qdeclarativeexpression.h \
- $$PWD/qdeclarativestringconverters_p.h \
- $$PWD/qdeclarativeinfo.h \
- $$PWD/qdeclarativeproperty_p.h \
- $$PWD/qdeclarativecontext_p.h \
- $$PWD/qdeclarativetypeloader_p.h \
- $$PWD/qdeclarativelist.h \
- $$PWD/qdeclarativelist_p.h \
- $$PWD/qdeclarativedata_p.h \
- $$PWD/qdeclarativeerror.h \
- $$PWD/qdeclarativescript_p.h \
- $$PWD/qdeclarativerewrite_p.h \
- $$PWD/qdeclarativevaluetype_p.h \
- $$PWD/qdeclarativeaccessors_p.h \
- $$PWD/qdeclarativexmlhttprequest_p.h \
- $$PWD/qdeclarativewatcher_p.h \
- $$PWD/qdeclarativecleanup_p.h \
- $$PWD/qdeclarativepropertycache_p.h \
- $$PWD/qdeclarativenotifier_p.h \
- $$PWD/qdeclarativeintegercache_p.h \
- $$PWD/qdeclarativetypenotavailable_p.h \
- $$PWD/qdeclarativetypenamecache_p.h \
- $$PWD/qdeclarativescriptstring.h \
- $$PWD/qdeclarativeworkerscript_p.h \
- $$PWD/qdeclarativeguard_p.h \
- $$PWD/qdeclarativeimageprovider.h \
- $$PWD/qdeclarativenetworkaccessmanagerfactory.h \
- $$PWD/qdeclarativedirparser_p.h \
- $$PWD/qdeclarativeextensioninterface.h \
- $$PWD/qdeclarativeimport_p.h \
- $$PWD/qdeclarativeextensionplugin.h \
- $$PWD/qdeclarativenullablevalue_p_p.h \
- $$PWD/qdeclarativescriptstring_p.h \
- $$PWD/qdeclarativelocale_p.h \
- $$PWD/qlistmodelinterface_p.h \
- $$PWD/qdeclarativecomponentattached_p.h
-
-include(parser/parser.pri)
-include(rewriter/rewriter.pri)
-include(ftw/ftw.pri)
-include(v4/v4.pri)
-include(v8/v8.pri)
diff --git a/src/declarative/qml/v4/qv4irbuilder_p.h b/src/declarative/qml/v4/qv4irbuilder_p.h
deleted file mode 100644
index c0c7ff874c..0000000000
--- a/src/declarative/qml/v4/qv4irbuilder_p.h
+++ /dev/null
@@ -1,240 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/
-**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QV4IRBUILDER_P_H
-#define QV4IRBUILDER_P_H
-
-#include <QtCore/qglobal.h>
-
-#include "qv4ir_p.h"
-
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
-class QV4IRBuilder : public QDeclarativeJS::AST::Visitor
-{
-public:
- QV4IRBuilder(const QV4Compiler::Expression *, QDeclarativeEnginePrivate *);
-
- bool operator()(QDeclarativeJS::IR::Function *, QDeclarativeJS::AST::Node *);
-
-protected:
- struct ExprResult {
- enum Format {
- ex, // expression
- cx // condition
- };
-
- QDeclarativeJS::IR::Expr *code;
- QDeclarativeJS::IR::BasicBlock *iftrue;
- QDeclarativeJS::IR::BasicBlock *iffalse;
- Format hint; // requested format
- Format format; // instruction format
-
- ExprResult(QDeclarativeJS::IR::Expr *expr = 0)
- : code(expr), iftrue(0), iffalse(0), hint(ex), format(ex) {}
-
- ExprResult(QDeclarativeJS::IR::BasicBlock *iftrue, QDeclarativeJS::IR::BasicBlock *iffalse)
- : code(0), iftrue(iftrue), iffalse(iffalse), hint(cx), format(ex) {}
-
- inline QDeclarativeJS::IR::Type type() const { return code ? code->type : QDeclarativeJS::IR::InvalidType; }
-
- inline QDeclarativeJS::IR::Expr *get() const { return code; }
- inline operator QDeclarativeJS::IR::Expr *() const { return get(); }
- inline QDeclarativeJS::IR::Expr *operator->() const { return get(); }
- inline bool isValid() const { return code ? code->type != QDeclarativeJS::IR::InvalidType : false; }
- inline bool is(QDeclarativeJS::IR::Type t) const { return type() == t; }
- inline bool isNot(QDeclarativeJS::IR::Type t) const { return type() != t; }
-
- bool isPrimitive() const {
- switch (type()) {
- case QDeclarativeJS::IR::UndefinedType: // ### TODO
- case QDeclarativeJS::IR::NullType: // ### TODO
- case QDeclarativeJS::IR::UrlType: // ### TODO
- return false;
-
- case QDeclarativeJS::IR::StringType:
- case QDeclarativeJS::IR::BoolType:
- case QDeclarativeJS::IR::IntType:
- case QDeclarativeJS::IR::RealType:
- case QDeclarativeJS::IR::RealNaNType:
- return true;
-
- default:
- return false;
- } // switch
- }
- };
-
- inline void accept(QDeclarativeJS::AST::Node *ast) { QDeclarativeJS::AST::Node::accept(ast, this); }
-
- ExprResult expression(QDeclarativeJS::AST::ExpressionNode *ast);
- ExprResult statement(QDeclarativeJS::AST::Statement *ast);
- void sourceElement(QDeclarativeJS::AST::SourceElement *ast);
- void condition(QDeclarativeJS::AST::ExpressionNode *ast, QDeclarativeJS::IR::BasicBlock *iftrue, QDeclarativeJS::IR::BasicBlock *iffalse);
- void binop(QDeclarativeJS::AST::BinaryExpression *ast, ExprResult left, ExprResult right);
-
- void implicitCvt(ExprResult &expr, QDeclarativeJS::IR::Type type);
-
- virtual bool preVisit(QDeclarativeJS::AST::Node *ast);
-
- // QML
- virtual bool visit(QDeclarativeJS::AST::UiProgram *ast);
- virtual bool visit(QDeclarativeJS::AST::UiImportList *ast);
- virtual bool visit(QDeclarativeJS::AST::UiImport *ast);
- virtual bool visit(QDeclarativeJS::AST::UiPublicMember *ast);
- virtual bool visit(QDeclarativeJS::AST::UiSourceElement *ast);
- virtual bool visit(QDeclarativeJS::AST::UiObjectDefinition *ast);
- virtual bool visit(QDeclarativeJS::AST::UiObjectInitializer *ast);
- virtual bool visit(QDeclarativeJS::AST::UiObjectBinding *ast);
- virtual bool visit(QDeclarativeJS::AST::UiScriptBinding *ast);
- virtual bool visit(QDeclarativeJS::AST::UiArrayBinding *ast);
- virtual bool visit(QDeclarativeJS::AST::UiObjectMemberList *ast);
- virtual bool visit(QDeclarativeJS::AST::UiArrayMemberList *ast);
- virtual bool visit(QDeclarativeJS::AST::UiQualifiedId *ast);
-
- // JS
- virtual bool visit(QDeclarativeJS::AST::Program *ast);
- virtual bool visit(QDeclarativeJS::AST::SourceElements *ast);
- virtual bool visit(QDeclarativeJS::AST::FunctionSourceElement *ast);
- virtual bool visit(QDeclarativeJS::AST::StatementSourceElement *ast);
-
- // object literals
- virtual bool visit(QDeclarativeJS::AST::PropertyNameAndValueList *ast);
- virtual bool visit(QDeclarativeJS::AST::IdentifierPropertyName *ast);
- virtual bool visit(QDeclarativeJS::AST::StringLiteralPropertyName *ast);
- virtual bool visit(QDeclarativeJS::AST::NumericLiteralPropertyName *ast);
-
- // array literals
- virtual bool visit(QDeclarativeJS::AST::ElementList *ast);
- virtual bool visit(QDeclarativeJS::AST::Elision *ast);
-
- // function calls
- virtual bool visit(QDeclarativeJS::AST::ArgumentList *ast);
-
- // expressions
- virtual bool visit(QDeclarativeJS::AST::ObjectLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::ArrayLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::ThisExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::IdentifierExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::NullExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::TrueLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::FalseLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::StringLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::NumericLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::RegExpLiteral *ast);
- virtual bool visit(QDeclarativeJS::AST::NestedExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::ArrayMemberExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::FieldMemberExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::NewMemberExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::NewExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::CallExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::PostIncrementExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::PostDecrementExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::DeleteExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::VoidExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::TypeOfExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::PreIncrementExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::PreDecrementExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::UnaryPlusExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::UnaryMinusExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::TildeExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::NotExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::BinaryExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::ConditionalExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::Expression *ast);
-
- // statements
- virtual bool visit(QDeclarativeJS::AST::Block *ast);
- virtual bool visit(QDeclarativeJS::AST::StatementList *ast);
- virtual bool visit(QDeclarativeJS::AST::VariableStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::VariableDeclarationList *ast);
- virtual bool visit(QDeclarativeJS::AST::VariableDeclaration *ast);
- virtual bool visit(QDeclarativeJS::AST::EmptyStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ExpressionStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::IfStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::DoWhileStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::WhileStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ForStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::LocalForStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ForEachStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::LocalForEachStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ContinueStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::BreakStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ReturnStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::WithStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::SwitchStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::CaseBlock *ast);
- virtual bool visit(QDeclarativeJS::AST::CaseClauses *ast);
- virtual bool visit(QDeclarativeJS::AST::CaseClause *ast);
- virtual bool visit(QDeclarativeJS::AST::DefaultClause *ast);
- virtual bool visit(QDeclarativeJS::AST::LabelledStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::ThrowStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::TryStatement *ast);
- virtual bool visit(QDeclarativeJS::AST::Catch *ast);
- virtual bool visit(QDeclarativeJS::AST::Finally *ast);
- virtual bool visit(QDeclarativeJS::AST::FunctionDeclaration *ast);
- virtual bool visit(QDeclarativeJS::AST::FunctionExpression *ast);
- virtual bool visit(QDeclarativeJS::AST::FormalParameterList *ast);
- virtual bool visit(QDeclarativeJS::AST::FunctionBody *ast);
- virtual bool visit(QDeclarativeJS::AST::DebuggerStatement *ast);
-
-private:
- bool buildName(QList<QStringRef> &name, QDeclarativeJS::AST::Node *node,
- QList<QDeclarativeJS::AST::ExpressionNode *> *nodes);
- void discard();
-
- const QV4Compiler::Expression *m_expression;
- QDeclarativeEnginePrivate *m_engine;
-
- QDeclarativeJS::IR::Function *_function;
- QDeclarativeJS::IR::BasicBlock *_block;
- bool _discard;
-
- ExprResult _expr;
-};
-
-QT_END_NAMESPACE
-
-QT_END_HEADER
-
-#endif // QV4IRBUILDER_P_H
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
deleted file mode 100644
index 01d4247ff8..0000000000
--- a/src/declarative/util/util.pri
+++ /dev/null
@@ -1,5 +0,0 @@
-SOURCES += \
- $$PWD/qdeclarativepropertymap.cpp
-
-HEADERS += \
- $$PWD/qdeclarativepropertymap.h
diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 26efc654b8..b4cfcea495 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -2,12 +2,12 @@ TARGET = qmlfolderlistmodelplugin
TARGETPATH = Qt/labs/folderlistmodel
include(../qimportbase.pri)
-QT += widgets declarative
+QT += widgets qml
-SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
-HEADERS += qdeclarativefolderlistmodel.h
+SOURCES += qquickfolderlistmodel.cpp plugin.cpp
+HEADERS += qquickfolderlistmodel.h
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
diff --git a/src/imports/folderlistmodel/plugin.cpp b/src/imports/folderlistmodel/plugin.cpp
index 48d7b5b7cb..78fc230fdc 100644
--- a/src/imports/folderlistmodel/plugin.cpp
+++ b/src/imports/folderlistmodel/plugin.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
-#include "qdeclarativefolderlistmodel.h"
+#include "qquickfolderlistmodel.h"
QT_BEGIN_NAMESPACE
//![class decl]
-class QmlFolderListModelPlugin : public QDeclarativeExtensionPlugin
+class QmlFolderListModelPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
public:
@@ -55,7 +55,7 @@ public:
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("Qt.labs.folderlistmodel"));
#ifndef QT_NO_DIRMODEL
- qmlRegisterType<QDeclarativeFolderListModel>(uri,1,0,"FolderListModel");
+ qmlRegisterType<QQuickFolderListModel>(uri,1,0,"FolderListModel");
#endif
}
};
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
index 870479afad..5621622cca 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.cpp
@@ -40,39 +40,39 @@
****************************************************************************/
//![code]
-#include "qdeclarativefolderlistmodel.h"
+#include "qquickfolderlistmodel.h"
#include <QDirModel>
#include <QDebug>
-#include <qdeclarativecontext.h>
+#include <qqmlcontext.h>
#ifndef QT_NO_DIRMODEL
QT_BEGIN_NAMESPACE
-class QDeclarativeFolderListModelPrivate
+class QQuickFolderListModelPrivate
{
public:
- QDeclarativeFolderListModelPrivate()
- : sortField(QDeclarativeFolderListModel::Name), sortReversed(false), count(0), showDirs(true), showDots(false), showOnlyReadable(false), insideRefresh(false) {
+ QQuickFolderListModelPrivate()
+ : sortField(QQuickFolderListModel::Name), sortReversed(false), count(0), showDirs(true), showDots(false), showOnlyReadable(false), insideRefresh(false) {
nameFilters << QLatin1String("*");
}
void updateSorting() {
QDir::SortFlags flags = 0;
switch(sortField) {
- case QDeclarativeFolderListModel::Unsorted:
+ case QQuickFolderListModel::Unsorted:
flags |= QDir::Unsorted;
break;
- case QDeclarativeFolderListModel::Name:
+ case QQuickFolderListModel::Name:
flags |= QDir::Name;
break;
- case QDeclarativeFolderListModel::Time:
+ case QQuickFolderListModel::Time:
flags |= QDir::Time;
break;
- case QDeclarativeFolderListModel::Size:
+ case QQuickFolderListModel::Size:
flags |= QDir::Size;
break;
- case QDeclarativeFolderListModel::Type:
+ case QQuickFolderListModel::Type:
flags |= QDir::Type;
break;
}
@@ -87,7 +87,7 @@ public:
QUrl folder;
QStringList nameFilters;
QModelIndex folderIndex;
- QDeclarativeFolderListModel::SortField sortField;
+ QQuickFolderListModel::SortField sortField;
bool sortReversed;
int count;
bool showDirs;
@@ -97,7 +97,7 @@ public:
};
/*!
- \qmlclass FolderListModel QDeclarativeFolderListModel
+ \qmlclass FolderListModel QQuickFolderListModel
\ingroup qml-working-with-data
\brief The FolderListModel provides a model of the contents of a file system folder.
@@ -144,7 +144,7 @@ public:
The following example shows a FolderListModel being used to provide a list
of QML files in a \l ListView:
- \snippet doc/src/snippets/declarative/folderlistmodel.qml 0
+ \snippet doc/src/snippets/qml/folderlistmodel.qml 0
\section1 Path Separators
@@ -156,7 +156,7 @@ public:
\sa {QML Data Models}
*/
-QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
+QQuickFolderListModel::QQuickFolderListModel(QObject *parent)
: QAbstractListModel(parent)
{
QHash<int, QByteArray> roles;
@@ -164,7 +164,7 @@ QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
roles[FilePathRole] = "filePath";
setRoleNames(roles);
- d = new QDeclarativeFolderListModelPrivate;
+ d = new QQuickFolderListModelPrivate;
d->model.setFilter(QDir::AllDirs | QDir::Files | QDir::Drives | QDir::NoDotAndDotDot);
connect(&d->model, SIGNAL(rowsInserted(const QModelIndex&,int,int))
, this, SLOT(inserted(const QModelIndex&,int,int)));
@@ -176,12 +176,12 @@ QDeclarativeFolderListModel::QDeclarativeFolderListModel(QObject *parent)
connect(&d->model, SIGNAL(layoutChanged()), this, SLOT(refresh()));
}
-QDeclarativeFolderListModel::~QDeclarativeFolderListModel()
+QQuickFolderListModel::~QQuickFolderListModel()
{
delete d;
}
-QVariant QDeclarativeFolderListModel::data(const QModelIndex &index, int role) const
+QVariant QQuickFolderListModel::data(const QModelIndex &index, int role) const
{
QVariant rv;
QModelIndex modelIndex = d->model.index(index.row(), 0, d->folderIndex);
@@ -200,7 +200,7 @@ QVariant QDeclarativeFolderListModel::data(const QModelIndex &index, int role) c
Returns the number of items in the current folder that match the
filter criteria.
*/
-int QDeclarativeFolderListModel::rowCount(const QModelIndex &parent) const
+int QQuickFolderListModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return d->count;
@@ -217,12 +217,12 @@ int QDeclarativeFolderListModel::rowCount(const QModelIndex &parent) const
By default, the value is an invalid URL.
*/
-QUrl QDeclarativeFolderListModel::folder() const
+QUrl QQuickFolderListModel::folder() const
{
return d->folder;
}
-void QDeclarativeFolderListModel::setFolder(const QUrl &folder)
+void QQuickFolderListModel::setFolder(const QUrl &folder)
{
if (folder == d->folder)
return;
@@ -235,7 +235,7 @@ void QDeclarativeFolderListModel::setFolder(const QUrl &folder)
}
}
-void QDeclarativeFolderListModel::resetFiltering()
+void QQuickFolderListModel::resetFiltering()
{
// ensure that we reset the filtering rules, because the QDirModel::index()
// function isn't quite as const as it claims to be.
@@ -264,7 +264,7 @@ void QDeclarativeFolderListModel::resetFiltering()
Returns the URL of the parent of of the current \l folder.
*/
-QUrl QDeclarativeFolderListModel::parentFolder() const
+QUrl QQuickFolderListModel::parentFolder() const
{
QString localFile = d->folder.toLocalFile();
if (!localFile.isEmpty()) {
@@ -301,22 +301,22 @@ QUrl QDeclarativeFolderListModel::parentFolder() const
\note Directories are not excluded by filters.
*/
-QStringList QDeclarativeFolderListModel::nameFilters() const
+QStringList QQuickFolderListModel::nameFilters() const
{
return d->nameFilters;
}
-void QDeclarativeFolderListModel::setNameFilters(const QStringList &filters)
+void QQuickFolderListModel::setNameFilters(const QStringList &filters)
{
d->nameFilters = filters;
d->model.setNameFilters(d->nameFilters);
}
-void QDeclarativeFolderListModel::classBegin()
+void QQuickFolderListModel::classBegin()
{
}
-void QDeclarativeFolderListModel::componentComplete()
+void QQuickFolderListModel::componentComplete()
{
if (!d->folder.isValid() || d->folder.toLocalFile().isEmpty() || !QDir().exists(d->folder.toLocalFile()))
setFolder(QUrl(QLatin1String("file://")+QDir::currentPath()));
@@ -340,12 +340,12 @@ void QDeclarativeFolderListModel::componentComplete()
\sa sortReversed
*/
-QDeclarativeFolderListModel::SortField QDeclarativeFolderListModel::sortField() const
+QQuickFolderListModel::SortField QQuickFolderListModel::sortField() const
{
return d->sortField;
}
-void QDeclarativeFolderListModel::setSortField(SortField field)
+void QQuickFolderListModel::setSortField(SortField field)
{
if (field != d->sortField) {
d->sortField = field;
@@ -360,12 +360,12 @@ void QDeclarativeFolderListModel::setSortField(SortField field)
\sa sortField
*/
-bool QDeclarativeFolderListModel::sortReversed() const
+bool QQuickFolderListModel::sortReversed() const
{
return d->sortReversed;
}
-void QDeclarativeFolderListModel::setSortReversed(bool rev)
+void QQuickFolderListModel::setSortReversed(bool rev)
{
if (rev != d->sortReversed) {
d->sortReversed = rev;
@@ -379,7 +379,7 @@ void QDeclarativeFolderListModel::setSortReversed(bool rev)
Returns true if the entry \a index is a folder; otherwise
returns false.
*/
-bool QDeclarativeFolderListModel::isFolder(int index) const
+bool QQuickFolderListModel::isFolder(int index) const
{
if (index != -1) {
QModelIndex idx = d->model.index(index, 0, d->folderIndex);
@@ -389,7 +389,7 @@ bool QDeclarativeFolderListModel::isFolder(int index) const
return false;
}
-void QDeclarativeFolderListModel::refresh()
+void QQuickFolderListModel::refresh()
{
if (d->insideRefresh)
return;
@@ -413,7 +413,7 @@ void QDeclarativeFolderListModel::refresh()
d->insideRefresh = false; // finished refreshing.
}
-void QDeclarativeFolderListModel::inserted(const QModelIndex &index, int start, int end)
+void QQuickFolderListModel::inserted(const QModelIndex &index, int start, int end)
{
if (index == d->folderIndex) {
emit beginInsertRows(QModelIndex(), start, end);
@@ -422,7 +422,7 @@ void QDeclarativeFolderListModel::inserted(const QModelIndex &index, int start,
}
}
-void QDeclarativeFolderListModel::removed(const QModelIndex &index, int start, int end)
+void QQuickFolderListModel::removed(const QModelIndex &index, int start, int end)
{
if (index == d->folderIndex) {
emit beginRemoveRows(QModelIndex(), start, end);
@@ -431,7 +431,7 @@ void QDeclarativeFolderListModel::removed(const QModelIndex &index, int start, i
}
}
-void QDeclarativeFolderListModel::handleDataChanged(const QModelIndex &start, const QModelIndex &end)
+void QQuickFolderListModel::handleDataChanged(const QModelIndex &start, const QModelIndex &end)
{
if (start.parent() == d->folderIndex)
emit dataChanged(index(start.row(),0), index(end.row(),0));
@@ -449,12 +449,12 @@ void QDeclarativeFolderListModel::handleDataChanged(const QModelIndex &start, co
\sa showDotAndDotDot
*/
-bool QDeclarativeFolderListModel::showDirs() const
+bool QQuickFolderListModel::showDirs() const
{
return d->model.filter() & QDir::AllDirs;
}
-void QDeclarativeFolderListModel::setShowDirs(bool on)
+void QQuickFolderListModel::setShowDirs(bool on)
{
if (!(d->model.filter() & QDir::AllDirs) == !on)
return;
@@ -477,12 +477,12 @@ void QDeclarativeFolderListModel::setShowDirs(bool on)
\sa showDirs
*/
-bool QDeclarativeFolderListModel::showDotAndDotDot() const
+bool QQuickFolderListModel::showDotAndDotDot() const
{
return !(d->model.filter() & QDir::NoDotAndDotDot);
}
-void QDeclarativeFolderListModel::setShowDotAndDotDot(bool on)
+void QQuickFolderListModel::setShowDotAndDotDot(bool on)
{
if (!(d->model.filter() & QDir::NoDotAndDotDot) == on)
return;
@@ -505,12 +505,12 @@ void QDeclarativeFolderListModel::setShowDotAndDotDot(bool on)
\sa showDirs
*/
-bool QDeclarativeFolderListModel::showOnlyReadable() const
+bool QQuickFolderListModel::showOnlyReadable() const
{
return d->model.filter() & QDir::Readable;
}
-void QDeclarativeFolderListModel::setShowOnlyReadable(bool on)
+void QQuickFolderListModel::setShowOnlyReadable(bool on)
{
if (!(d->model.filter() & QDir::Readable) == !on)
return;
diff --git a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h b/src/imports/folderlistmodel/qquickfolderlistmodel.h
index 5f9cb0e81a..10af7c8075 100644
--- a/src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
+++ b/src/imports/folderlistmodel/qquickfolderlistmodel.h
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEFOLDERLISTMODEL_H
-#define QDECLARATIVEFOLDERLISTMODEL_H
+#ifndef QQUICKFOLDERLISTMODEL_H
+#define QQUICKFOLDERLISTMODEL_H
-#include <qdeclarative.h>
+#include <qqml.h>
#include <QStringList>
#include <QUrl>
#include <QAbstractListModel>
@@ -54,16 +54,16 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeContext;
+class QQmlContext;
class QModelIndex;
-class QDeclarativeFolderListModelPrivate;
+class QQuickFolderListModelPrivate;
//![class begin]
-class QDeclarativeFolderListModel : public QAbstractListModel, public QDeclarativeParserStatus
+class QQuickFolderListModel : public QAbstractListModel, public QQmlParserStatus
{
Q_OBJECT
- Q_INTERFACES(QDeclarativeParserStatus)
+ Q_INTERFACES(QQmlParserStatus)
//![class begin]
//![class props]
@@ -80,8 +80,8 @@ class QDeclarativeFolderListModel : public QAbstractListModel, public QDeclarati
//![abslistmodel]
public:
- QDeclarativeFolderListModel(QObject *parent = 0);
- ~QDeclarativeFolderListModel();
+ QQuickFolderListModel(QObject *parent = 0);
+ ~QQuickFolderListModel();
enum Roles { FileNameRole = Qt::UserRole+1, FilePathRole = Qt::UserRole+2 };
@@ -141,19 +141,19 @@ private Q_SLOTS:
void handleDataChanged(const QModelIndex &start, const QModelIndex &end);
private:
- Q_DISABLE_COPY(QDeclarativeFolderListModel)
- QDeclarativeFolderListModelPrivate *d;
+ Q_DISABLE_COPY(QQuickFolderListModel)
+ QQuickFolderListModelPrivate *d;
};
//![class end]
QT_END_NAMESPACE
//![qml decl]
-QML_DECLARE_TYPE(QDeclarativeFolderListModel)
+QML_DECLARE_TYPE(QQuickFolderListModel)
//![qml decl]
QT_END_HEADER
#endif // QT_NO_DIRMODEL
-#endif // QDECLARATIVEFOLDERLISTMODEL_H
+#endif // QQUICKFOLDERLISTMODEL_H
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index 51a69aac4f..c54bc564d9 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -2,11 +2,11 @@ TARGET = qmllocalstorageplugin
TARGETPATH = QtQuick/LocalStorage
include(../qimportbase.pri)
-QT += sql declarative declarative-private v8-private core-private
+QT += sql qml qml-private v8-private core-private
SOURCES += plugin.cpp
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
diff --git a/src/imports/localstorage/plugin.cpp b/src/imports/localstorage/plugin.cpp
index dd747d0d09..77e68877d4 100644
--- a/src/imports/localstorage/plugin.cpp
+++ b/src/imports/localstorage/plugin.cpp
@@ -39,9 +39,9 @@
**
****************************************************************************/
#include <QStringList>
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <private/qdeclarativeengine_p.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+#include <private/qqmlengine_p.h>
#include <QDebug>
#include <private/qv8engine_p.h>
#include <QtSql/qsqldatabase.h>
@@ -83,18 +83,18 @@
return; \
}
-class QDeclarativeSqlDatabaseData : public QV8Engine::Deletable
+class QQmlSqlDatabaseData : public QV8Engine::Deletable
{
public:
- QDeclarativeSqlDatabaseData(QV8Engine *engine);
- ~QDeclarativeSqlDatabaseData();
+ QQmlSqlDatabaseData(QV8Engine *engine);
+ ~QQmlSqlDatabaseData();
v8::Persistent<v8::Function> constructor;
v8::Persistent<v8::Function> queryConstructor;
v8::Persistent<v8::Function> rowsConstructor;
};
-V8_DEFINE_EXTENSION(QDeclarativeSqlDatabaseData, databaseData)
+V8_DEFINE_EXTENSION(QQmlSqlDatabaseData, databaseData)
class QV8SqlDatabaseResource : public QV8ObjectResource
{
@@ -167,7 +167,7 @@ static void qmlsqldatabase_rows_setForwardOnly(v8::Local<v8::String> /* property
r->query.setForwardOnly(value->BooleanValue());
}
-QDeclarativeSqlDatabaseData::~QDeclarativeSqlDatabaseData()
+QQmlSqlDatabaseData::~QQmlSqlDatabaseData()
{
qPersistentDispose(constructor);
qPersistentDispose(queryConstructor);
@@ -239,14 +239,14 @@ static v8::Handle<v8::Value> qmlsqldatabase_executeSql(const v8::Arguments& args
QV8Engine *engine = r->engine;
if (!r->inTransaction)
- V8THROW_SQL(SQLEXCEPTION_DATABASE_ERR,QDeclarativeEngine::tr("executeSql called outside transaction()"));
+ V8THROW_SQL(SQLEXCEPTION_DATABASE_ERR,QQmlEngine::tr("executeSql called outside transaction()"));
QSqlDatabase db = r->database;
QString sql = engine->toString(args[0]);
if (r->readonly && !sql.startsWith(QLatin1String("SELECT"),Qt::CaseInsensitive)) {
- V8THROW_SQL(SQLEXCEPTION_SYNTAX_ERR, QDeclarativeEngine::tr("Read-only Transaction"));
+ V8THROW_SQL(SQLEXCEPTION_SYNTAX_ERR, QQmlEngine::tr("Read-only Transaction"));
}
QSqlQuery query(db);
@@ -316,7 +316,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_changeVersion(const v8::Arguments& a
v8::Handle<v8::Value> callback = args[2];
if (from_version != r->version)
- V8THROW_SQL(SQLEXCEPTION_VERSION_ERR, QDeclarativeEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(r->version));
+ V8THROW_SQL(SQLEXCEPTION_VERSION_ERR, QQmlEngine::tr("Version mismatch: expected %1, found %2").arg(from_version).arg(r->version));
v8::Local<v8::Object> instance = databaseData(engine)->queryConstructor->NewInstance();
QV8SqlDatabaseResource *r2 = new QV8SqlDatabaseResource(engine);
@@ -341,7 +341,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_changeVersion(const v8::Arguments& a
return v8::Handle<v8::Value>();
} else if (!db.commit()) {
db.rollback();
- V8THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR,QDeclarativeEngine::tr("SQL transaction failed"));
+ V8THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR,QQmlEngine::tr("SQL transaction failed"));
} else {
ok = true;
}
@@ -369,7 +369,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_transaction_shared(const v8::Argumen
QV8Engine *engine = r->engine;
if (args.Length() == 0 || !args[0]->IsFunction())
- V8THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR,QDeclarativeEngine::tr("transaction: missing callback"));
+ V8THROW_SQL(SQLEXCEPTION_UNKNOWN_ERR,QQmlEngine::tr("transaction: missing callback"));
QSqlDatabase db = r->database;
v8::Handle<v8::Function> callback = v8::Handle<v8::Function>::Cast(args[0]);
@@ -410,7 +410,7 @@ static v8::Handle<v8::Value> qmlsqldatabase_read_transaction(const v8::Arguments
return qmlsqldatabase_transaction_shared(args, true);
}
-QDeclarativeSqlDatabaseData::QDeclarativeSqlDatabaseData(QV8Engine *engine)
+QQmlSqlDatabaseData::QQmlSqlDatabaseData(QV8Engine *engine)
{
{
v8::Local<v8::FunctionTemplate> ft = v8::FunctionTemplate::New();
@@ -460,7 +460,7 @@ through the data.
These databases are user-specific and QML-specific, but accessible to all QML applications.
They are stored in the \c Databases subdirectory
-of QDeclarativeEngine::offlineStoragePath(), currently as SQLite databases.
+of QQmlEngine::offlineStoragePath(), currently as SQLite databases.
Database connections are automatically closed during Javascript garbage collection.
@@ -549,7 +549,7 @@ public:
~QQuickLocalStorage() {
}
- Q_INVOKABLE void openDatabaseSync(QDeclarativeV8Function* args);
+ Q_INVOKABLE void openDatabaseSync(QQmlV8Function* args);
};
/*!
@@ -563,7 +563,7 @@ public:
* \c callback is an optional parameter, which is invoked if the database has not yet been created.
* \return the database object
*/
-void QQuickLocalStorage::openDatabaseSync(QDeclarativeV8Function *args)
+void QQuickLocalStorage::openDatabaseSync(QQmlV8Function *args)
{
#ifndef QT_NO_SETTINGS
QV8Engine *engine = args->engine();
@@ -592,7 +592,7 @@ void QQuickLocalStorage::openDatabaseSync(QDeclarativeV8Function *args)
database = QSqlDatabase::database(dbid);
version = ini.value(QLatin1String("Version")).toString();
if (version != dbversion && !dbversion.isEmpty() && !version.isEmpty())
- V8THROW_SQL_VOID(SQLEXCEPTION_VERSION_ERR, QDeclarativeEngine::tr("SQL: database version mismatch"));
+ V8THROW_SQL_VOID(SQLEXCEPTION_VERSION_ERR, QQmlEngine::tr("SQL: database version mismatch"));
} else {
created = !QFile::exists(basename+QLatin1String(".sqlite"));
database = QSqlDatabase::addDatabase(QLatin1String("QSQLITE"), dbid);
@@ -607,7 +607,7 @@ void QQuickLocalStorage::openDatabaseSync(QDeclarativeV8Function *args)
} else {
if (!dbversion.isEmpty() && ini.value(QLatin1String("Version")) != dbversion) {
// Incompatible
- V8THROW_SQL_VOID(SQLEXCEPTION_VERSION_ERR,QDeclarativeEngine::tr("SQL: database version mismatch"));
+ V8THROW_SQL_VOID(SQLEXCEPTION_VERSION_ERR,QQmlEngine::tr("SQL: database version mismatch"));
}
version = ini.value(QLatin1String("Version")).toString();
}
@@ -639,7 +639,7 @@ void QQuickLocalStorage::openDatabaseSync(QDeclarativeV8Function *args)
#endif // QT_NO_SETTINGS
}
-static QObject *module_api_factory(QDeclarativeEngine *engine, QJSEngine *scriptEngine)
+static QObject *module_api_factory(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine)
Q_UNUSED(scriptEngine)
@@ -648,11 +648,11 @@ static QObject *module_api_factory(QDeclarativeEngine *engine, QJSEngine *script
return api;
}
-class QDeclarativeLocalStoragePlugin : public QDeclarativeExtensionPlugin
+class QQmlLocalStoragePlugin : public QQmlExtensionPlugin
{
Q_OBJECT
public:
- QDeclarativeLocalStoragePlugin()
+ QQmlLocalStoragePlugin()
{
}
@@ -665,4 +665,4 @@ public:
#include "plugin.moc"
-Q_EXPORT_PLUGIN2(plugin, QDeclarativeLocalStoragePlugin);
+Q_EXPORT_PLUGIN2(plugin, QQmlLocalStoragePlugin);
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri
index 110d145e94..ab54e4b1b9 100644
--- a/src/imports/qimportbase.pri
+++ b/src/imports/qimportbase.pri
@@ -14,7 +14,7 @@ isEmpty(TARGET) {
QMLDIRFILE = $${_PRO_FILE_PWD_}/qmldir
copy2build.input = QMLDIRFILE
-copy2build.output = $$QT.declarative.imports/$$TARGETPATH/qmldir
+copy2build.output = $$QT.qml.imports/$$TARGETPATH/qmldir
!contains(TEMPLATE_PREFIX, vc):copy2build.variable_out = PRE_TARGETDEPS
copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
copy2build.name = COPY ${QMAKE_FILE_IN}
diff --git a/src/imports/qtquick2/plugin.cpp b/src/imports/qtquick2/plugin.cpp
index 808d5196b2..2cb70a4fd3 100644
--- a/src/imports/qtquick2/plugin.cpp
+++ b/src/imports/qtquick2/plugin.cpp
@@ -39,23 +39,23 @@
**
****************************************************************************/
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
+#include <QtQml/qqmlextensionplugin.h>
#include <private/qtquick2_p.h>
QT_BEGIN_NAMESPACE
//![class decl]
-class QtQuick2Plugin : public QDeclarativeExtensionPlugin
+class QtQuick2Plugin : public QQmlExtensionPlugin
{
Q_OBJECT
- Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QDeclarativeExtensionInterface/1.0")
+ Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
public:
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick"));
Q_UNUSED(uri);
- QDeclarativeQtQuick2Module::defineModule();
+ QQmlQtQuick2Module::defineModule();
}
};
//![class decl]
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 3f76abd87f..3a95c5fd21 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -5,12 +5,12 @@ include(../qimportbase.pri)
SOURCES += \
plugin.cpp
-QT += quick-private declarative-private
+QT += quick-private qml-private
OTHER_FILES += \
qmldir
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
diff --git a/src/imports/testlib/main.cpp b/src/imports/testlib/main.cpp
index 672de10639..8ab745a7d2 100644
--- a/src/imports/testlib/main.cpp
+++ b/src/imports/testlib/main.cpp
@@ -39,15 +39,15 @@
**
****************************************************************************/
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
-#include <QtDeclarative/qjsvalue.h>
-#include <QtDeclarative/qjsengine.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
+#include <QtQml/qjsvalue.h>
+#include <QtQml/qjsengine.h>
#include "QtQuickTest/private/quicktestresult_p.h"
#include "QtQuickTest/private/quicktestevent_p.h"
#include "private/qtestoptions_p.h"
#include "QtQuick/qquickitem.h"
-#include <QtDeclarative/private/qdeclarativeengine_p.h>
+#include <QtQml/private/qqmlengine_p.h>
QML_DECLARE_TYPE(QuickTestResult)
QML_DECLARE_TYPE(QuickTestEvent)
@@ -81,15 +81,15 @@ Q_SIGNALS:
void wrapperChanged();
public Q_SLOTS:
- QDeclarativeV8Handle typeName(const QVariant& v) const
+ QQmlV8Handle typeName(const QVariant& v) const
{
QString name(v.typeName());
//qDebug() << "type:" << name << " string value:" << v.toString() << " value:" << v;
if (v.canConvert<QObject*>()) {
- QDeclarativeType *type = 0;
+ QQmlType *type = 0;
const QMetaObject *mo = v.value<QObject*>()->metaObject();
while (!type && mo) {
- type = QDeclarativeMetaType::qmlType(mo);
+ type = QQmlMetaType::qmlType(mo);
mo = mo->superClass();
}
if (type) {
@@ -97,22 +97,22 @@ public Q_SLOTS:
}
}
- return QDeclarativeV8Handle::fromHandle(v8::String::New(name.toUtf8()));
+ return QQmlV8Handle::fromHandle(v8::String::New(name.toUtf8()));
}
bool compare(const QVariant& act, const QVariant& exp) const {
return act == exp;
}
- QDeclarativeV8Handle callerFile(int frameIndex = 0) const
+ QQmlV8Handle callerFile(int frameIndex = 0) const
{
v8::Local<v8::StackTrace> stacks = v8::StackTrace::CurrentStackTrace(10, v8::StackTrace::kDetailed);
int count = stacks->GetFrameCount();
if (count >= frameIndex + 1) {
v8::Local<v8::StackFrame> frame = stacks->GetFrame(frameIndex + 1);
- return QDeclarativeV8Handle::fromHandle(frame->GetScriptNameOrSourceURL());
+ return QQmlV8Handle::fromHandle(frame->GetScriptNameOrSourceURL());
}
- return QDeclarativeV8Handle();
+ return QQmlV8Handle();
}
int callerLine(int frameIndex = 0) const
{
@@ -132,7 +132,7 @@ QML_DECLARE_TYPE(QuickTestUtil)
QT_BEGIN_NAMESPACE
-class QTestQmlModule : public QDeclarativeExtensionPlugin
+class QTestQmlModule : public QQmlExtensionPlugin
{
Q_OBJECT
public:
@@ -144,7 +144,7 @@ public:
qmlRegisterType<QuickTestUtil>(uri,1,0,"TestUtil");
}
- void initializeEngine(QDeclarativeEngine *, const char *)
+ void initializeEngine(QQmlEngine *, const char *)
{
}
};
diff --git a/src/imports/testlib/signalspy.h b/src/imports/testlib/signalspy.h
index 6b5166d8e0..6542203ce4 100644
--- a/src/imports/testlib/signalspy.h
+++ b/src/imports/testlib/signalspy.h
@@ -44,20 +44,20 @@
// This is a dummy header for defining the interface of "SignalSpy.qml" to qdoc.
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick/qquickitem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class SignalSpy : public QDeclarativeItem
+class SignalSpy : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
Q_PROPERTY(QString signalName READ signalName WRITE signalName NOTIFY signalNameChanged)
Q_PROPERTY(int count READ count countChanged)
public:
- SignalSpy(QDeclarativeItem *parent) : QDeclarativeItem(parent) {}
+ SignalSpy(QQuickItem *parent) : QQuickItem(parent) {}
~SignalSpy()
QObject *target() const;
diff --git a/src/imports/testlib/testcase.h b/src/imports/testlib/testcase.h
index 1793cca0f2..e7758ec9df 100644
--- a/src/imports/testlib/testcase.h
+++ b/src/imports/testlib/testcase.h
@@ -44,13 +44,13 @@
// This is a dummy header for defining the interface of "TestCase.qml" to qdoc.
-#include <QtDeclarative/qdeclarativeitem.h>
+#include <QtQuick/qquickitem.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class TestCase : public QDeclarativeItem
+class TestCase : public QQuickItem
{
Q_OBJECT
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
@@ -60,7 +60,7 @@ class TestCase : public QDeclarativeItem
Q_PROPERTY(bool running READ running NOTIFY runningChanged)
Q_PROPERTY(bool windowShown READ windowShown NOTIFY windowShownChanged)
public:
- TestCase(QDeclarativeItem *parent) : QDeclarativeItem(parent) {}
+ TestCase(QQuickItem *parent) : QQuickItem(parent) {}
~TestCase()
QString name() const;
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 3b8a5bf75e..a4cb03466e 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -4,12 +4,12 @@ include(../qimportbase.pri)
CONFIG += qt plugin
-QT += declarative quick qmltest qmltest-private v8-private declarative-private core-private testlib
+QT += qml quick qmltest qmltest-private v8-private qml-private core-private testlib
SOURCES += main.cpp
HEADERS +=
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
target.path += $$[QT_INSTALL_IMPORTS]/QtTest
OTHER_IMPORT_FILES = \
@@ -23,7 +23,7 @@ otherImportFiles.files += $$OTHER_IMPORT_FILES
otherImportFiles.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
copy2build.input = OTHER_IMPORT_FILES
-copy2build.output = $$QT.declarative.imports/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
+copy2build.output = $$QT.qml.imports/$$TARGETPATH/${QMAKE_FILE_BASE}${QMAKE_FILE_EXT}
INSTALLS += target otherImportFiles
diff --git a/src/imports/xmllistmodel/plugin.cpp b/src/imports/xmllistmodel/plugin.cpp
index 9085a60885..54a6d5e212 100644
--- a/src/imports/xmllistmodel/plugin.cpp
+++ b/src/imports/xmllistmodel/plugin.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,22 +39,22 @@
**
****************************************************************************/
-#include <QtDeclarative/qdeclarativeextensionplugin.h>
-#include <QtDeclarative/qdeclarative.h>
+#include <QtQml/qqmlextensionplugin.h>
+#include <QtQml/qqml.h>
-#include "qdeclarativexmllistmodel_p.h"
+#include "qqmlxmllistmodel_p.h"
QT_BEGIN_NAMESPACE
-class QmlXmlListModelPlugin : public QDeclarativeExtensionPlugin
+class QmlXmlListModelPlugin : public QQmlExtensionPlugin
{
Q_OBJECT
public:
virtual void registerTypes(const char *uri)
{
Q_ASSERT(QLatin1String(uri) == QLatin1String("QtQuick.XmlListModel"));
- qmlRegisterType<QDeclarativeXmlListModel>(uri,2,0,"XmlListModel");
- qmlRegisterType<QDeclarativeXmlListModelRole>(uri,2,0,"XmlRole");
+ qmlRegisterType<QQuickXmlListModel>(uri,2,0,"XmlListModel");
+ qmlRegisterType<QQuickXmlListModelRole>(uri,2,0,"XmlRole");
}
};
diff --git a/src/imports/xmllistmodel/qdeclarativexmllistmodel.cpp b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
index db7fec2c97..1377859b5e 100644
--- a/src/imports/xmllistmodel/qdeclarativexmllistmodel.cpp
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,10 +39,10 @@
**
****************************************************************************/
-#include "qdeclarativexmllistmodel_p.h"
+#include "qqmlxmllistmodel_p.h"
-#include <qdeclarativecontext.h>
-#include <private/qdeclarativeengine_p.h>
+#include <qqmlcontext.h>
+#include <private/qqmlengine_p.h>
#include <QDebug>
#include <QStringList>
@@ -59,22 +59,22 @@
#include <private/qobject_p.h>
-Q_DECLARE_METATYPE(QDeclarativeXmlQueryResult)
+Q_DECLARE_METATYPE(QQuickXmlQueryResult)
QT_BEGIN_NAMESPACE
-typedef QPair<int, int> QDeclarativeXmlListRange;
+typedef QPair<int, int> QQuickXmlListRange;
#define XMLLISTMODEL_CLEAR_ID 0
/*!
- \qmlclass XmlRole QDeclarativeXmlListModelRole
+ \qmlclass XmlRole QQuickXmlListModelRole
\inqmlmodule QtQuick 2
\ingroup qml-working-with-data
\brief The XmlRole element allows you to specify a role for an XmlListModel.
- \sa {QtDeclarative}
+ \sa {QtQml}
*/
/*!
@@ -111,12 +111,12 @@ typedef QPair<int, int> QDeclarativeXmlListRange;
For example, if there is an XML document like this:
- \quotefile doc/src/snippets/declarative/xmlrole.xml
+ \quotefile doc/src/snippets/qml/xmlrole.xml
Here are some valid XPath expressions for XmlRole queries on this document:
- \snippet doc/src/snippets/declarative/xmlrole.qml 0
+ \snippet doc/src/snippets/qml/xmlrole.qml 0
\dots 4
- \snippet doc/src/snippets/declarative/xmlrole.qml 1
+ \snippet doc/src/snippets/qml/xmlrole.qml 1
See the \l{http://www.w3.org/TR/xpath20/}{W3C XPath 2.0 specification} for more information.
*/
@@ -145,37 +145,37 @@ struct XmlQueryJob
};
-class QDeclarativeXmlQueryEngine;
-class QDeclarativeXmlQueryThreadObject : public QObject
+class QQuickXmlQueryEngine;
+class QQuickXmlQueryThreadObject : public QObject
{
Q_OBJECT
public:
- QDeclarativeXmlQueryThreadObject(QDeclarativeXmlQueryEngine *);
+ QQuickXmlQueryThreadObject(QQuickXmlQueryEngine *);
void processJobs();
virtual bool event(QEvent *e);
private:
- QDeclarativeXmlQueryEngine *m_queryEngine;
+ QQuickXmlQueryEngine *m_queryEngine;
};
-class QDeclarativeXmlQueryEngine : public QThread
+class QQuickXmlQueryEngine : public QThread
{
Q_OBJECT
public:
- QDeclarativeXmlQueryEngine(QDeclarativeEngine *eng);
- ~QDeclarativeXmlQueryEngine();
+ QQuickXmlQueryEngine(QQmlEngine *eng);
+ ~QQuickXmlQueryEngine();
- int doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *>* roleObjects, QStringList keyRoleResultsCache);
+ int doQuery(QString query, QString namespaces, QByteArray data, QList<QQuickXmlListModelRole *>* roleObjects, QStringList keyRoleResultsCache);
void abort(int id);
void processJobs();
- static QDeclarativeXmlQueryEngine *instance(QDeclarativeEngine *engine);
+ static QQuickXmlQueryEngine *instance(QQmlEngine *engine);
signals:
- void queryCompleted(const QDeclarativeXmlQueryResult &);
+ void queryCompleted(const QQuickXmlQueryResult &);
void error(void*, const QString&);
protected:
@@ -183,38 +183,38 @@ protected:
private:
void processQuery(XmlQueryJob *job);
- void doQueryJob(XmlQueryJob *job, QDeclarativeXmlQueryResult *currentResult);
- void doSubQueryJob(XmlQueryJob *job, QDeclarativeXmlQueryResult *currentResult);
+ void doQueryJob(XmlQueryJob *job, QQuickXmlQueryResult *currentResult);
+ void doSubQueryJob(XmlQueryJob *job, QQuickXmlQueryResult *currentResult);
void getValuesOfKeyRoles(const XmlQueryJob& currentJob, QStringList *values, QXmlQuery *query) const;
- void addIndexToRangeList(QList<QDeclarativeXmlListRange> *ranges, int index) const;
+ void addIndexToRangeList(QList<QQuickXmlListRange> *ranges, int index) const;
QMutex m_mutex;
- QDeclarativeXmlQueryThreadObject *m_threadObject;
+ QQuickXmlQueryThreadObject *m_threadObject;
QList<XmlQueryJob> m_jobs;
QSet<int> m_cancelledJobs;
QAtomicInt m_queryIds;
- QDeclarativeEngine *m_engine;
+ QQmlEngine *m_engine;
QObject *m_eventLoopQuitHack;
- static QHash<QDeclarativeEngine *,QDeclarativeXmlQueryEngine*> queryEngines;
+ static QHash<QQmlEngine *,QQuickXmlQueryEngine*> queryEngines;
static QMutex queryEnginesMutex;
};
-QHash<QDeclarativeEngine *,QDeclarativeXmlQueryEngine*> QDeclarativeXmlQueryEngine::queryEngines;
-QMutex QDeclarativeXmlQueryEngine::queryEnginesMutex;
+QHash<QQmlEngine *,QQuickXmlQueryEngine*> QQuickXmlQueryEngine::queryEngines;
+QMutex QQuickXmlQueryEngine::queryEnginesMutex;
-QDeclarativeXmlQueryThreadObject::QDeclarativeXmlQueryThreadObject(QDeclarativeXmlQueryEngine *e)
+QQuickXmlQueryThreadObject::QQuickXmlQueryThreadObject(QQuickXmlQueryEngine *e)
: m_queryEngine(e)
{
}
-void QDeclarativeXmlQueryThreadObject::processJobs()
+void QQuickXmlQueryThreadObject::processJobs()
{
QCoreApplication::postEvent(this, new QEvent(QEvent::User));
}
-bool QDeclarativeXmlQueryThreadObject::event(QEvent *e)
+bool QQuickXmlQueryThreadObject::event(QEvent *e)
{
if (e->type() == QEvent::User) {
m_queryEngine->processJobs();
@@ -226,10 +226,10 @@ bool QDeclarativeXmlQueryThreadObject::event(QEvent *e)
-QDeclarativeXmlQueryEngine::QDeclarativeXmlQueryEngine(QDeclarativeEngine *eng)
+QQuickXmlQueryEngine::QQuickXmlQueryEngine(QQmlEngine *eng)
: QThread(eng), m_threadObject(0), m_queryIds(XMLLISTMODEL_CLEAR_ID + 1), m_engine(eng), m_eventLoopQuitHack(0)
{
- qRegisterMetaType<QDeclarativeXmlQueryResult>("QDeclarativeXmlQueryResult");
+ qRegisterMetaType<QQuickXmlQueryResult>("QQuickXmlQueryResult");
m_eventLoopQuitHack = new QObject;
m_eventLoopQuitHack->moveToThread(this);
@@ -237,7 +237,7 @@ QDeclarativeXmlQueryEngine::QDeclarativeXmlQueryEngine(QDeclarativeEngine *eng)
start(QThread::IdlePriority);
}
-QDeclarativeXmlQueryEngine::~QDeclarativeXmlQueryEngine()
+QQuickXmlQueryEngine::~QQuickXmlQueryEngine()
{
queryEnginesMutex.lock();
queryEngines.remove(m_engine);
@@ -247,7 +247,7 @@ QDeclarativeXmlQueryEngine::~QDeclarativeXmlQueryEngine()
wait();
}
-int QDeclarativeXmlQueryEngine::doQuery(QString query, QString namespaces, QByteArray data, QList<QDeclarativeXmlListModelRole *>* roleObjects, QStringList keyRoleResultsCache) {
+int QQuickXmlQueryEngine::doQuery(QString query, QString namespaces, QByteArray data, QList<QQuickXmlListModelRole *>* roleObjects, QStringList keyRoleResultsCache) {
{
QMutexLocker m1(&m_mutex);
m_queryIds.ref();
@@ -283,17 +283,17 @@ int QDeclarativeXmlQueryEngine::doQuery(QString query, QString namespaces, QByte
return job.queryId;
}
-void QDeclarativeXmlQueryEngine::abort(int id)
+void QQuickXmlQueryEngine::abort(int id)
{
QMutexLocker ml(&m_mutex);
if (id != -1)
m_cancelledJobs.insert(id);
}
-void QDeclarativeXmlQueryEngine::run()
+void QQuickXmlQueryEngine::run()
{
m_mutex.lock();
- m_threadObject = new QDeclarativeXmlQueryThreadObject(this);
+ m_threadObject = new QQuickXmlQueryThreadObject(this);
m_mutex.unlock();
processJobs();
@@ -303,7 +303,7 @@ void QDeclarativeXmlQueryEngine::run()
m_threadObject = 0;
}
-void QDeclarativeXmlQueryEngine::processJobs()
+void QQuickXmlQueryEngine::processJobs()
{
QMutexLocker locker(&m_mutex);
@@ -324,12 +324,12 @@ void QDeclarativeXmlQueryEngine::processJobs()
}
}
-QDeclarativeXmlQueryEngine *QDeclarativeXmlQueryEngine::instance(QDeclarativeEngine *engine)
+QQuickXmlQueryEngine *QQuickXmlQueryEngine::instance(QQmlEngine *engine)
{
queryEnginesMutex.lock();
- QDeclarativeXmlQueryEngine *queryEng = queryEngines.value(engine);
+ QQuickXmlQueryEngine *queryEng = queryEngines.value(engine);
if (!queryEng) {
- queryEng = new QDeclarativeXmlQueryEngine(engine);
+ queryEng = new QQuickXmlQueryEngine(engine);
queryEngines.insert(engine, queryEng);
}
queryEnginesMutex.unlock();
@@ -337,9 +337,9 @@ QDeclarativeXmlQueryEngine *QDeclarativeXmlQueryEngine::instance(QDeclarativeEng
return queryEng;
}
-void QDeclarativeXmlQueryEngine::processQuery(XmlQueryJob *job)
+void QQuickXmlQueryEngine::processQuery(XmlQueryJob *job)
{
- QDeclarativeXmlQueryResult result;
+ QQuickXmlQueryResult result;
result.queryId = job->queryId;
doQueryJob(job, &result);
doSubQueryJob(job, &result);
@@ -354,7 +354,7 @@ void QDeclarativeXmlQueryEngine::processQuery(XmlQueryJob *job)
}
}
-void QDeclarativeXmlQueryEngine::doQueryJob(XmlQueryJob *currentJob, QDeclarativeXmlQueryResult *currentResult)
+void QQuickXmlQueryEngine::doQueryJob(XmlQueryJob *currentJob, QQuickXmlQueryResult *currentResult)
{
Q_ASSERT(currentJob->queryId != -1);
@@ -393,7 +393,7 @@ void QDeclarativeXmlQueryEngine::doQueryJob(XmlQueryJob *currentJob, QDeclarativ
currentResult->size = (count > 0 ? count : 0);
}
-void QDeclarativeXmlQueryEngine::getValuesOfKeyRoles(const XmlQueryJob& currentJob, QStringList *values, QXmlQuery *query) const
+void QQuickXmlQueryEngine::getValuesOfKeyRoles(const XmlQueryJob& currentJob, QStringList *values, QXmlQuery *query) const
{
const QStringList &keysQueries = currentJob.keyRoleQueries;
QString keysQuery;
@@ -414,7 +414,7 @@ void QDeclarativeXmlQueryEngine::getValuesOfKeyRoles(const XmlQueryJob& currentJ
}
}
-void QDeclarativeXmlQueryEngine::addIndexToRangeList(QList<QDeclarativeXmlListRange> *ranges, int index) const {
+void QQuickXmlQueryEngine::addIndexToRangeList(QList<QQuickXmlListRange> *ranges, int index) const {
if (ranges->isEmpty())
ranges->append(qMakePair(index, 1));
else if (ranges->last().first + ranges->last().second == index)
@@ -423,7 +423,7 @@ void QDeclarativeXmlQueryEngine::addIndexToRangeList(QList<QDeclarativeXmlListRa
ranges->append(qMakePair(index, 1));
}
-void QDeclarativeXmlQueryEngine::doSubQueryJob(XmlQueryJob *currentJob, QDeclarativeXmlQueryResult *currentResult)
+void QQuickXmlQueryEngine::doSubQueryJob(XmlQueryJob *currentJob, QQuickXmlQueryResult *currentResult)
{
Q_ASSERT(currentJob->queryId != -1);
@@ -489,7 +489,7 @@ void QDeclarativeXmlQueryEngine::doSubQueryJob(XmlQueryJob *currentJob, QDeclara
/*for (int j = 0; j < m_size; ++j) {
QList<QVariant> resultList;
for (int i = 0; i < m_roleObjects->size(); ++i) {
- QDeclarativeXmlListModelRole *role = m_roleObjects->at(i);
+ QQuickXmlListModelRole *role = m_roleObjects->at(i);
subquery.setQuery(m_prefix.arg(j+1) + role->query());
if (role->isStringList()) {
QStringList data;
@@ -514,27 +514,27 @@ void QDeclarativeXmlQueryEngine::doSubQueryJob(XmlQueryJob *currentJob, QDeclara
}*/
}
-class QDeclarativeXmlListModelPrivate : public QObjectPrivate
+class QQuickXmlListModelPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QDeclarativeXmlListModel)
+ Q_DECLARE_PUBLIC(QQuickXmlListModel)
public:
- QDeclarativeXmlListModelPrivate()
+ QQuickXmlListModelPrivate()
: isComponentComplete(true), size(-1), highestRole(Qt::UserRole)
- , reply(0), status(QDeclarativeXmlListModel::Null), progress(0.0)
+ , reply(0), status(QQuickXmlListModel::Null), progress(0.0)
, queryId(-1), roleObjects(), redirectCount(0) {}
void notifyQueryStarted(bool remoteSource) {
- Q_Q(QDeclarativeXmlListModel);
+ Q_Q(QQuickXmlListModel);
progress = remoteSource ? 0.0 : 1.0;
- status = QDeclarativeXmlListModel::Loading;
+ status = QQuickXmlListModel::Loading;
errorString.clear();
emit q->progressChanged(progress);
emit q->statusChanged(status);
}
void deleteReply() {
- Q_Q(QDeclarativeXmlListModel);
+ Q_Q(QQuickXmlListModel);
if (reply) {
QObject::disconnect(reply, 0, q, 0);
reply->deleteLater();
@@ -553,23 +553,23 @@ public:
int highestRole;
QNetworkReply *reply;
- QDeclarativeXmlListModel::Status status;
+ QQuickXmlListModel::Status status;
QString errorString;
qreal progress;
int queryId;
QStringList keyRoleResultsCache;
- QList<QDeclarativeXmlListModelRole *> roleObjects;
+ QList<QQuickXmlListModelRole *> roleObjects;
- static void append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role);
- static void clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list);
+ static void append_role(QQmlListProperty<QQuickXmlListModelRole> *list, QQuickXmlListModelRole *role);
+ static void clear_role(QQmlListProperty<QQuickXmlListModelRole> *list);
QList<QList<QVariant> > data;
int redirectCount;
};
-void QDeclarativeXmlListModelPrivate::append_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list, QDeclarativeXmlListModelRole *role)
+void QQuickXmlListModelPrivate::append_role(QQmlListProperty<QQuickXmlListModelRole> *list, QQuickXmlListModelRole *role)
{
- QDeclarativeXmlListModel *_this = qobject_cast<QDeclarativeXmlListModel *>(list->object);
+ QQuickXmlListModel *_this = qobject_cast<QQuickXmlListModel *>(list->object);
if (_this && role) {
int i = _this->d_func()->roleObjects.count();
_this->d_func()->roleObjects.append(role);
@@ -585,16 +585,16 @@ void QDeclarativeXmlListModelPrivate::append_role(QDeclarativeListProperty<QDecl
//### clear needs to invalidate any cached data (in data table) as well
// (and the model should emit the appropriate signals)
-void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDeclarativeXmlListModelRole> *list)
+void QQuickXmlListModelPrivate::clear_role(QQmlListProperty<QQuickXmlListModelRole> *list)
{
- QDeclarativeXmlListModel *_this = static_cast<QDeclarativeXmlListModel *>(list->object);
+ QQuickXmlListModel *_this = static_cast<QQuickXmlListModel *>(list->object);
_this->d_func()->roles.clear();
_this->d_func()->roleNames.clear();
_this->d_func()->roleObjects.clear();
}
/*!
- \qmlclass XmlListModel QDeclarativeXmlListModel
+ \qmlclass XmlListModel QQuickXmlListModel
\inqmlmodule QtQuick 2
\ingroup qml-working-with-data
\brief The XmlListModel element is used to specify a read-only model using XPath expressions.
@@ -690,12 +690,12 @@ void QDeclarativeXmlListModelPrivate::clear_role(QDeclarativeListProperty<QDecla
\sa {RSS News}
*/
-QDeclarativeXmlListModel::QDeclarativeXmlListModel(QObject *parent)
- : QListModelInterface(*(new QDeclarativeXmlListModelPrivate), parent)
+QQuickXmlListModel::QQuickXmlListModel(QObject *parent)
+ : QListModelInterface(*(new QQuickXmlListModelPrivate), parent)
{
}
-QDeclarativeXmlListModel::~QDeclarativeXmlListModel()
+QQuickXmlListModel::~QQuickXmlListModel()
{
}
@@ -704,18 +704,18 @@ QDeclarativeXmlListModel::~QDeclarativeXmlListModel()
The roles to make available for this model.
*/
-QDeclarativeListProperty<QDeclarativeXmlListModelRole> QDeclarativeXmlListModel::roleObjects()
+QQmlListProperty<QQuickXmlListModelRole> QQuickXmlListModel::roleObjects()
{
- Q_D(QDeclarativeXmlListModel);
- QDeclarativeListProperty<QDeclarativeXmlListModelRole> list(this, d->roleObjects);
- list.append = &QDeclarativeXmlListModelPrivate::append_role;
- list.clear = &QDeclarativeXmlListModelPrivate::clear_role;
+ Q_D(QQuickXmlListModel);
+ QQmlListProperty<QQuickXmlListModelRole> list(this, d->roleObjects);
+ list.append = &QQuickXmlListModelPrivate::append_role;
+ list.clear = &QQuickXmlListModelPrivate::clear_role;
return list;
}
-QHash<int,QVariant> QDeclarativeXmlListModel::data(int index, const QList<int> &roles) const
+QHash<int,QVariant> QQuickXmlListModel::data(int index, const QList<int> &roles) const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
QHash<int, QVariant> rv;
for (int i = 0; i < roles.size(); ++i) {
int role = roles.at(i);
@@ -725,9 +725,9 @@ QHash<int,QVariant> QDeclarativeXmlListModel::data(int index, const QList<int> &
return rv;
}
-QVariant QDeclarativeXmlListModel::data(int index, int role) const
+QVariant QQuickXmlListModel::data(int index, int role) const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
int roleIndex = d->roles.indexOf(role);
return (roleIndex == -1) ? QVariant() : d->data.value(roleIndex).value(index);
}
@@ -736,21 +736,21 @@ QVariant QDeclarativeXmlListModel::data(int index, int role) const
\qmlproperty int QtQuick2::XmlListModel::count
The number of data entries in the model.
*/
-int QDeclarativeXmlListModel::count() const
+int QQuickXmlListModel::count() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->size;
}
-QList<int> QDeclarativeXmlListModel::roles() const
+QList<int> QQuickXmlListModel::roles() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->roles;
}
-QString QDeclarativeXmlListModel::toString(int role) const
+QString QQuickXmlListModel::toString(int role) const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
int index = d->roles.indexOf(role);
if (index == -1)
return QString();
@@ -763,15 +763,15 @@ QString QDeclarativeXmlListModel::toString(int role) const
If both \c source and \l xml are set, \l xml is used.
*/
-QUrl QDeclarativeXmlListModel::source() const
+QUrl QQuickXmlListModel::source() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->src;
}
-void QDeclarativeXmlListModel::setSource(const QUrl &src)
+void QQuickXmlListModel::setSource(const QUrl &src)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (d->src != src) {
d->src = src;
if (d->xml.isEmpty()) // src is only used if d->xml is not set
@@ -788,15 +788,15 @@ void QDeclarativeXmlListModel::setSource(const QUrl &src)
If both \l source and \c xml are set, \c xml is used.
*/
-QString QDeclarativeXmlListModel::xml() const
+QString QQuickXmlListModel::xml() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->xml;
}
-void QDeclarativeXmlListModel::setXml(const QString &xml)
+void QQuickXmlListModel::setXml(const QString &xml)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (d->xml != xml) {
d->xml = xml;
reload();
@@ -809,17 +809,17 @@ void QDeclarativeXmlListModel::setXml(const QString &xml)
An absolute XPath query representing the base query for creating model items
from this model's XmlRole objects. The query should start with '/' or '//'.
*/
-QString QDeclarativeXmlListModel::query() const
+QString QQuickXmlListModel::query() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->query;
}
-void QDeclarativeXmlListModel::setQuery(const QString &query)
+void QQuickXmlListModel::setQuery(const QString &query)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (!query.startsWith(QLatin1Char('/'))) {
- qmlInfo(this) << QCoreApplication::translate("QDeclarativeXmlRoleList", "An XmlListModel query must start with '/' or \"//\"");
+ qmlInfo(this) << QCoreApplication::translate("QQuickXmlRoleList", "An XmlListModel query must start with '/' or \"//\"");
return;
}
@@ -848,15 +848,15 @@ void QDeclarativeXmlListModel::setQuery(const QString &query)
}
\endqml
*/
-QString QDeclarativeXmlListModel::namespaceDeclarations() const
+QString QQuickXmlListModel::namespaceDeclarations() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->namespaces;
}
-void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarations)
+void QQuickXmlListModel::setNamespaceDeclarations(const QString &declarations)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (d->namespaces != declarations) {
d->namespaces = declarations;
reload();
@@ -886,22 +886,22 @@ void QDeclarativeXmlListModel::setNamespaceDeclarations(const QString &declarati
var title = model.get(0).title;
\endjs
*/
-QDeclarativeV8Handle QDeclarativeXmlListModel::get(int index) const
+QQmlV8Handle QQuickXmlListModel::get(int index) const
{
// Must be called with a context and handle scope
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
if (index < 0 || index >= count())
- return QDeclarativeV8Handle::fromHandle(v8::Undefined());
+ return QQmlV8Handle::fromHandle(v8::Undefined());
- QDeclarativeEngine *engine = qmlContext(this)->engine();
- QV8Engine *v8engine = QDeclarativeEnginePrivate::getV8Engine(engine);
+ QQmlEngine *engine = qmlContext(this)->engine();
+ QV8Engine *v8engine = QQmlEnginePrivate::getV8Engine(engine);
v8::Local<v8::Object> rv = v8::Object::New();
for (int ii = 0; ii < d->roleObjects.count(); ++ii)
rv->Set(v8engine->toString(d->roleObjects[ii]->name()),
v8engine->fromVariant(d->data.value(ii).value(index)));
- return QDeclarativeV8Handle::fromHandle(rv);
+ return QQmlV8Handle::fromHandle(rv);
}
/*!
@@ -919,9 +919,9 @@ QDeclarativeV8Handle QDeclarativeXmlListModel::get(int index) const
\sa progress
*/
-QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status() const
+QQuickXmlListModel::Status QQuickXmlListModel::status() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->status;
}
@@ -940,9 +940,9 @@ QDeclarativeXmlListModel::Status QDeclarativeXmlListModel::status() const
\sa status, source
*/
-qreal QDeclarativeXmlListModel::progress() const
+qreal QQuickXmlListModel::progress() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->progress;
}
@@ -952,27 +952,27 @@ qreal QDeclarativeXmlListModel::progress() const
Returns a string description of the last error that occurred
if \l status is XmlListModel::Error.
*/
-QString QDeclarativeXmlListModel::errorString() const
+QString QQuickXmlListModel::errorString() const
{
- Q_D(const QDeclarativeXmlListModel);
+ Q_D(const QQuickXmlListModel);
return d->errorString;
}
-void QDeclarativeXmlListModel::classBegin()
+void QQuickXmlListModel::classBegin()
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
d->isComponentComplete = false;
- QDeclarativeXmlQueryEngine *queryEngine = QDeclarativeXmlQueryEngine::instance(qmlEngine(this));
- connect(queryEngine, SIGNAL(queryCompleted(QDeclarativeXmlQueryResult)),
- SLOT(queryCompleted(QDeclarativeXmlQueryResult)));
+ QQuickXmlQueryEngine *queryEngine = QQuickXmlQueryEngine::instance(qmlEngine(this));
+ connect(queryEngine, SIGNAL(queryCompleted(QQuickXmlQueryResult)),
+ SLOT(queryCompleted(QQuickXmlQueryResult)));
connect(queryEngine, SIGNAL(error(void*,QString)),
SLOT(queryError(void*,QString)));
}
-void QDeclarativeXmlListModel::componentComplete()
+void QQuickXmlListModel::componentComplete()
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
d->isComponentComplete = true;
reload();
}
@@ -990,14 +990,14 @@ void QDeclarativeXmlListModel::componentComplete()
\sa {Using key XML roles}, XmlRole::isKey
*/
-void QDeclarativeXmlListModel::reload()
+void QQuickXmlListModel::reload()
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (!d->isComponentComplete)
return;
- QDeclarativeXmlQueryEngine::instance(qmlEngine(this))->abort(d->queryId);
+ QQuickXmlQueryEngine::instance(qmlEngine(this))->abort(d->queryId);
d->queryId = -1;
if (d->size < 0)
@@ -1009,7 +1009,7 @@ void QDeclarativeXmlListModel::reload()
}
if (!d->xml.isEmpty()) {
- d->queryId = QDeclarativeXmlQueryEngine::instance(qmlEngine(this))->doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects, d->keyRoleResultsCache);
+ d->queryId = QQuickXmlQueryEngine::instance(qmlEngine(this))->doQuery(d->query, d->namespaces, d->xml.toUtf8(), &d->roleObjects, d->keyRoleResultsCache);
d->notifyQueryStarted(false);
} else if (d->src.isEmpty()) {
@@ -1030,9 +1030,9 @@ void QDeclarativeXmlListModel::reload()
#define XMLLISTMODEL_MAX_REDIRECT 16
-void QDeclarativeXmlListModel::requestFinished()
+void QQuickXmlListModel::requestFinished()
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
d->redirectCount++;
if (d->redirectCount < XMLLISTMODEL_MAX_REDIRECT) {
@@ -1067,7 +1067,7 @@ void QDeclarativeXmlListModel::requestFinished()
d->queryId = XMLLISTMODEL_CLEAR_ID;
QTimer::singleShot(0, this, SLOT(dataCleared()));
} else {
- d->queryId = QDeclarativeXmlQueryEngine::instance(qmlEngine(this))->doQuery(d->query, d->namespaces, data, &d->roleObjects, d->keyRoleResultsCache);
+ d->queryId = QQuickXmlQueryEngine::instance(qmlEngine(this))->doQuery(d->query, d->namespaces, data, &d->roleObjects, d->keyRoleResultsCache);
}
d->deleteReply();
@@ -1076,19 +1076,19 @@ void QDeclarativeXmlListModel::requestFinished()
}
}
-void QDeclarativeXmlListModel::requestProgress(qint64 received, qint64 total)
+void QQuickXmlListModel::requestProgress(qint64 received, qint64 total)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (d->status == Loading && total > 0) {
d->progress = qreal(received)/total;
emit progressChanged(d->progress);
}
}
-void QDeclarativeXmlListModel::dataCleared()
+void QQuickXmlListModel::dataCleared()
{
- Q_D(QDeclarativeXmlListModel);
- QDeclarativeXmlQueryResult r;
+ Q_D(QQuickXmlListModel);
+ QQuickXmlQueryResult r;
r.queryId = XMLLISTMODEL_CLEAR_ID;
r.size = 0;
r.removed << qMakePair(0, count());
@@ -1096,12 +1096,12 @@ void QDeclarativeXmlListModel::dataCleared()
queryCompleted(r);
}
-void QDeclarativeXmlListModel::queryError(void* object, const QString& error)
+void QQuickXmlListModel::queryError(void* object, const QString& error)
{
// Be extra careful, object may no longer exist, it's just an ID.
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
for (int i=0; i<d->roleObjects.count(); i++) {
- if (d->roleObjects.at(i) == static_cast<QDeclarativeXmlListModelRole*>(object)) {
+ if (d->roleObjects.at(i) == static_cast<QQuickXmlListModelRole*>(object)) {
qmlInfo(d->roleObjects.at(i)) << QObject::tr("invalid query: \"%1\"").arg(error);
return;
}
@@ -1109,9 +1109,9 @@ void QDeclarativeXmlListModel::queryError(void* object, const QString& error)
qmlInfo(this) << QObject::tr("invalid query: \"%1\"").arg(error);
}
-void QDeclarativeXmlListModel::queryCompleted(const QDeclarativeXmlQueryResult &result)
+void QQuickXmlListModel::queryCompleted(const QQuickXmlQueryResult &result)
{
- Q_D(QDeclarativeXmlListModel);
+ Q_D(QQuickXmlListModel);
if (result.queryId != d->queryId)
return;
@@ -1157,4 +1157,4 @@ void QDeclarativeXmlListModel::queryCompleted(const QDeclarativeXmlQueryResult &
QT_END_NAMESPACE
-#include <qdeclarativexmllistmodel.moc>
+#include <qqmlxmllistmodel.moc>
diff --git a/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h
index f34591d0a3..5bc4c7b494 100644
--- a/src/imports/xmllistmodel/qdeclarativexmllistmodel_p.h
+++ b/src/imports/xmllistmodel/qqmlxmllistmodel_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEXMLLISTMODEL_H
-#define QDECLARATIVEXMLLISTMODEL_H
+#ifndef QQUICKXMLLISTMODEL_H
+#define QQUICKXMLLISTMODEL_H
-#include <qdeclarative.h>
-#include <qdeclarativeinfo.h>
+#include <qqml.h>
+#include <qqmlinfo.h>
#include <QtCore/qurl.h>
#include <QtCore/qstringlist.h>
@@ -56,11 +56,11 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeContext;
-class QDeclarativeXmlListModelRole;
-class QDeclarativeXmlListModelPrivate;
+class QQmlContext;
+class QQuickXmlListModelRole;
+class QQuickXmlListModelPrivate;
-struct QDeclarativeXmlQueryResult {
+struct QQuickXmlQueryResult {
int queryId;
int size;
QList<QList<QVariant> > data;
@@ -69,10 +69,10 @@ struct QDeclarativeXmlQueryResult {
QStringList keyRoleResultsCache;
};
-class QDeclarativeXmlListModel : public QListModelInterface, public QDeclarativeParserStatus
+class QQuickXmlListModel : public QListModelInterface, public QQmlParserStatus
{
Q_OBJECT
- Q_INTERFACES(QDeclarativeParserStatus)
+ Q_INTERFACES(QQmlParserStatus)
Q_ENUMS(Status)
Q_PROPERTY(Status status READ status NOTIFY statusChanged)
@@ -81,13 +81,13 @@ class QDeclarativeXmlListModel : public QListModelInterface, public QDeclarative
Q_PROPERTY(QString xml READ xml WRITE setXml NOTIFY xmlChanged)
Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged)
Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations NOTIFY namespaceDeclarationsChanged)
- Q_PROPERTY(QDeclarativeListProperty<QDeclarativeXmlListModelRole> roles READ roleObjects)
+ Q_PROPERTY(QQmlListProperty<QQuickXmlListModelRole> roles READ roleObjects)
Q_PROPERTY(int count READ count NOTIFY countChanged)
Q_CLASSINFO("DefaultProperty", "roles")
public:
- QDeclarativeXmlListModel(QObject *parent = 0);
- ~QDeclarativeXmlListModel();
+ QQuickXmlListModel(QObject *parent = 0);
+ ~QQuickXmlListModel();
virtual QHash<int,QVariant> data(int index, const QList<int> &roles = (QList<int>())) const;
virtual QVariant data(int index, int role) const;
@@ -95,7 +95,7 @@ public:
virtual QList<int> roles() const;
virtual QString toString(int role) const;
- QDeclarativeListProperty<QDeclarativeXmlListModelRole> roleObjects();
+ QQmlListProperty<QQuickXmlListModelRole> roleObjects();
QUrl source() const;
void setSource(const QUrl&);
@@ -109,7 +109,7 @@ public:
QString namespaceDeclarations() const;
void setNamespaceDeclarations(const QString&);
- Q_INVOKABLE QDeclarativeV8Handle get(int index) const;
+ Q_INVOKABLE QQmlV8Handle get(int index) const;
enum Status { Null, Ready, Loading, Error };
Status status() const;
@@ -121,7 +121,7 @@ public:
virtual void componentComplete();
Q_SIGNALS:
- void statusChanged(QDeclarativeXmlListModel::Status);
+ void statusChanged(QQuickXmlListModel::Status);
void progressChanged(qreal progress);
void countChanged();
void sourceChanged();
@@ -140,23 +140,23 @@ private Q_SLOTS:
void requestFinished();
void requestProgress(qint64,qint64);
void dataCleared();
- void queryCompleted(const QDeclarativeXmlQueryResult &);
+ void queryCompleted(const QQuickXmlQueryResult &);
void queryError(void* object, const QString& error);
private:
- Q_DECLARE_PRIVATE(QDeclarativeXmlListModel)
- Q_DISABLE_COPY(QDeclarativeXmlListModel)
+ Q_DECLARE_PRIVATE(QQuickXmlListModel)
+ Q_DISABLE_COPY(QQuickXmlListModel)
};
-class QDeclarativeXmlListModelRole : public QObject
+class QQuickXmlListModelRole : public QObject
{
Q_OBJECT
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged)
Q_PROPERTY(bool isKey READ isKey WRITE setIsKey NOTIFY isKeyChanged)
public:
- QDeclarativeXmlListModelRole() : m_isKey(false) {}
- ~QDeclarativeXmlListModelRole() {}
+ QQuickXmlListModelRole() : m_isKey(false) {}
+ ~QQuickXmlListModelRole() {}
QString name() const { return m_name; }
void setName(const QString &name) {
@@ -204,9 +204,9 @@ private:
QT_END_NAMESPACE
-QML_DECLARE_TYPE(QDeclarativeXmlListModel)
-QML_DECLARE_TYPE(QDeclarativeXmlListModelRole)
+QML_DECLARE_TYPE(QQuickXmlListModel)
+QML_DECLARE_TYPE(QQuickXmlListModelRole)
QT_END_HEADER
-#endif // QDECLARATIVEXMLLISTMODEL_H
+#endif // QQUICKXMLLISTMODEL_H
diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro
index d8121e8db8..8c056e8448 100644
--- a/src/imports/xmllistmodel/xmllistmodel.pro
+++ b/src/imports/xmllistmodel/xmllistmodel.pro
@@ -2,12 +2,12 @@ TARGET = qmlxmllistmodelplugin
TARGETPATH = QtQuick/XmlListModel
include(../qimportbase.pri)
-QT += network declarative xmlpatterns declarative-private v8-private core-private
+QT += network qml xmlpatterns qml-private v8-private core-private
-SOURCES += qdeclarativexmllistmodel.cpp plugin.cpp
-HEADERS += qdeclarativexmllistmodel_p.h
+SOURCES += qqmlxmllistmodel.cpp plugin.cpp
+HEADERS += qqmlxmllistmodel_p.h
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
+DESTDIR = $$QT.qml.imports/$$TARGETPATH
target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
qmldir.files += $$PWD/qmldir
diff --git a/src/plugins/accessible/quick/main.cpp b/src/plugins/accessible/quick/main.cpp
index 08a5fe546b..783d4674da 100644
--- a/src/plugins/accessible/quick/main.cpp
+++ b/src/plugins/accessible/quick/main.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -40,7 +40,7 @@
****************************************************************************/
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
#include "qaccessiblequickview.h"
#include "qaccessiblequickitem.h"
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.cpp b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
index 806a0f50c8..78e7ca86ef 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -47,7 +47,7 @@
QT_BEGIN_NAMESPACE
QAccessibleQuickItem::QAccessibleQuickItem(QQuickItem *item)
- : QDeclarativeAccessible(item)
+ : QQmlAccessible(item)
{
}
diff --git a/src/plugins/accessible/quick/qaccessiblequickitem.h b/src/plugins/accessible/quick/qaccessiblequickitem.h
index a283f853fd..5c19666f32 100644
--- a/src/plugins/accessible/quick/qaccessiblequickitem.h
+++ b/src/plugins/accessible/quick/qaccessiblequickitem.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -44,13 +44,13 @@
#include <QtQuick/QQuickItem>
#include <QtQuick/QQuickView>
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
-class QAccessibleQuickItem : public QDeclarativeAccessible
+class QAccessibleQuickItem : public QQmlAccessible
{
public:
QAccessibleQuickItem(QQuickItem *item);
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.cpp b/src/plugins/accessible/quick/qaccessiblequickview.cpp
index 05f0b8eed9..042d8dcf06 100644
--- a/src/plugins/accessible/quick/qaccessiblequickview.cpp
+++ b/src/plugins/accessible/quick/qaccessiblequickview.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -45,7 +45,7 @@
#include <QtQuick/private/qquickitem_p.h>
#include "qaccessiblequickitem.h"
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
#ifndef QT_NO_ACCESSIBILITY
diff --git a/src/plugins/accessible/quick/qaccessiblequickview.h b/src/plugins/accessible/quick/qaccessiblequickview.h
index 66c8a52168..3ad87df937 100644
--- a/src/plugins/accessible/quick/qaccessiblequickview.h
+++ b/src/plugins/accessible/quick/qaccessiblequickview.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index 97a1d50098..ae6ec032da 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -4,7 +4,7 @@ TARGET = qtaccessiblequick
load(qt_plugin)
include ($$PWD/../shared/qaccessiblebase.pri)
-QT += core-private gui-private v8-private declarative-private quick-private
+QT += core-private gui-private v8-private qml-private quick-private
DESTDIR = $$QT.gui.plugins/accessible
QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
diff --git a/src/plugins/accessible/shared/qaccessiblebase.pri b/src/plugins/accessible/shared/qaccessiblebase.pri
index 8c82705443..56a8a1c9ef 100644
--- a/src/plugins/accessible/shared/qaccessiblebase.pri
+++ b/src/plugins/accessible/shared/qaccessiblebase.pri
@@ -3,5 +3,5 @@ INSTALLS += target
INCLUDEPATH += $$PWD
DEPENDPATH += $$PWD
-SOURCES += $$PWD/qdeclarativeaccessible.cpp
-HEADERS += $$PWD/qdeclarativeaccessible.h
+SOURCES += $$PWD/qqmlaccessible.cpp
+HEADERS += $$PWD/qqmlaccessible.h
diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp b/src/plugins/accessible/shared/qqmlaccessible.cpp
index a063dd043d..1818ebebfe 100644
--- a/src/plugins/accessible/shared/qdeclarativeaccessible.cpp
+++ b/src/plugins/accessible/shared/qqmlaccessible.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -40,7 +40,7 @@
****************************************************************************/
#include <qnamespace.h>
-#include "qdeclarativeaccessible.h"
+#include "qqmlaccessible.h"
#ifndef QT_NO_ACCESSIBILITY
@@ -54,16 +54,16 @@ QString Q_GUI_EXPORT qTextAtOffsetFromString(int offset, QAccessible2::BoundaryT
QString Q_GUI_EXPORT qTextAfterOffsetFromString(int offset, QAccessible2::BoundaryType boundaryType,
int *startOffset, int *endOffset, const QString& text);
-QDeclarativeAccessible::QDeclarativeAccessible(QObject *object)
+QQmlAccessible::QQmlAccessible(QObject *object)
:QAccessibleObject(object)
{
}
-QDeclarativeAccessible::~QDeclarativeAccessible()
+QQmlAccessible::~QQmlAccessible()
{
}
-QAccessibleInterface *QDeclarativeAccessible::childAt(int x, int y) const
+QAccessibleInterface *QQmlAccessible::childAt(int x, int y) const
{
// Note that this function will disregard stacking order.
// (QAccessibleQuickView::childAt() does this correctly and more efficient)
@@ -85,7 +85,7 @@ QAccessibleInterface *QDeclarativeAccessible::childAt(int x, int y) const
return 0;
}
-QAccessible::State QDeclarativeAccessible::state() const
+QAccessible::State QQmlAccessible::state() const
{
QAccessible::State state;
@@ -122,7 +122,7 @@ QAccessible::State QDeclarativeAccessible::state() const
return state;
}
-QStringList QDeclarativeAccessible::actionNames() const
+QStringList QQmlAccessible::actionNames() const
{
QStringList actions;
switch (role()) {
@@ -139,7 +139,7 @@ QStringList QDeclarativeAccessible::actionNames() const
return actions;
}
-void QDeclarativeAccessible::doAction(const QString &actionName)
+void QQmlAccessible::doAction(const QString &actionName)
{
if (role() == QAccessible::PushButton && actionName == QAccessibleActionInterface::pressAction()) {
QMetaObject::invokeMethod(object(), "accessibleAction");
@@ -150,7 +150,7 @@ void QDeclarativeAccessible::doAction(const QString &actionName)
}
}
-QStringList QDeclarativeAccessible::keyBindingsForAction(const QString &actionName) const
+QStringList QQmlAccessible::keyBindingsForAction(const QString &actionName) const
{
Q_UNUSED(actionName)
return QStringList();
diff --git a/src/plugins/accessible/shared/qdeclarativeaccessible.h b/src/plugins/accessible/shared/qqmlaccessible.h
index 924e454fc9..570a3c8c40 100644
--- a/src/plugins/accessible/shared/qdeclarativeaccessible.h
+++ b/src/plugins/accessible/shared/qqmlaccessible.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,14 +39,14 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEACCESSIBLE_H
-#define QDECLARATIVEACCESSIBLE_H
+#ifndef QQMLACCESSIBLE_H
+#define QQMLACCESSIBLE_H
#include <QtGui/qaccessibleobject.h>
#include <QtGui/qaccessible2.h>
//#include <QtQuick1/qdeclarativeview.h>
//#include <QtQuick1/qdeclarativeitem.h>
-#include <QtDeclarative/qdeclarativeproperty.h>
+#include <QtQml/qqmlproperty.h>
//#include <private/qdeclarativeaccessible_p.h>
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
* Item interface classes:
QAccessibleDeclarativeItem for QtQuick1
QAccessibleQuickItem for for QtQuick2
- Common base class: QDeclarativeAccessible
+ Common base class: QQmlAccessible
* View interface classes.
@@ -70,10 +70,10 @@ QT_BEGIN_NAMESPACE
QAccessbileQuickView is the root for the SceneGraph implementation
*/
-class QDeclarativeAccessible: public QAccessibleObject, public QAccessibleActionInterface
+class QQmlAccessible: public QAccessibleObject, public QAccessibleActionInterface
{
public:
- ~QDeclarativeAccessible();
+ ~QQmlAccessible();
virtual QRect viewRect() const = 0;
QAccessibleInterface *childAt(int, int) const;
@@ -86,11 +86,11 @@ public:
protected:
virtual bool clipsChildren() const = 0;
// For subclasses, use instantiateObject factory method outside the class.
- QDeclarativeAccessible(QObject *object);
+ QQmlAccessible(QObject *object);
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
-#endif // QDECLARATIVEACCESSIBLE_H
+#endif // QQMLACCESSIBLE_H
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
index c1ca2a5ef9..6f973bcc18 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
+++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
@@ -1,10 +1,10 @@
TARGET = qmldbg_ost
-QT += declarative network
+QT += qml network
load(qt_plugin)
QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/qmltooling
-QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
+QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
SOURCES += \
qmlostplugin.cpp \
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
index d4d9629334..9bd68e7401 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
#include "qmlostplugin.h"
#include "qostdevice.h"
-#include <private/qdeclarativedebugserver_p.h>
+#include <private/qqmldebugserver_p.h>
#include <private/qpacketprotocol_p.h>
QT_BEGIN_NAMESPACE
@@ -55,7 +55,7 @@ public:
QOstDevice *ost;
QPacketProtocol *protocol;
- QDeclarativeDebugServer *debugServer;
+ QQmlDebugServer *debugServer;
};
QmlOstPluginPrivate::QmlOstPluginPrivate() :
@@ -75,7 +75,7 @@ QmlOstPlugin::~QmlOstPlugin()
delete d_ptr;
}
-void QmlOstPlugin::setServer(QDeclarativeDebugServer *server)
+void QmlOstPlugin::setServer(QQmlDebugServer *server)
{
Q_D(QmlOstPlugin);
d->debugServer = server;
@@ -127,12 +127,12 @@ void QmlOstPlugin::setPort(int port, bool block)
if (!ok) {
if (d->ost->errorString().length())
qDebug("Error from QOstDevice: %s", qPrintable(d->ost->errorString()));
- qWarning("QDeclarativeDebugServer: Unable to listen on OST"); // This message is part of the signalling - do not change the format!
+ qWarning("QQmlDebugServer: Unable to listen on OST"); // This message is part of the signalling - do not change the format!
return;
}
d->protocol = new QPacketProtocol(d->ost, this);
QObject::connect(d->protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
- qWarning("QDeclarativeDebugServer: Waiting for connection via OST"); // This message is part of the signalling - do not change the format!
+ qWarning("QQmlDebugServer: Waiting for connection via OST"); // This message is part of the signalling - do not change the format!
}
void QmlOstPlugin::readyRead()
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
index 1bbba93b94..41c3a07f25 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -43,26 +43,26 @@
#define QMLOSTPLUGIN_H
#include <QtWidgets/QStylePlugin>
-#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h>
+#include <QtQml/private/qqmldebugserverconnection_p.h>
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugServer;
+class QQmlDebugServer;
class QmlOstPluginPrivate;
-class QmlOstPlugin : public QObject, public QDeclarativeDebugServerConnection
+class QmlOstPlugin : public QObject, public QQmlDebugServerConnection
{
Q_OBJECT
Q_DECLARE_PRIVATE(QmlOstPlugin)
Q_DISABLE_COPY(QmlOstPlugin)
- Q_INTERFACES(QDeclarativeDebugServerConnection)
+ Q_INTERFACES(QQmlDebugServerConnection)
public:
QmlOstPlugin();
~QmlOstPlugin();
- void setServer(QDeclarativeDebugServer *server);
+ void setServer(QQmlDebugServer *server);
void setPort(int port, bool bock);
bool isConnected() const;
diff --git a/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp b/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp
index 289418cd83..2c557ac3cc 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp
+++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
index 609a71897b..4b645f9c8e 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
+++ b/src/plugins/qmltooling/qmldbg_ost/qostdevice.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h
index 246e162aee..b9bf53fbd2 100644
--- a/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h
+++ b/src/plugins/qmltooling/qmldbg_ost/usbostcomm.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
index e0662da590..bb4048ee92 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
index 82096c6abd..1b1f10c8bb 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/highlight.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index b9c6584afc..014f964652 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -1,11 +1,11 @@
load(qt_module)
TARGET = qmldbg_qtquick2
-QT += declarative-private quick-private core-private gui-private opengl-private v8-private
+QT += qml-private quick-private core-private gui-private opengl-private v8-private
load(qt_plugin)
-DESTDIR = $$QT.declarative.plugins/qmltooling
+DESTDIR = $$QT.qml.plugins/qmltooling
INCLUDEPATH *= $$PWD $$PWD/../shared
@@ -24,7 +24,7 @@ HEADERS += \
qquickviewinspector.h \
../shared/abstracttool.h \
../shared/abstractviewinspector.h \
- ../shared/qdeclarativeinspectorprotocol.h \
+ ../shared/qqmlinspectorprotocol.h \
../shared/qmlinspectorconstants.h
target.path += $$[QT_INSTALL_PLUGINS]/qmltooling
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
index b146c6e846..200c66ee35 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -41,7 +41,7 @@
#include "qquickviewinspector.h"
-#include "qdeclarativeinspectorprotocol.h"
+#include "qqmlinspectorprotocol.h"
#include "highlight.h"
#include "selectiontool.h"
@@ -206,7 +206,7 @@ void QQuickViewInspector::setWindowFlags(Qt::WindowFlags flags)
w->setVisible(true);
}
-QDeclarativeEngine *QQuickViewInspector::declarativeEngine() const
+QQmlEngine *QQuickViewInspector::declarativeEngine() const
{
return m_view->engine();
}
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
index 07c38b1d5e..fbc3c17b87 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qquickviewinspector.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -71,7 +71,7 @@ public:
void changeTool(InspectorProtocol::Tool tool);
Qt::WindowFlags windowFlags() const;
void setWindowFlags(Qt::WindowFlags flags);
- QDeclarativeEngine *declarativeEngine() const;
+ QQmlEngine *declarativeEngine() const;
QQuickView *view() const { return m_view; }
QQuickItem *overlay() const { return m_overlay; }
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
index 206d0b2eb9..ea52788896 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -43,7 +43,7 @@
#include "qquickviewinspector.h"
#include <QtCore/qplugin.h>
-#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
+#include <QtQml/private/qqmlinspectorservice_p.h>
#include <QtQuick/QQuickView>
namespace QmlJSDebugger {
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
index d0f814c03c..d78aac6ead 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qtquick2plugin.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEINSPECTORPLUGIN_H
-#define QDECLARATIVEINSPECTORPLUGIN_H
+#ifndef QTQUICK2PLUGINPLUGIN_H
+#define QTQUICK2PLUGINPLUGIN_H
#include <QtCore/QPointer>
-#include <QtDeclarative/private/qdeclarativeinspectorinterface_p.h>
+#include <QtQml/private/qqmlinspectorinterface_p.h>
namespace QmlJSDebugger {
@@ -51,17 +51,17 @@ class AbstractViewInspector;
namespace QtQuick2 {
-class QtQuick2Plugin : public QObject, public QDeclarativeInspectorInterface
+class QtQuick2Plugin : public QObject, public QQmlInspectorInterface
{
Q_OBJECT
Q_DISABLE_COPY(QtQuick2Plugin)
- Q_INTERFACES(QDeclarativeInspectorInterface)
+ Q_INTERFACES(QQmlInspectorInterface)
public:
QtQuick2Plugin();
~QtQuick2Plugin();
- // QDeclarativeInspectorInterface
+ // QQmlInspectorInterface
bool canHandleView(QObject *view);
void activate(QObject *view);
void deactivate();
@@ -74,4 +74,4 @@ private:
} // namespace QtQuick2
} // namespace QmlJSDebugger
-#endif // QDECLARATIVEINSPECTORPLUGIN_H
+#endif // QTQUICK2PLUGINPLUGIN_H
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
index efa079dcf1..5ad102a92d 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
index 7767317abe..c2aa26a1a7 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/selectiontool.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index 8ab507c055..cb663dbc0c 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -1,12 +1,12 @@
load(qt_module)
TARGET = qmldbg_tcp
-QT += declarative-private network
+QT += qml-private network
load(qt_plugin)
-DESTDIR = $$QT.declarative.plugins/qmltooling
-QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
+DESTDIR = $$QT.qml.plugins/qmltooling
+QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
SOURCES += \
qtcpserverconnection.cpp
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
index 529d2094bf..63a3297f37 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -45,7 +45,7 @@
#include <QtNetwork/qtcpserver.h>
#include <QtNetwork/qtcpsocket.h>
-#include <private/qdeclarativedebugserver_p.h>
+#include <private/qqmldebugserver_p.h>
#include <private/qpacketprotocol_p.h>
QT_BEGIN_NAMESPACE
@@ -60,7 +60,7 @@ public:
QPacketProtocol *protocol;
QTcpServer *tcpServer;
- QDeclarativeDebugServer *debugServer;
+ QQmlDebugServer *debugServer;
};
QTcpServerConnectionPrivate::QTcpServerConnectionPrivate() :
@@ -84,7 +84,7 @@ QTcpServerConnection::~QTcpServerConnection()
delete d_ptr;
}
-void QTcpServerConnection::setServer(QDeclarativeDebugServer *server)
+void QTcpServerConnection::setServer(QQmlDebugServer *server)
{
Q_D(QTcpServerConnection);
d->debugServer = server;
@@ -147,9 +147,9 @@ void QTcpServerConnection::listen()
d->tcpServer = new QTcpServer(this);
QObject::connect(d->tcpServer, SIGNAL(newConnection()), this, SLOT(newConnection()));
if (d->tcpServer->listen(QHostAddress::Any, d->port))
- qWarning("QDeclarativeDebugServer: Waiting for connection on port %d...", d->port);
+ qWarning("QQmlDebugServer: Waiting for connection on port %d...", d->port);
else
- qWarning("QDeclarativeDebugServer: Unable to listen on port %d", d->port);
+ qWarning("QQmlDebugServer: Unable to listen on port %d", d->port);
}
@@ -170,7 +170,7 @@ void QTcpServerConnection::newConnection()
Q_D(QTcpServerConnection);
if (d->socket && d->socket->peerPort()) {
- qWarning("QDeclarativeDebugServer: Another client is already connected");
+ qWarning("QQmlDebugServer: Another client is already connected");
QTcpSocket *faultyConnection = d->tcpServer->nextPendingConnection();
delete faultyConnection;
return;
@@ -190,7 +190,7 @@ void QTcpServerConnection::newConnection()
void QTcpServerConnection::invalidPacket()
{
- qWarning("QDeclarativeDebugServer: Received a corrupted packet! Giving up ...");
+ qWarning("QQmlDebugServer: Received a corrupted packet! Giving up ...");
}
Q_EXPORT_PLUGIN2(tcpserver, QTcpServerConnection)
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
index f090c9709f..74c6b95e56 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
+++ b/src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -43,25 +43,25 @@
#define QTCPSERVERCONNECTION_H
#include <QtWidgets/QStylePlugin>
-#include <QtDeclarative/private/qdeclarativedebugserverconnection_p.h>
+#include <QtQml/private/qqmldebugserverconnection_p.h>
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugServer;
+class QQmlDebugServer;
class QTcpServerConnectionPrivate;
-class QTcpServerConnection : public QObject, public QDeclarativeDebugServerConnection
+class QTcpServerConnection : public QObject, public QQmlDebugServerConnection
{
Q_OBJECT
Q_DECLARE_PRIVATE(QTcpServerConnection)
Q_DISABLE_COPY(QTcpServerConnection)
- Q_INTERFACES(QDeclarativeDebugServerConnection)
+ Q_INTERFACES(QQmlDebugServerConnection)
public:
QTcpServerConnection();
~QTcpServerConnection();
- void setServer(QDeclarativeDebugServer *server);
+ void setServer(QQmlDebugServer *server);
void setPort(int port, bool bock);
bool isConnected() const;
diff --git a/src/plugins/qmltooling/shared/abstracttool.cpp b/src/plugins/qmltooling/shared/abstracttool.cpp
index 0565537cca..69e468bd92 100644
--- a/src/plugins/qmltooling/shared/abstracttool.cpp
+++ b/src/plugins/qmltooling/shared/abstracttool.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/shared/abstracttool.h b/src/plugins/qmltooling/shared/abstracttool.h
index e21e3be1f8..35817064e2 100644
--- a/src/plugins/qmltooling/shared/abstracttool.h
+++ b/src/plugins/qmltooling/shared/abstracttool.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.cpp b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
index cfa0f441cd..33e47d270d 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.cpp
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -42,12 +42,12 @@
#include "abstractviewinspector.h"
#include "abstracttool.h"
-#include "qdeclarativeinspectorprotocol.h"
+#include "qqmlinspectorprotocol.h"
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QtDeclarative/QDeclarativeComponent>
+#include <QtQml/QQmlEngine>
+#include <QtQml/QQmlComponent>
#include <QtCore/private/qabstractanimation_p.h>
-#include <QtDeclarative/private/qdeclarativeinspectorservice_p.h>
+#include <QtQml/private/qqmlinspectorservice_p.h>
#include <QtGui/QMouseEvent>
@@ -61,7 +61,7 @@ AbstractViewInspector::AbstractViewInspector(QObject *parent) :
m_designModeBehavior(false),
m_animationPaused(false),
m_slowDownFactor(1.0),
- m_debugService(QDeclarativeInspectorService::instance())
+ m_debugService(QQmlInspectorService::instance())
{
}
@@ -78,8 +78,8 @@ void AbstractViewInspector::createQmlObject(const QString &qml, QObject *parent,
imports += QLatin1Char('\n');
}
- QDeclarativeContext *parentContext = declarativeEngine()->contextForObject(parent);
- QDeclarativeComponent component(declarativeEngine());
+ QQmlContext *parentContext = declarativeEngine()->contextForObject(parent);
+ QQmlComponent component(declarativeEngine());
QByteArray constructedQml = QString(imports + qml).toLatin1();
component.setData(constructedQml, QUrl::fromLocalFile(filename));
@@ -316,7 +316,7 @@ void AbstractViewInspector::handleMessage(const QByteArray &message)
for (int i = 0; i < itemCount; ++i) {
int debugId = -1;
ds >> debugId;
- if (QObject *obj = QDeclarativeDebugService::objectForId(debugId))
+ if (QObject *obj = QQmlDebugService::objectForId(debugId))
selectedObjects << obj;
}
@@ -363,22 +363,22 @@ void AbstractViewInspector::handleMessage(const QByteArray &message)
QString filename;
QStringList imports;
ds >> qml >> parentId >> imports >> filename;
- createQmlObject(qml, QDeclarativeDebugService::objectForId(parentId),
+ createQmlObject(qml, QQmlDebugService::objectForId(parentId),
imports, filename);
break;
}
case InspectorProtocol::DestroyObject: {
int debugId;
ds >> debugId;
- if (QObject *obj = QDeclarativeDebugService::objectForId(debugId))
+ if (QObject *obj = QQmlDebugService::objectForId(debugId))
obj->deleteLater();
break;
}
case InspectorProtocol::MoveObject: {
int debugId, newParent;
ds >> debugId >> newParent;
- reparentQmlObject(QDeclarativeDebugService::objectForId(debugId),
- QDeclarativeDebugService::objectForId(newParent));
+ reparentQmlObject(QQmlDebugService::objectForId(debugId),
+ QQmlDebugService::objectForId(newParent));
break;
}
case InspectorProtocol::ObjectIdList: {
@@ -424,7 +424,7 @@ void AbstractViewInspector::sendCurrentObjects(const QList<QObject*> &objects)
<< objects.length();
foreach (QObject *object, objects) {
- int id = QDeclarativeDebugService::idForObject(object);
+ int id = QQmlDebugService::idForObject(object);
ds << id;
}
@@ -497,7 +497,7 @@ void AbstractViewInspector::sendColorChanged(const QColor &color)
QString AbstractViewInspector::idStringForObject(QObject *obj) const
{
- const int id = QDeclarativeDebugService::idForObject(obj);
+ const int id = QQmlDebugService::idForObject(obj);
return m_stringIdForObjectId.value(id);
}
diff --git a/src/plugins/qmltooling/shared/abstractviewinspector.h b/src/plugins/qmltooling/shared/abstractviewinspector.h
index 741013239f..0dacc92233 100644
--- a/src/plugins/qmltooling/shared/abstractviewinspector.h
+++ b/src/plugins/qmltooling/shared/abstractviewinspector.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -47,12 +47,12 @@
#include <QtCore/QStringList>
#include <QtGui/QColor>
-#include "qdeclarativeinspectorprotocol.h"
+#include "qqmlinspectorprotocol.h"
#include "qmlinspectorconstants.h"
QT_BEGIN_NAMESPACE
-class QDeclarativeEngine;
-class QDeclarativeInspectorService;
+class QQmlEngine;
+class QQmlInspectorService;
class QKeyEvent;
class QMouseEvent;
class QWheelEvent;
@@ -63,7 +63,7 @@ namespace QmlJSDebugger {
class AbstractTool;
/*
- * The common code between QQuickView and QDeclarativeView inspectors lives here,
+ * The common code between QQuickView and QQuickView inspectors lives here,
*/
class AbstractViewInspector : public QObject
{
@@ -100,7 +100,7 @@ public:
virtual void changeTool(InspectorProtocol::Tool tool) = 0;
virtual Qt::WindowFlags windowFlags() const = 0;
virtual void setWindowFlags(Qt::WindowFlags flags) = 0;
- virtual QDeclarativeEngine *declarativeEngine() const = 0;
+ virtual QQmlEngine *declarativeEngine() const = 0;
signals:
void designModeBehaviorChanged(bool inDesignMode);
@@ -159,7 +159,7 @@ private:
qreal m_slowDownFactor;
QHash<int, QString> m_stringIdForObjectId;
- QDeclarativeInspectorService *m_debugService;
+ QQmlInspectorService *m_debugService;
};
} // namespace QmlJSDebugger
diff --git a/src/plugins/qmltooling/shared/qmlinspectorconstants.h b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
index 1b25486bb6..e5a0ee5450 100644
--- a/src/plugins/qmltooling/shared/qmlinspectorconstants.h
+++ b/src/plugins/qmltooling/shared/qmlinspectorconstants.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -42,7 +42,7 @@
#ifndef QMLINSPECTORCONSTANTS_H
#define QMLINSPECTORCONSTANTS_H
-#include <QtDeclarative/private/qdeclarativeglobal_p.h>
+#include <QtQml/private/qqmlglobal_p.h>
namespace QmlJSDebugger {
namespace Constants {
diff --git a/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
index 4c833b99dc..63772aa8e4 100644
--- a/src/plugins/qmltooling/shared/qdeclarativeinspectorprotocol.h
+++ b/src/plugins/qmltooling/shared/qqmlinspectorprotocol.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEINSPECTORPROTOCOL_H
-#define QDECLARATIVEINSPECTORPROTOCOL_H
+#ifndef QQMLINSPECTORPROTOCOL_H
+#define QQMLINSPECTORPROTOCOL_H
#include <QtCore/QDebug>
#include <QtCore/QMetaType>
@@ -134,4 +134,4 @@ inline QDebug operator<< (QDebug dbg, InspectorProtocol::Tool tool)
} // namespace QmlJSDebugger
-#endif // QDECLARATIVEINSPECTORPROTOCOL_H
+#endif // QQMLINSPECTORPROTOCOL_H
diff --git a/src/declarative/animations/animations.pri b/src/qml/animations/animations.pri
index 01ac25af46..01ac25af46 100644
--- a/src/declarative/animations/animations.pri
+++ b/src/qml/animations/animations.pri
diff --git a/src/declarative/animations/qabstractanimationjob.cpp b/src/qml/animations/qabstractanimationjob.cpp
index 4d149ce99a..2bfc66fea0 100644
--- a/src/declarative/animations/qabstractanimationjob.cpp
+++ b/src/qml/animations/qabstractanimationjob.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -50,10 +50,10 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_THREAD
-Q_GLOBAL_STATIC(QThreadStorage<QDeclarativeAnimationTimer *>, animationTimer)
+Q_GLOBAL_STATIC(QThreadStorage<QQmlAnimationTimer *>, animationTimer)
#endif
-QDeclarativeAnimationTimer::QDeclarativeAnimationTimer() :
+QQmlAnimationTimer::QQmlAnimationTimer() :
QAbstractAnimationTimer(), lastTick(0), lastDelta(0),
currentAnimationIdx(0), insideTick(false),
startAnimationPending(false), stopTimerPending(false),
@@ -61,12 +61,12 @@ QDeclarativeAnimationTimer::QDeclarativeAnimationTimer() :
{
}
-QDeclarativeAnimationTimer *QDeclarativeAnimationTimer::instance(bool create)
+QQmlAnimationTimer *QQmlAnimationTimer::instance(bool create)
{
- QDeclarativeAnimationTimer *inst;
+ QQmlAnimationTimer *inst;
#ifndef QT_NO_THREAD
if (create && !animationTimer()->hasLocalData()) {
- inst = new QDeclarativeAnimationTimer;
+ inst = new QQmlAnimationTimer;
animationTimer()->setLocalData(inst);
} else {
inst = animationTimer() ? animationTimer()->localData() : 0;
@@ -78,20 +78,20 @@ QDeclarativeAnimationTimer *QDeclarativeAnimationTimer::instance(bool create)
return inst;
}
-QDeclarativeAnimationTimer *QDeclarativeAnimationTimer::instance()
+QQmlAnimationTimer *QQmlAnimationTimer::instance()
{
return instance(true);
}
-void QDeclarativeAnimationTimer::ensureTimerUpdate()
+void QQmlAnimationTimer::ensureTimerUpdate()
{
- QDeclarativeAnimationTimer *inst = QDeclarativeAnimationTimer::instance(false);
+ QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
QUnifiedTimer *instU = QUnifiedTimer::instance(false);
if (instU && inst && inst->isPaused)
instU->updateAnimationTimers(-1);
}
-void QDeclarativeAnimationTimer::updateAnimationsTime(qint64 delta)
+void QQmlAnimationTimer::updateAnimationsTime(qint64 delta)
{
//setCurrentTime can get this called again while we're the for loop. At least with pauseAnimations
if (insideTick)
@@ -116,14 +116,14 @@ void QDeclarativeAnimationTimer::updateAnimationsTime(qint64 delta)
}
}
-void QDeclarativeAnimationTimer::updateAnimationTimer()
+void QQmlAnimationTimer::updateAnimationTimer()
{
- QDeclarativeAnimationTimer *inst = QDeclarativeAnimationTimer::instance(false);
+ QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
if (inst)
inst->restartAnimationTimer();
}
-void QDeclarativeAnimationTimer::restartAnimationTimer()
+void QQmlAnimationTimer::restartAnimationTimer()
{
if (runningLeafAnimations == 0 && !runningPauseAnimations.isEmpty())
QUnifiedTimer::pauseAnimationTimer(this, closestPauseAnimationTimeToFinish());
@@ -133,7 +133,7 @@ void QDeclarativeAnimationTimer::restartAnimationTimer()
QUnifiedTimer::startAnimationTimer(this);
}
-void QDeclarativeAnimationTimer::startAnimations()
+void QQmlAnimationTimer::startAnimations()
{
startAnimationPending = false;
//force timer to update, which prevents large deltas for our newly added animations
@@ -147,7 +147,7 @@ void QDeclarativeAnimationTimer::startAnimations()
restartAnimationTimer();
}
-void QDeclarativeAnimationTimer::stopTimer()
+void QQmlAnimationTimer::stopTimer()
{
stopTimerPending = false;
if (animations.isEmpty()) {
@@ -159,9 +159,9 @@ void QDeclarativeAnimationTimer::stopTimer()
}
}
-void QDeclarativeAnimationTimer::registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel)
+void QQmlAnimationTimer::registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel)
{
- QDeclarativeAnimationTimer *inst = instance(true); //we create the instance if needed
+ QQmlAnimationTimer *inst = instance(true); //we create the instance if needed
inst->registerRunningAnimation(animation);
if (isTopLevel) {
Q_ASSERT(!animation->m_hasRegisteredTimer);
@@ -174,9 +174,9 @@ void QDeclarativeAnimationTimer::registerAnimation(QAbstractAnimationJob *animat
}
}
-void QDeclarativeAnimationTimer::unregisterAnimation(QAbstractAnimationJob *animation)
+void QQmlAnimationTimer::unregisterAnimation(QAbstractAnimationJob *animation)
{
- QDeclarativeAnimationTimer *inst = QDeclarativeAnimationTimer::instance(false);
+ QQmlAnimationTimer *inst = QQmlAnimationTimer::instance(false);
if (inst) {
//at this point the unified timer should have been created
//but it might also have been already destroyed in case the application is shutting down
@@ -204,7 +204,7 @@ void QDeclarativeAnimationTimer::unregisterAnimation(QAbstractAnimationJob *anim
animation->m_hasRegisteredTimer = false;
}
-void QDeclarativeAnimationTimer::registerRunningAnimation(QAbstractAnimationJob *animation)
+void QQmlAnimationTimer::registerRunningAnimation(QAbstractAnimationJob *animation)
{
if (animation->m_isGroup)
return;
@@ -215,7 +215,7 @@ void QDeclarativeAnimationTimer::registerRunningAnimation(QAbstractAnimationJob
runningLeafAnimations++;
}
-void QDeclarativeAnimationTimer::unregisterRunningAnimation(QAbstractAnimationJob *animation)
+void QQmlAnimationTimer::unregisterRunningAnimation(QAbstractAnimationJob *animation)
{
if (animation->m_isGroup)
return;
@@ -227,7 +227,7 @@ void QDeclarativeAnimationTimer::unregisterRunningAnimation(QAbstractAnimationJo
Q_ASSERT(runningLeafAnimations >= 0);
}
-int QDeclarativeAnimationTimer::closestPauseAnimationTimeToFinish()
+int QQmlAnimationTimer::closestPauseAnimationTimeToFinish()
{
int closestTimeToFinish = INT_MAX;
for (int i = 0; i < runningPauseAnimations.size(); ++i) {
@@ -276,7 +276,7 @@ QAbstractAnimationJob::~QAbstractAnimationJob()
m_state = Stopped;
stateChanged(oldState, m_state);
if (oldState == Running)
- QDeclarativeAnimationTimer::unregisterAnimation(this);
+ QQmlAnimationTimer::unregisterAnimation(this);
}
if (m_group)
@@ -311,11 +311,11 @@ void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
bool isTopLevel = !m_group || m_group->isStopped();
if (oldState == Running) {
if (newState == Paused && m_hasRegisteredTimer)
- QDeclarativeAnimationTimer::ensureTimerUpdate();
+ QQmlAnimationTimer::ensureTimerUpdate();
//the animation, is not running any more
- QDeclarativeAnimationTimer::unregisterAnimation(this);
+ QQmlAnimationTimer::unregisterAnimation(this);
} else if (newState == Running) {
- QDeclarativeAnimationTimer::registerAnimation(this, isTopLevel);
+ QQmlAnimationTimer::registerAnimation(this, isTopLevel);
}
//starting an animation qualifies as a top level loop change
@@ -341,7 +341,7 @@ void QAbstractAnimationJob::setState(QAbstractAnimationJob::State newState)
if (oldState == Stopped) {
if (isTopLevel) {
// currentTime needs to be updated if pauseTimer is active
- QDeclarativeAnimationTimer::ensureTimerUpdate();
+ QQmlAnimationTimer::ensureTimerUpdate();
setCurrentTime(m_totalCurrentTime);
}
}
@@ -378,14 +378,14 @@ void QAbstractAnimationJob::setDirection(Direction direction)
// the commands order below is important: first we need to setCurrentTime with the old direction,
// then update the direction on this and all children and finally restart the pauseTimer if needed
if (m_hasRegisteredTimer)
- QDeclarativeAnimationTimer::ensureTimerUpdate();
+ QQmlAnimationTimer::ensureTimerUpdate();
m_direction = direction;
updateDirection(direction);
if (m_hasRegisteredTimer)
// needed to update the timer interval in case of a pause animation
- QDeclarativeAnimationTimer::updateAnimationTimer();
+ QQmlAnimationTimer::updateAnimationTimer();
}
void QAbstractAnimationJob::setLoopCount(int loopCount)
diff --git a/src/declarative/animations/qabstractanimationjob_p.h b/src/qml/animations/qabstractanimationjob_p.h
index 675082f0b7..f00090cb30 100644
--- a/src/declarative/animations/qabstractanimationjob_p.h
+++ b/src/qml/animations/qabstractanimationjob_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -42,6 +42,7 @@
#ifndef QABSTRACTANIMATIONJOB_P_H
#define QABSTRACTANIMATIONJOB_P_H
+#include <QtQml/qtqmlglobal.h>
#include <QtCore/QObject>
#include <QtCore/private/qabstractanimation_p.h>
#include "private/qpodvector_p.h"
@@ -50,11 +51,11 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
class QAnimationGroupJob;
class QAnimationJobChangeListener;
-class Q_DECLARATIVE_EXPORT QAbstractAnimationJob
+class Q_QML_EXPORT QAbstractAnimationJob
{
Q_DISABLE_COPY(QAbstractAnimationJob)
public:
@@ -154,7 +155,7 @@ protected:
QAbstractAnimationJob *m_nextSibling;
QAbstractAnimationJob *m_previousSibling;
- friend class QDeclarativeAnimationTimer;
+ friend class QQmlAnimationTimer;
friend class QAnimationGroupJob;
};
@@ -166,15 +167,15 @@ public:
virtual void animationCurrentLoopChanged(QAbstractAnimationJob *) {}
};
-class Q_DECLARATIVE_EXPORT QDeclarativeAnimationTimer : public QAbstractAnimationTimer
+class Q_QML_EXPORT QQmlAnimationTimer : public QAbstractAnimationTimer
{
Q_OBJECT
private:
- QDeclarativeAnimationTimer();
+ QQmlAnimationTimer();
public:
- static QDeclarativeAnimationTimer *instance();
- static QDeclarativeAnimationTimer *instance(bool create);
+ static QQmlAnimationTimer *instance();
+ static QQmlAnimationTimer *instance(bool create);
static void registerAnimation(QAbstractAnimationJob *animation, bool isTopLevel);
static void unregisterAnimation(QAbstractAnimationJob *animation);
diff --git a/src/declarative/animations/qanimationgroupjob.cpp b/src/qml/animations/qanimationgroupjob.cpp
index 7e26f9778d..83b2192313 100644
--- a/src/declarative/animations/qanimationgroupjob.cpp
+++ b/src/qml/animations/qanimationgroupjob.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/animations/qanimationgroupjob_p.h b/src/qml/animations/qanimationgroupjob_p.h
index d1917a5249..303dc898d9 100644
--- a/src/declarative/animations/qanimationgroupjob_p.h
+++ b/src/qml/animations/qanimationgroupjob_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -48,9 +48,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
-class Q_DECLARATIVE_EXPORT QAnimationGroupJob : public QAbstractAnimationJob
+class Q_QML_EXPORT QAnimationGroupJob : public QAbstractAnimationJob
{
Q_DISABLE_COPY(QAnimationGroupJob)
public:
diff --git a/src/declarative/animations/qanimationjobutil_p.h b/src/qml/animations/qanimationjobutil_p.h
index b8a627e2da..c891b8725d 100644
--- a/src/declarative/animations/qanimationjobutil_p.h
+++ b/src/qml/animations/qanimationjobutil_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/animations/qparallelanimationgroupjob.cpp b/src/qml/animations/qparallelanimationgroupjob.cpp
index 5a417dccf4..0472c959f4 100644
--- a/src/declarative/animations/qparallelanimationgroupjob.cpp
+++ b/src/qml/animations/qparallelanimationgroupjob.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/animations/qparallelanimationgroupjob_p.h b/src/qml/animations/qparallelanimationgroupjob_p.h
index 42a96b50d5..d77a8c84f9 100644
--- a/src/declarative/animations/qparallelanimationgroupjob_p.h
+++ b/src/qml/animations/qparallelanimationgroupjob_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -48,9 +48,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
-class Q_DECLARATIVE_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob
+class Q_QML_EXPORT QParallelAnimationGroupJob : public QAnimationGroupJob
{
Q_DISABLE_COPY(QParallelAnimationGroupJob)
public:
diff --git a/src/declarative/animations/qpauseanimationjob.cpp b/src/qml/animations/qpauseanimationjob.cpp
index c362f5ab58..40bcef7e89 100644
--- a/src/declarative/animations/qpauseanimationjob.cpp
+++ b/src/qml/animations/qpauseanimationjob.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/animations/qpauseanimationjob_p.h b/src/qml/animations/qpauseanimationjob_p.h
index d4af832577..82462be101 100644
--- a/src/declarative/animations/qpauseanimationjob_p.h
+++ b/src/qml/animations/qpauseanimationjob_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -48,9 +48,9 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
-class Q_DECLARATIVE_EXPORT QPauseAnimationJob : public QAbstractAnimationJob
+class Q_QML_EXPORT QPauseAnimationJob : public QAbstractAnimationJob
{
Q_DISABLE_COPY(QPauseAnimationJob)
public:
diff --git a/src/declarative/animations/qsequentialanimationgroupjob.cpp b/src/qml/animations/qsequentialanimationgroupjob.cpp
index f999ca34d7..12cce39fbc 100644
--- a/src/declarative/animations/qsequentialanimationgroupjob.cpp
+++ b/src/qml/animations/qsequentialanimationgroupjob.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/animations/qsequentialanimationgroupjob_p.h b/src/qml/animations/qsequentialanimationgroupjob_p.h
index 4c1fb2d55a..b406d04f6f 100644
--- a/src/declarative/animations/qsequentialanimationgroupjob_p.h
+++ b/src/qml/animations/qsequentialanimationgroupjob_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -48,10 +48,10 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
class QPauseAnimationJob;
-class Q_DECLARATIVE_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob
+class Q_QML_EXPORT QSequentialAnimationGroupJob : public QAnimationGroupJob
{
Q_DISABLE_COPY(QSequentialAnimationGroupJob)
public:
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri
new file mode 100644
index 0000000000..10ca9706c4
--- /dev/null
+++ b/src/qml/debugger/debugger.pri
@@ -0,0 +1,32 @@
+SOURCES += \
+ $$PWD/qpacketprotocol.cpp \
+ $$PWD/qqmldebugservice.cpp \
+ $$PWD/qqmldebugclient.cpp \
+ $$PWD/qqmlenginedebug.cpp \
+ $$PWD/qqmlprofilerservice.cpp \
+ $$PWD/qqmldebughelper.cpp \
+ $$PWD/qqmldebugserver.cpp \
+ $$PWD/qqmlinspectorservice.cpp \
+ $$PWD/qv8debugservice.cpp \
+ $$PWD/qv8profilerservice.cpp \
+ $$PWD/qqmlenginedebugservice.cpp \
+ $$PWD/qdebugmessageservice.cpp
+
+HEADERS += \
+ $$PWD/qpacketprotocol_p.h \
+ $$PWD/qqmldebugservice_p.h \
+ $$PWD/qqmldebugservice_p_p.h \
+ $$PWD/qqmldebugclient_p.h \
+ $$PWD/qqmlenginedebug_p.h \
+ $$PWD/qqmlprofilerservice_p.h \
+ $$PWD/qqmldebughelper_p.h \
+ $$PWD/qqmldebugserver_p.h \
+ $$PWD/qqmldebugserverconnection_p.h \
+ $$PWD/qqmldebugstatesdelegate_p.h \
+ $$PWD/qqmlinspectorservice_p.h \
+ $$PWD/qqmlinspectorinterface_p.h \
+ $$PWD/qv8debugservice_p.h \
+ $$PWD/qv8profilerservice_p.h \
+ $$PWD/qqmlenginedebugservice_p.h \
+ $$PWD/qqmldebug.h \
+ $$PWD/qdebugmessageservice_p.h
diff --git a/src/declarative/debugger/qdebugmessageservice.cpp b/src/qml/debugger/qdebugmessageservice.cpp
index 3f18a0fe4b..2c52809e56 100644
--- a/src/declarative/debugger/qdebugmessageservice.cpp
+++ b/src/qml/debugger/qdebugmessageservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -40,11 +40,11 @@
****************************************************************************/
#include "qdebugmessageservice_p.h"
-#include "qdeclarativedebugservice_p_p.h"
+#include "qqmldebugservice_p_p.h"
QT_BEGIN_NAMESPACE
-Q_GLOBAL_STATIC(QDebugMessageService, declarativeDebugMessageService)
+Q_GLOBAL_STATIC(QDebugMessageService, qmlDebugMessageService)
void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
const char *buf)
@@ -52,21 +52,21 @@ void DebugMessageHandler(QtMsgType type, const QMessageLogContext &ctxt,
QDebugMessageService::instance()->sendDebugMessage(type, ctxt, buf);
}
-class QDebugMessageServicePrivate : public QDeclarativeDebugServicePrivate
+class QDebugMessageServicePrivate : public QQmlDebugServicePrivate
{
public:
QDebugMessageServicePrivate()
: oldMsgHandler(0)
- , prevState(QDeclarativeDebugService::NotConnected)
+ , prevState(QQmlDebugService::NotConnected)
{
}
QMessageHandler oldMsgHandler;
- QDeclarativeDebugService::State prevState;
+ QQmlDebugService::State prevState;
};
QDebugMessageService::QDebugMessageService(QObject *parent) :
- QDeclarativeDebugService(*(new QDebugMessageServicePrivate()),
+ QQmlDebugService(*(new QDebugMessageServicePrivate()),
QLatin1String("DebugMessages"), 2, parent)
{
Q_D(QDebugMessageService);
@@ -80,7 +80,7 @@ QDebugMessageService::QDebugMessageService(QObject *parent) :
QDebugMessageService *QDebugMessageService::instance()
{
- return declarativeDebugMessageService();
+ return qmlDebugMessageService();
}
void QDebugMessageService::sendDebugMessage(QtMsgType type,
diff --git a/src/declarative/debugger/qdebugmessageservice_p.h b/src/qml/debugger/qdebugmessageservice_p.h
index b907341541..88b918e217 100644
--- a/src/declarative/debugger/qdebugmessageservice_p.h
+++ b/src/qml/debugger/qdebugmessageservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "qdeclarativedebugservice_p.h"
+#include "qqmldebugservice_p.h"
#include <QtCore/qlogging.h>
@@ -61,11 +61,11 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-QT_MODULE(Declarative)
+QT_MODULE(Qml)
class QDebugMessageServicePrivate;
-class QDebugMessageService : public QDeclarativeDebugService
+class QDebugMessageService : public QQmlDebugService
{
Q_OBJECT
public:
diff --git a/src/declarative/debugger/qpacketprotocol.cpp b/src/qml/debugger/qpacketprotocol.cpp
index fa5d676e0a..978054a238 100644
--- a/src/declarative/debugger/qpacketprotocol.cpp
+++ b/src/qml/debugger/qpacketprotocol.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/debugger/qpacketprotocol_p.h b/src/qml/debugger/qpacketprotocol_p.h
index eda7bfbac9..c6123d2836 100644
--- a/src/declarative/debugger/qpacketprotocol_p.h
+++ b/src/qml/debugger/qpacketprotocol_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -56,7 +56,7 @@
#include <QtCore/qobject.h>
#include <QtCore/qdatastream.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtqmlglobal_p.h>
QT_BEGIN_HEADER
@@ -69,7 +69,7 @@ class QPacket;
class QPacketAutoSend;
class QPacketProtocolPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacketProtocol : public QObject
+class Q_QML_PRIVATE_EXPORT QPacketProtocol : public QObject
{
Q_OBJECT
public:
@@ -101,7 +101,7 @@ private:
};
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacket : public QDataStream
+class Q_QML_PRIVATE_EXPORT QPacket : public QDataStream
{
public:
QPacket();
@@ -119,7 +119,7 @@ protected:
QBuffer *buf;
};
-class Q_DECLARATIVE_PRIVATE_EXPORT QPacketAutoSend : public QPacket
+class Q_QML_PRIVATE_EXPORT QPacketAutoSend : public QPacket
{
public:
virtual ~QPacketAutoSend();
diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/qml/debugger/qqmldebug.h
index e23e4ff41a..8036032150 100644
--- a/src/declarative/debugger/qdeclarativedebug.h
+++ b/src/qml/debugger/qqmldebug.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,28 +39,28 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUG_H
-#define QDECLARATIVEDEBUG_H
+#ifndef QQMLDEBUG_H
+#define QQMLDEBUG_H
-#include <QtCore/qglobal.h>
+#include <QtQml/qtqmlglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-struct Q_DECLARATIVE_EXPORT QDeclarativeDebuggingEnabler
+struct Q_QML_EXPORT QQmlDebuggingEnabler
{
- QDeclarativeDebuggingEnabler();
+ QQmlDebuggingEnabler();
};
-// Execute code in constructor before first QDeclarativeEngine is instantiated
+// Execute code in constructor before first QQmlEngine is instantiated
#if defined(QT_DECLARATIVE_DEBUG)
-static QDeclarativeDebuggingEnabler qmlEnableDebuggingHelper;
+static QQmlDebuggingEnabler qmlEnableDebuggingHelper;
#endif
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUG_H
+#endif // QQMLDEBUG_H
diff --git a/src/declarative/debugger/qdeclarativedebugclient.cpp b/src/qml/debugger/qqmldebugclient.cpp
index df250f3ef6..12276b48fa 100644
--- a/src/declarative/debugger/qdeclarativedebugclient.cpp
+++ b/src/qml/debugger/qqmldebugclient.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qdeclarativedebugclient_p.h"
+#include "qqmldebugclient_p.h"
#include "qpacketprotocol_p.h"
@@ -52,31 +52,31 @@
QT_BEGIN_NAMESPACE
const int protocolVersion = 1;
-const QString serverId = QLatin1String("QDeclarativeDebugServer");
-const QString clientId = QLatin1String("QDeclarativeDebugClient");
+const QString serverId = QLatin1String("QQmlDebugServer");
+const QString clientId = QLatin1String("QQmlDebugClient");
-class QDeclarativeDebugClientPrivate : public QObjectPrivate
+class QQmlDebugClientPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QDeclarativeDebugClient)
+ Q_DECLARE_PUBLIC(QQmlDebugClient)
public:
- QDeclarativeDebugClientPrivate();
+ QQmlDebugClientPrivate();
QString name;
- QDeclarativeDebugConnection *connection;
+ QQmlDebugConnection *connection;
};
-class QDeclarativeDebugConnectionPrivate : public QObject
+class QQmlDebugConnectionPrivate : public QObject
{
Q_OBJECT
public:
- QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c);
- QDeclarativeDebugConnection *q;
+ QQmlDebugConnectionPrivate(QQmlDebugConnection *c);
+ QQmlDebugConnection *q;
QPacketProtocol *protocol;
QIODevice *device;
bool gotHello;
QHash <QString, float> serverPlugins;
- QHash<QString, QDeclarativeDebugClient *> plugins;
+ QHash<QString, QQmlDebugClient *> plugins;
void advertisePlugins();
void connectDeviceSignals();
@@ -87,7 +87,7 @@ public Q_SLOTS:
void deviceAboutToClose();
};
-QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarativeDebugConnection *c)
+QQmlDebugConnectionPrivate::QQmlDebugConnectionPrivate(QQmlDebugConnection *c)
: QObject(c), q(c), protocol(0), device(0), gotHello(false)
{
protocol = new QPacketProtocol(q, this);
@@ -95,7 +95,7 @@ QDeclarativeDebugConnectionPrivate::QDeclarativeDebugConnectionPrivate(QDeclarat
QObject::connect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
}
-void QDeclarativeDebugConnectionPrivate::advertisePlugins()
+void QQmlDebugConnectionPrivate::advertisePlugins()
{
if (!q->isConnected())
return;
@@ -106,7 +106,7 @@ void QDeclarativeDebugConnectionPrivate::advertisePlugins()
q->flush();
}
-void QDeclarativeDebugConnectionPrivate::connected()
+void QQmlDebugConnectionPrivate::connected()
{
QPacket pack;
pack << serverId << 0 << protocolVersion << plugins.keys();
@@ -114,7 +114,7 @@ void QDeclarativeDebugConnectionPrivate::connected()
q->flush();
}
-void QDeclarativeDebugConnectionPrivate::readyRead()
+void QQmlDebugConnectionPrivate::readyRead()
{
if (!gotHello) {
QPacket pack = protocol->read();
@@ -151,17 +151,17 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
}
if (!validHello) {
- qWarning("QDeclarativeDebugConnection: Invalid hello message");
+ qWarning("QQmlDebugConnection: Invalid hello message");
QObject::disconnect(protocol, SIGNAL(readyRead()), this, SLOT(readyRead()));
return;
}
gotHello = true;
- QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+ QHash<QString, QQmlDebugClient *>::Iterator iter = plugins.begin();
for (; iter != plugins.end(); ++iter) {
- QDeclarativeDebugClient::State newState = QDeclarativeDebugClient::Unavailable;
+ QQmlDebugClient::State newState = QQmlDebugClient::Unavailable;
if (serverPlugins.contains(iter.key()))
- newState = QDeclarativeDebugClient::Enabled;
+ newState = QQmlDebugClient::Enabled;
iter.value()->stateChanged(newState);
}
}
@@ -195,12 +195,12 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
serverPlugins.insert(pluginNames.at(i), pluginVersion);
}
- QHash<QString, QDeclarativeDebugClient *>::Iterator iter = plugins.begin();
+ QHash<QString, QQmlDebugClient *>::Iterator iter = plugins.begin();
for (; iter != plugins.end(); ++iter) {
const QString pluginName = iter.key();
- QDeclarativeDebugClient::State newSate = QDeclarativeDebugClient::Unavailable;
+ QQmlDebugClient::State newSate = QQmlDebugClient::Unavailable;
if (serverPlugins.contains(pluginName))
- newSate = QDeclarativeDebugClient::Enabled;
+ newSate = QQmlDebugClient::Enabled;
if (oldServerPlugins.contains(pluginName)
!= serverPlugins.contains(pluginName)) {
@@ -208,16 +208,16 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
}
}
} else {
- qWarning() << "QDeclarativeDebugConnection: Unknown control message id" << op;
+ qWarning() << "QQmlDebugConnection: Unknown control message id" << op;
}
} else {
QByteArray message;
pack >> message;
- QHash<QString, QDeclarativeDebugClient *>::Iterator iter =
+ QHash<QString, QQmlDebugClient *>::Iterator iter =
plugins.find(name);
if (iter == plugins.end()) {
- qWarning() << "QDeclarativeDebugConnection: Message received for missing plugin" << name;
+ qWarning() << "QQmlDebugConnection: Message received for missing plugin" << name;
} else {
(*iter)->messageReceived(message);
}
@@ -225,67 +225,67 @@ void QDeclarativeDebugConnectionPrivate::readyRead()
}
}
-void QDeclarativeDebugConnectionPrivate::deviceAboutToClose()
+void QQmlDebugConnectionPrivate::deviceAboutToClose()
{
// This is nasty syntax but we want to emit our own aboutToClose signal (by calling QIODevice::close())
// without calling the underlying device close fn as that would cause an infinite loop
q->QIODevice::close();
}
-QDeclarativeDebugConnection::QDeclarativeDebugConnection(QObject *parent)
- : QIODevice(parent), d(new QDeclarativeDebugConnectionPrivate(this))
+QQmlDebugConnection::QQmlDebugConnection(QObject *parent)
+ : QIODevice(parent), d(new QQmlDebugConnectionPrivate(this))
{
}
-QDeclarativeDebugConnection::~QDeclarativeDebugConnection()
+QQmlDebugConnection::~QQmlDebugConnection()
{
- QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+ QHash<QString, QQmlDebugClient*>::iterator iter = d->plugins.begin();
for (; iter != d->plugins.end(); ++iter) {
iter.value()->d_func()->connection = 0;
- iter.value()->stateChanged(QDeclarativeDebugClient::NotConnected);
+ iter.value()->stateChanged(QQmlDebugClient::NotConnected);
}
}
-bool QDeclarativeDebugConnection::isConnected() const
+bool QQmlDebugConnection::isConnected() const
{
return state() == QAbstractSocket::ConnectedState;
}
-qint64 QDeclarativeDebugConnection::readData(char *data, qint64 maxSize)
+qint64 QQmlDebugConnection::readData(char *data, qint64 maxSize)
{
return d->device->read(data, maxSize);
}
-qint64 QDeclarativeDebugConnection::writeData(const char *data, qint64 maxSize)
+qint64 QQmlDebugConnection::writeData(const char *data, qint64 maxSize)
{
return d->device->write(data, maxSize);
}
-qint64 QDeclarativeDebugConnection::bytesAvailable() const
+qint64 QQmlDebugConnection::bytesAvailable() const
{
return d->device->bytesAvailable();
}
-bool QDeclarativeDebugConnection::isSequential() const
+bool QQmlDebugConnection::isSequential() const
{
return true;
}
-void QDeclarativeDebugConnection::close()
+void QQmlDebugConnection::close()
{
if (isOpen()) {
QIODevice::close();
d->device->close();
emit stateChanged(QAbstractSocket::UnconnectedState);
- QHash<QString, QDeclarativeDebugClient*>::iterator iter = d->plugins.begin();
+ QHash<QString, QQmlDebugClient*>::iterator iter = d->plugins.begin();
for (; iter != d->plugins.end(); ++iter) {
- iter.value()->stateChanged(QDeclarativeDebugClient::NotConnected);
+ iter.value()->stateChanged(QQmlDebugClient::NotConnected);
}
}
}
-bool QDeclarativeDebugConnection::waitForConnected(int msecs)
+bool QQmlDebugConnection::waitForConnected(int msecs)
{
QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
if (socket)
@@ -293,7 +293,7 @@ bool QDeclarativeDebugConnection::waitForConnected(int msecs)
return false;
}
-QAbstractSocket::SocketState QDeclarativeDebugConnection::state() const
+QAbstractSocket::SocketState QQmlDebugConnection::state() const
{
QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
if (socket)
@@ -302,7 +302,7 @@ QAbstractSocket::SocketState QDeclarativeDebugConnection::state() const
return QAbstractSocket::UnconnectedState;
}
-void QDeclarativeDebugConnection::flush()
+void QQmlDebugConnection::flush()
{
QAbstractSocket *socket = qobject_cast<QAbstractSocket*>(d->device);
if (socket) {
@@ -311,7 +311,7 @@ void QDeclarativeDebugConnection::flush()
}
}
-void QDeclarativeDebugConnection::connectToHost(const QString &hostName, quint16 port)
+void QQmlDebugConnection::connectToHost(const QString &hostName, quint16 port)
{
QTcpSocket *socket = new QTcpSocket(d);
socket->setProxy(QNetworkProxy::NoProxy);
@@ -325,7 +325,7 @@ void QDeclarativeDebugConnection::connectToHost(const QString &hostName, quint16
QIODevice::open(ReadWrite | Unbuffered);
}
-void QDeclarativeDebugConnectionPrivate::connectDeviceSignals()
+void QQmlDebugConnectionPrivate::connectDeviceSignals()
{
connect(device, SIGNAL(bytesWritten(qint64)), q, SIGNAL(bytesWritten(qint64)));
connect(device, SIGNAL(readyRead()), q, SIGNAL(readyRead()));
@@ -334,16 +334,16 @@ void QDeclarativeDebugConnectionPrivate::connectDeviceSignals()
//
-QDeclarativeDebugClientPrivate::QDeclarativeDebugClientPrivate()
+QQmlDebugClientPrivate::QQmlDebugClientPrivate()
: connection(0)
{
}
-QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
- QDeclarativeDebugConnection *parent)
- : QObject(*(new QDeclarativeDebugClientPrivate), parent)
+QQmlDebugClient::QQmlDebugClient(const QString &name,
+ QQmlDebugConnection *parent)
+ : QObject(*(new QQmlDebugClientPrivate), parent)
{
- Q_D(QDeclarativeDebugClient);
+ Q_D(QQmlDebugClient);
d->name = name;
d->connection = parent;
@@ -351,7 +351,7 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
return;
if (d->connection->d->plugins.contains(name)) {
- qWarning() << "QDeclarativeDebugClient: Conflicting plugin name" << name;
+ qWarning() << "QQmlDebugClient: Conflicting plugin name" << name;
d->connection = 0;
} else {
d->connection->d->plugins.insert(name, this);
@@ -359,32 +359,32 @@ QDeclarativeDebugClient::QDeclarativeDebugClient(const QString &name,
}
}
-QDeclarativeDebugClient::~QDeclarativeDebugClient()
+QQmlDebugClient::~QQmlDebugClient()
{
- Q_D(QDeclarativeDebugClient);
+ Q_D(QQmlDebugClient);
if (d->connection && d->connection->d) {
d->connection->d->plugins.remove(d->name);
d->connection->d->advertisePlugins();
}
}
-QString QDeclarativeDebugClient::name() const
+QString QQmlDebugClient::name() const
{
- Q_D(const QDeclarativeDebugClient);
+ Q_D(const QQmlDebugClient);
return d->name;
}
-float QDeclarativeDebugClient::serviceVersion() const
+float QQmlDebugClient::serviceVersion() const
{
- Q_D(const QDeclarativeDebugClient);
+ Q_D(const QQmlDebugClient);
if (d->connection->d->serverPlugins.contains(d->name))
return d->connection->d->serverPlugins.value(d->name);
return -1;
}
-QDeclarativeDebugClient::State QDeclarativeDebugClient::state() const
+QQmlDebugClient::State QQmlDebugClient::state() const
{
- Q_D(const QDeclarativeDebugClient);
+ Q_D(const QQmlDebugClient);
if (!d->connection
|| !d->connection->isConnected()
|| !d->connection->d->gotHello)
@@ -396,9 +396,9 @@ QDeclarativeDebugClient::State QDeclarativeDebugClient::state() const
return Unavailable;
}
-void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
+void QQmlDebugClient::sendMessage(const QByteArray &message)
{
- Q_D(QDeclarativeDebugClient);
+ Q_D(QQmlDebugClient);
if (state() != Enabled)
return;
@@ -408,14 +408,14 @@ void QDeclarativeDebugClient::sendMessage(const QByteArray &message)
d->connection->flush();
}
-void QDeclarativeDebugClient::stateChanged(State)
+void QQmlDebugClient::stateChanged(State)
{
}
-void QDeclarativeDebugClient::messageReceived(const QByteArray &)
+void QQmlDebugClient::messageReceived(const QByteArray &)
{
}
QT_END_NAMESPACE
-#include <qdeclarativedebugclient.moc>
+#include <qqmldebugclient.moc>
diff --git a/src/declarative/debugger/qdeclarativedebugclient_p.h b/src/qml/debugger/qqmldebugclient_p.h
index 93c5be9e44..064e15cf49 100644
--- a/src/declarative/debugger/qdeclarativedebugclient_p.h
+++ b/src/qml/debugger/qqmldebugclient_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGCLIENT_H
-#define QDECLARATIVEDEBUGCLIENT_H
+#ifndef QQMLDEBUGCLIENT_H
+#define QQMLDEBUGCLIENT_H
//
// W A R N I N G
@@ -55,21 +55,21 @@
#include <QtNetwork/qtcpsocket.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtqmlglobal_p.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugConnectionPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugConnection : public QIODevice
+class QQmlDebugConnectionPrivate;
+class Q_QML_PRIVATE_EXPORT QQmlDebugConnection : public QIODevice
{
Q_OBJECT
- Q_DISABLE_COPY(QDeclarativeDebugConnection)
+ Q_DISABLE_COPY(QQmlDebugConnection)
public:
- QDeclarativeDebugConnection(QObject * = 0);
- ~QDeclarativeDebugConnection();
+ QQmlDebugConnection(QObject * = 0);
+ ~QQmlDebugConnection();
void connectToHost(const QString &hostName, quint16 port);
@@ -91,23 +91,23 @@ protected:
qint64 writeData(const char *data, qint64 maxSize);
private:
- QDeclarativeDebugConnectionPrivate *d;
- friend class QDeclarativeDebugClient;
- friend class QDeclarativeDebugClientPrivate;
+ QQmlDebugConnectionPrivate *d;
+ friend class QQmlDebugClient;
+ friend class QQmlDebugClientPrivate;
};
-class QDeclarativeDebugClientPrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugClient : public QObject
+class QQmlDebugClientPrivate;
+class Q_QML_PRIVATE_EXPORT QQmlDebugClient : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QDeclarativeDebugClient)
- Q_DISABLE_COPY(QDeclarativeDebugClient)
+ Q_DECLARE_PRIVATE(QQmlDebugClient)
+ Q_DISABLE_COPY(QQmlDebugClient)
public:
enum State { NotConnected, Unavailable, Enabled };
- QDeclarativeDebugClient(const QString &, QDeclarativeDebugConnection *parent);
- ~QDeclarativeDebugClient();
+ QQmlDebugClient(const QString &, QQmlDebugConnection *parent);
+ ~QQmlDebugClient();
QString name() const;
float serviceVersion() const;
@@ -120,12 +120,12 @@ protected:
virtual void messageReceived(const QByteArray &);
private:
- friend class QDeclarativeDebugConnection;
- friend class QDeclarativeDebugConnectionPrivate;
+ friend class QQmlDebugConnection;
+ friend class QQmlDebugConnectionPrivate;
};
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGCLIENT_H
+#endif // QQMLDEBUGCLIENT_H
diff --git a/src/declarative/debugger/qdeclarativedebughelper.cpp b/src/qml/debugger/qqmldebughelper.cpp
index 45d488fe1b..7158b3609d 100644
--- a/src/declarative/debugger/qdeclarativedebughelper.cpp
+++ b/src/qml/debugger/qqmldebughelper.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,31 +39,31 @@
**
****************************************************************************/
-#include "qdeclarativedebughelper_p.h"
+#include "qqmldebughelper_p.h"
#include <QtCore/QAbstractAnimation>
-#include <QtDeclarative/QJSEngine>
+#include <QtQml/QJSEngine>
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
#include <private/qabstractanimation_p.h>
-#include <private/qdeclarativeengine_p.h>
+#include <private/qqmlengine_p.h>
QT_BEGIN_NAMESPACE
-void QDeclarativeDebugHelper::setAnimationSlowDownFactor(qreal factor)
+void QQmlDebugHelper::setAnimationSlowDownFactor(qreal factor)
{
QUnifiedTimer *timer = QUnifiedTimer::instance();
timer->setSlowModeEnabled(factor != 1.0);
timer->setSlowdownFactor(factor);
}
-void QDeclarativeDebugHelper::enableDebugging() {
- qWarning("QDeclarativeDebugHelper::enableDebugging() is deprecated! Add CONFIG += declarative_debug to your .pro file instead.");
-#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
- if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+void QQmlDebugHelper::enableDebugging() {
+ qWarning("QQmlDebugHelper::enableDebugging() is deprecated! Add CONFIG += declarative_debug to your .pro file instead.");
+#ifndef QQML_NO_DEBUG_PROTOCOL
+ if (!QQmlEnginePrivate::qml_debugging_enabled) {
qWarning("Qml debugging is enabled. Only use this in a safe environment!");
}
- QDeclarativeEnginePrivate::qml_debugging_enabled = true;
+ QQmlEnginePrivate::qml_debugging_enabled = true;
#endif
}
diff --git a/src/declarative/debugger/qdeclarativedebughelper_p.h b/src/qml/debugger/qqmldebughelper_p.h
index d24bc8c19f..5d2bcc2be0 100644
--- a/src/declarative/debugger/qdeclarativedebughelper_p.h
+++ b/src/qml/debugger/qqmldebughelper_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,12 +39,10 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGHELPER_P_H
-#define QDECLARATIVEDEBUGHELPER_P_H
+#ifndef QQMLDEBUGHELPER_P_H
+#define QQMLDEBUGHELPER_P_H
-#include <QtCore/qglobal.h>
-
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtqmlglobal_p.h>
//
// W A R N I N G
@@ -61,15 +59,15 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeEngine;
+class QQmlEngine;
-#ifndef QT_BUILD_DECLARATIVE_LIB
+#ifndef QT_BUILD_QML_LIB
#warning Use of this header file is deprecated! Add CONFIG += declarative_debug to your .pro file instead.
#endif
// Helper methods to access private API through a stable interface
// This is used in the qmljsdebugger library of QtCreator.
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugHelper
+class Q_QML_EXPORT QQmlDebugHelper
{
public:
static void setAnimationSlowDownFactor(qreal factor);
@@ -83,4 +81,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGHELPER_P_H
+#endif // QQMLDEBUGHELPER_P_H
diff --git a/src/declarative/debugger/qdeclarativedebugserver.cpp b/src/qml/debugger/qqmldebugserver.cpp
index 482847c7a7..8d5c597a78 100644
--- a/src/declarative/debugger/qdeclarativedebugserver.cpp
+++ b/src/qml/debugger/qqmldebugserver.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,10 +39,11 @@
**
****************************************************************************/
-#include "qdeclarativedebugserver_p.h"
-#include "qdeclarativedebugservice_p.h"
-#include "qdeclarativedebugservice_p_p.h"
-#include <private/qdeclarativeengine_p.h>
+#include "qqmldebugserver_p.h"
+#include "qqmldebugservice_p.h"
+#include "qqmldebugservice_p_p.h"
+#include <private/qqmlengine_p.h>
+#include <private/qqmlglobal_p.h>
#include <QtCore/QDir>
#include <QtCore/QPluginLoader>
@@ -55,25 +56,25 @@
QT_BEGIN_NAMESPACE
/*
- QDeclarativeDebug Protocol (Version 1):
+ QQmlDebug Protocol (Version 1):
handshake:
1. Client sends
- "QDeclarativeDebugServer" 0 version pluginNames
+ "QQmlDebugServer" 0 version pluginNames
version: an int representing the highest protocol version the client knows
pluginNames: plugins available on client side
2. Server sends
- "QDeclarativeDebugClient" 0 version pluginNames pluginVersions
+ "QQmlDebugClient" 0 version pluginNames pluginVersions
version: an int representing the highest protocol version the client & server know
pluginNames: plugins available on server side. plugins both in the client and server message are enabled.
client plugin advertisement
1. Client sends
- "QDeclarativeDebugServer" 1 pluginNames
+ "QQmlDebugServer" 1 pluginNames
server plugin advertisement
1. Server sends
- "QDeclarativeDebugClient" 1 pluginNames pluginVersions
+ "QQmlDebugClient" 1 pluginNames pluginVersions
plugin communication:
- Everything send with a header different to "QDeclarativeDebugServer" is sent to the appropriate plugin.
+ Everything send with a header different to "QQmlDebugServer" is sent to the appropriate plugin.
*/
const int protocolVersion = 1;
@@ -81,19 +82,19 @@ const int protocolVersion = 1;
// print detailed information about loading of plugins
DEFINE_BOOL_CONFIG_OPTION(qmlDebugVerbose, QML_DEBUGGER_VERBOSE)
-class QDeclarativeDebugServerThread;
+class QQmlDebugServerThread;
-class QDeclarativeDebugServerPrivate : public QObjectPrivate
+class QQmlDebugServerPrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QDeclarativeDebugServer)
+ Q_DECLARE_PUBLIC(QQmlDebugServer)
public:
- QDeclarativeDebugServerPrivate();
+ QQmlDebugServerPrivate();
void advertisePlugins();
- QDeclarativeDebugServerConnection *loadConnectionPlugin(const QString &pluginName);
+ QQmlDebugServerConnection *loadConnectionPlugin(const QString &pluginName);
- QDeclarativeDebugServerConnection *connection;
- QHash<QString, QDeclarativeDebugService *> plugins;
+ QQmlDebugServerConnection *connection;
+ QHash<QString, QQmlDebugService *> plugins;
mutable QReadWriteLock pluginsLock;
QStringList clientPlugins;
bool gotHello;
@@ -101,7 +102,7 @@ public:
QMutex messageArrivedMutex;
QWaitCondition messageArrivedCondition;
QStringList waitingForMessageNames;
- QDeclarativeDebugServerThread *thread;
+ QQmlDebugServerThread *thread;
QPluginLoader loader;
private:
@@ -109,7 +110,7 @@ private:
void _q_sendMessages(const QList<QByteArray> &messages);
};
-class QDeclarativeDebugServerThread : public QThread
+class QQmlDebugServerThread : public QThread
{
public:
void setPluginName(const QString &pluginName) {
@@ -129,7 +130,7 @@ private:
bool m_block;
};
-QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate() :
+QQmlDebugServerPrivate::QQmlDebugServerPrivate() :
connection(0),
gotHello(false),
thread(0)
@@ -138,9 +139,9 @@ QDeclarativeDebugServerPrivate::QDeclarativeDebugServerPrivate() :
qRegisterMetaType<QList<QByteArray> >("QList<QByteArray>");
}
-void QDeclarativeDebugServerPrivate::advertisePlugins()
+void QQmlDebugServerPrivate::advertisePlugins()
{
- Q_Q(QDeclarativeDebugServer);
+ Q_Q(QQmlDebugServer);
if (!gotHello)
return;
@@ -150,17 +151,17 @@ void QDeclarativeDebugServerPrivate::advertisePlugins()
QDataStream out(&message, QIODevice::WriteOnly);
QStringList pluginNames;
QList<float> pluginVersions;
- foreach (QDeclarativeDebugService *service, plugins.values()) {
+ foreach (QQmlDebugService *service, plugins.values()) {
pluginNames << service->name();
pluginVersions << service->version();
}
- out << QString(QLatin1String("QDeclarativeDebugClient")) << 1 << pluginNames << pluginVersions;
+ out << QString(QLatin1String("QQmlDebugClient")) << 1 << pluginNames << pluginVersions;
}
QMetaObject::invokeMethod(q, "_q_sendMessages", Qt::QueuedConnection, Q_ARG(QList<QByteArray>, QList<QByteArray>() << message));
}
-QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectionPlugin(
+QQmlDebugServerConnection *QQmlDebugServerPrivate::loadConnectionPlugin(
const QString &pluginName)
{
#ifndef QT_NO_LIBRARY
@@ -179,26 +180,26 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
foreach (const QString &pluginPath, pluginCandidates) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeDebugServer: Trying to load plugin " << pluginPath << "...";
+ qDebug() << "QQmlDebugServer: Trying to load plugin " << pluginPath << "...";
loader.setFileName(pluginPath);
if (!loader.load()) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeDebugServer: Error while loading: " << loader.errorString();
+ qDebug() << "QQmlDebugServer: Error while loading: " << loader.errorString();
continue;
}
if (QObject *instance = loader.instance())
- connection = qobject_cast<QDeclarativeDebugServerConnection*>(instance);
+ connection = qobject_cast<QQmlDebugServerConnection*>(instance);
if (connection) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeDebugServer: Plugin successfully loaded.";
+ qDebug() << "QQmlDebugServer: Plugin successfully loaded.";
return connection;
}
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeDebugServer: Plugin does not implement interface QDeclarativeDebugServerConnection.";
+ qDebug() << "QQmlDebugServer: Plugin does not implement interface QQmlDebugServerConnection.";
loader.unload();
}
@@ -206,17 +207,17 @@ QDeclarativeDebugServerConnection *QDeclarativeDebugServerPrivate::loadConnectio
return 0;
}
-void QDeclarativeDebugServerThread::run()
+void QQmlDebugServerThread::run()
{
- QDeclarativeDebugServer *server = QDeclarativeDebugServer::instance();
- QDeclarativeDebugServerConnection *connection
+ QQmlDebugServer *server = QQmlDebugServer::instance();
+ QQmlDebugServerConnection *connection
= server->d_func()->loadConnectionPlugin(m_pluginName);
if (connection) {
- connection->setServer(QDeclarativeDebugServer::instance());
+ connection->setServer(QQmlDebugServer::instance());
connection->setPort(m_port, m_block);
} else {
QCoreApplicationPrivate *appD = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp));
- qWarning() << QString::fromAscii("QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+ qWarning() << QString::fromAscii("QQmlDebugServer: Ignoring \"-qmljsdebugger=%1\". "
"Remote debugger plugin has not been found.").arg(appD->qmljsDebugArgumentsString());
}
@@ -227,24 +228,24 @@ void QDeclarativeDebugServerThread::run()
eventLoop.processEvents(QEventLoop::AllEvents);
}
-bool QDeclarativeDebugServer::hasDebuggingClient() const
+bool QQmlDebugServer::hasDebuggingClient() const
{
- Q_D(const QDeclarativeDebugServer);
+ Q_D(const QQmlDebugServer);
return d->connection
&& d->connection->isConnected()
&& d->gotHello;
}
-static QDeclarativeDebugServer *qDeclarativeDebugServer = 0;
+static QQmlDebugServer *qQmlDebugServer = 0;
static void cleanup()
{
- delete qDeclarativeDebugServer;
- qDeclarativeDebugServer = 0;
+ delete qQmlDebugServer;
+ qQmlDebugServer = 0;
}
-QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
+QQmlDebugServer *QQmlDebugServer::instance()
{
static bool commandLineTested = false;
@@ -252,7 +253,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
commandLineTested = true;
QCoreApplicationPrivate *appD = static_cast<QCoreApplicationPrivate*>(QObjectPrivate::get(qApp));
-#ifndef QDECLARATIVE_NO_DEBUG_PROTOCOL
+#ifndef QQML_NO_DEBUG_PROTOCOL
// ### remove port definition when protocol is changed
int port = 0;
bool block = false;
@@ -260,9 +261,9 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
// format: qmljsdebugger=port:3768[,block] OR qmljsdebugger=ost[,block]
if (!appD->qmljsDebugArgumentsString().isEmpty()) {
- if (!QDeclarativeEnginePrivate::qml_debugging_enabled) {
+ if (!QQmlEnginePrivate::qml_debugging_enabled) {
qWarning() << QString::fromLatin1(
- "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+ "QQmlDebugServer: Ignoring \"-qmljsdebugger=%1\". "
"Debugging has not been enabled.").arg(
appD->qmljsDebugArgumentsString());
return 0;
@@ -281,16 +282,16 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
block = appD->qmljsDebugArgumentsString().contains(QLatin1String("block"));
if (ok) {
- qDeclarativeDebugServer = new QDeclarativeDebugServer();
- QDeclarativeDebugServerThread *thread = new QDeclarativeDebugServerThread;
- qDeclarativeDebugServer->d_func()->thread = thread;
- qDeclarativeDebugServer->moveToThread(thread);
+ qQmlDebugServer = new QQmlDebugServer();
+ QQmlDebugServerThread *thread = new QQmlDebugServerThread;
+ qQmlDebugServer->d_func()->thread = thread;
+ qQmlDebugServer->moveToThread(thread);
thread->setPluginName(pluginName);
thread->setPort(port, block);
thread->start();
if (block) {
- QDeclarativeDebugServerPrivate *d = qDeclarativeDebugServer->d_func();
+ QQmlDebugServerPrivate *d = qQmlDebugServer->d_func();
d->messageArrivedMutex.lock();
d->messageArrivedCondition.wait(&d->messageArrivedMutex);
d->messageArrivedMutex.unlock();
@@ -298,7 +299,7 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
} else {
qWarning() << QString::fromLatin1(
- "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+ "QQmlDebugServer: Ignoring \"-qmljsdebugger=%1\". "
"Format is -qmljsdebugger=port:<port>[,block]").arg(
appD->qmljsDebugArgumentsString());
}
@@ -306,33 +307,33 @@ QDeclarativeDebugServer *QDeclarativeDebugServer::instance()
#else
if (!appD->qmljsDebugArgumentsString().isEmpty()) {
qWarning() << QString::fromLatin1(
- "QDeclarativeDebugServer: Ignoring \"-qmljsdebugger=%1\". "
- "QtDeclarative is not configured for debugging.").arg(
+ "QQmlDebugServer: Ignoring \"-qmljsdebugger=%1\". "
+ "QtQml is not configured for debugging.").arg(
appD->qmljsDebugArgumentsString());
}
#endif
}
- return qDeclarativeDebugServer;
+ return qQmlDebugServer;
}
-QDeclarativeDebugServer::QDeclarativeDebugServer()
- : QObject(*(new QDeclarativeDebugServerPrivate))
+QQmlDebugServer::QQmlDebugServer()
+ : QObject(*(new QQmlDebugServerPrivate))
{
qAddPostRoutine(cleanup);
}
-QDeclarativeDebugServer::~QDeclarativeDebugServer()
+QQmlDebugServer::~QQmlDebugServer()
{
- Q_D(QDeclarativeDebugServer);
+ Q_D(QQmlDebugServer);
QReadLocker(&d->pluginsLock);
{
- foreach (QDeclarativeDebugService *service, d->plugins.values()) {
- service->stateAboutToBeChanged(QDeclarativeDebugService::NotConnected);
+ foreach (QQmlDebugService *service, d->plugins.values()) {
+ service->stateAboutToBeChanged(QQmlDebugService::NotConnected);
service->d_func()->server = 0;
- service->d_func()->state = QDeclarativeDebugService::NotConnected;
- service->stateChanged(QDeclarativeDebugService::NotConnected);
+ service->d_func()->state = QQmlDebugService::NotConnected;
+ service->stateChanged(QQmlDebugService::NotConnected);
}
}
@@ -344,16 +345,16 @@ QDeclarativeDebugServer::~QDeclarativeDebugServer()
delete d->connection;
}
-void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
+void QQmlDebugServer::receiveMessage(const QByteArray &message)
{
- Q_D(QDeclarativeDebugServer);
+ Q_D(QQmlDebugServer);
QDataStream in(message);
QString name;
in >> name;
- if (name == QLatin1String("QDeclarativeDebugServer")) {
+ if (name == QLatin1String("QQmlDebugServer")) {
int op = -1;
in >> op;
if (op == 0) {
@@ -367,28 +368,28 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
QDataStream out(&helloAnswer, QIODevice::WriteOnly);
QStringList pluginNames;
QList<float> pluginVersions;
- foreach (QDeclarativeDebugService *service, d->plugins.values()) {
+ foreach (QQmlDebugService *service, d->plugins.values()) {
pluginNames << service->name();
pluginVersions << service->version();
}
- out << QString(QLatin1String("QDeclarativeDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions;
+ out << QString(QLatin1String("QQmlDebugClient")) << 0 << protocolVersion << pluginNames << pluginVersions;
}
d->connection->send(QList<QByteArray>() << helloAnswer);
d->gotHello = true;
QReadLocker(&d->pluginsLock);
- QHash<QString, QDeclarativeDebugService*>::ConstIterator iter = d->plugins.constBegin();
+ QHash<QString, QQmlDebugService*>::ConstIterator iter = d->plugins.constBegin();
for (; iter != d->plugins.constEnd(); ++iter) {
- QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
+ QQmlDebugService::State newState = QQmlDebugService::Unavailable;
if (d->clientPlugins.contains(iter.key()))
- newState = QDeclarativeDebugService::Enabled;
+ newState = QQmlDebugService::Enabled;
iter.value()->d_func()->state = newState;
iter.value()->stateChanged(newState);
}
- qWarning("QDeclarativeDebugServer: Connection established");
+ qWarning("QQmlDebugServer: Connection established");
d->messageArrivedCondition.wakeAll();
} else if (op == 1) {
@@ -398,12 +399,12 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
in >> d->clientPlugins;
QReadLocker(&d->pluginsLock);
- QHash<QString, QDeclarativeDebugService*>::ConstIterator iter = d->plugins.constBegin();
+ QHash<QString, QQmlDebugService*>::ConstIterator iter = d->plugins.constBegin();
for (; iter != d->plugins.constEnd(); ++iter) {
const QString pluginName = iter.key();
- QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
+ QQmlDebugService::State newState = QQmlDebugService::Unavailable;
if (d->clientPlugins.contains(pluginName))
- newState = QDeclarativeDebugService::Enabled;
+ newState = QQmlDebugService::Enabled;
if (oldClientPlugins.contains(pluginName)
!= d->clientPlugins.contains(pluginName)) {
@@ -413,7 +414,7 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
}
} else {
- qWarning("QDeclarativeDebugServer: Invalid control message %d", op);
+ qWarning("QQmlDebugServer: Invalid control message %d", op);
d->connection->disconnect();
return;
}
@@ -424,9 +425,9 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
in >> message;
QReadLocker(&d->pluginsLock);
- QHash<QString, QDeclarativeDebugService *>::Iterator iter = d->plugins.find(name);
+ QHash<QString, QQmlDebugService *>::Iterator iter = d->plugins.find(name);
if (iter == d->plugins.end()) {
- qWarning() << "QDeclarativeDebugServer: Message received for missing plugin" << name;
+ qWarning() << "QQmlDebugServer: Message received for missing plugin" << name;
} else {
(*iter)->messageReceived(message);
@@ -434,35 +435,35 @@ void QDeclarativeDebugServer::receiveMessage(const QByteArray &message)
d->messageArrivedCondition.wakeAll();
}
} else {
- qWarning("QDeclarativeDebugServer: Invalid hello message");
+ qWarning("QQmlDebugServer: Invalid hello message");
}
}
}
-void QDeclarativeDebugServerPrivate::_q_sendMessages(const QList<QByteArray> &messages)
+void QQmlDebugServerPrivate::_q_sendMessages(const QList<QByteArray> &messages)
{
if (connection)
connection->send(messages);
}
-QList<QDeclarativeDebugService*> QDeclarativeDebugServer::services() const
+QList<QQmlDebugService*> QQmlDebugServer::services() const
{
- const Q_D(QDeclarativeDebugServer);
+ const Q_D(QQmlDebugServer);
QReadLocker(&d->pluginsLock);
return d->plugins.values();
}
-QStringList QDeclarativeDebugServer::serviceNames() const
+QStringList QQmlDebugServer::serviceNames() const
{
- const Q_D(QDeclarativeDebugServer);
+ const Q_D(QQmlDebugServer);
QReadLocker(&d->pluginsLock);
return d->plugins.keys();
}
-bool QDeclarativeDebugServer::addService(QDeclarativeDebugService *service)
+bool QQmlDebugServer::addService(QQmlDebugService *service)
{
- Q_D(QDeclarativeDebugServer);
+ Q_D(QQmlDebugServer);
{
QWriteLocker(&d->pluginsLock);
if (!service || d->plugins.contains(service->name()))
@@ -472,17 +473,17 @@ bool QDeclarativeDebugServer::addService(QDeclarativeDebugService *service)
{
QReadLocker(&d->pluginsLock);
d->advertisePlugins();
- QDeclarativeDebugService::State newState = QDeclarativeDebugService::Unavailable;
+ QQmlDebugService::State newState = QQmlDebugService::Unavailable;
if (d->clientPlugins.contains(service->name()))
- newState = QDeclarativeDebugService::Enabled;
+ newState = QQmlDebugService::Enabled;
service->d_func()->state = newState;
}
return true;
}
-bool QDeclarativeDebugServer::removeService(QDeclarativeDebugService *service)
+bool QQmlDebugServer::removeService(QQmlDebugService *service)
{
- Q_D(QDeclarativeDebugServer);
+ Q_D(QQmlDebugServer);
{
QWriteLocker(&d->pluginsLock);
if (!service || !d->plugins.contains(service->name()))
@@ -491,7 +492,7 @@ bool QDeclarativeDebugServer::removeService(QDeclarativeDebugService *service)
}
{
QReadLocker(&d->pluginsLock);
- QDeclarativeDebugService::State newState = QDeclarativeDebugService::NotConnected;
+ QQmlDebugService::State newState = QQmlDebugService::NotConnected;
service->stateAboutToBeChanged(newState);
d->advertisePlugins();
service->d_func()->server = 0;
@@ -502,7 +503,7 @@ bool QDeclarativeDebugServer::removeService(QDeclarativeDebugService *service)
return true;
}
-void QDeclarativeDebugServer::sendMessages(QDeclarativeDebugService *service,
+void QQmlDebugServer::sendMessages(QQmlDebugService *service,
const QList<QByteArray> &messages)
{
QList<QByteArray> prefixedMessages;
@@ -516,9 +517,9 @@ void QDeclarativeDebugServer::sendMessages(QDeclarativeDebugService *service,
QMetaObject::invokeMethod(this, "_q_sendMessages", Qt::QueuedConnection, Q_ARG(QList<QByteArray>, prefixedMessages));
}
-bool QDeclarativeDebugServer::waitForMessage(QDeclarativeDebugService *service)
+bool QQmlDebugServer::waitForMessage(QQmlDebugService *service)
{
- Q_D(QDeclarativeDebugServer);
+ Q_D(QQmlDebugServer);
QReadLocker(&d->pluginsLock);
if (!service
@@ -536,4 +537,4 @@ bool QDeclarativeDebugServer::waitForMessage(QDeclarativeDebugService *service)
QT_END_NAMESPACE
-#include "moc_qdeclarativedebugserver_p.cpp"
+#include "moc_qqmldebugserver_p.cpp"
diff --git a/src/declarative/debugger/qdeclarativedebugserver_p.h b/src/qml/debugger/qqmldebugserver_p.h
index 8f7f748761..9c6b5435c8 100644
--- a/src/declarative/debugger/qdeclarativedebugserver_p.h
+++ b/src/qml/debugger/qqmldebugserver_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,11 +39,11 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGSERVER_H
-#define QDECLARATIVEDEBUGSERVER_H
+#ifndef QQMLDEBUGSERVER_H
+#define QQMLDEBUGSERVER_H
-#include <private/qdeclarativeglobal_p.h>
-#include <private/qdeclarativedebugserverconnection_p.h>
+#include <QtQml/qtqmlglobal.h>
+#include <private/qqmldebugserverconnection_p.h>
//
// W A R N I N G
@@ -61,40 +61,40 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugService;
+class QQmlDebugService;
-class QDeclarativeDebugServerPrivate;
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugServer : public QObject
+class QQmlDebugServerPrivate;
+class Q_QML_EXPORT QQmlDebugServer : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QDeclarativeDebugServer)
- Q_DISABLE_COPY(QDeclarativeDebugServer)
+ Q_DECLARE_PRIVATE(QQmlDebugServer)
+ Q_DISABLE_COPY(QQmlDebugServer)
public:
- ~QDeclarativeDebugServer();
+ ~QQmlDebugServer();
- static QDeclarativeDebugServer *instance();
+ static QQmlDebugServer *instance();
- void setConnection(QDeclarativeDebugServerConnection *connection);
+ void setConnection(QQmlDebugServerConnection *connection);
bool hasDebuggingClient() const;
- QList<QDeclarativeDebugService*> services() const;
+ QList<QQmlDebugService*> services() const;
QStringList serviceNames() const;
- bool addService(QDeclarativeDebugService *service);
- bool removeService(QDeclarativeDebugService *service);
+ bool addService(QQmlDebugService *service);
+ bool removeService(QQmlDebugService *service);
void receiveMessage(const QByteArray &message);
- bool waitForMessage(QDeclarativeDebugService *service);
- void sendMessages(QDeclarativeDebugService *service, const QList<QByteArray> &messages);
+ bool waitForMessage(QQmlDebugService *service);
+ void sendMessages(QQmlDebugService *service, const QList<QByteArray> &messages);
private:
- friend class QDeclarativeDebugService;
- friend class QDeclarativeDebugServicePrivate;
- friend class QDeclarativeDebugServerThread;
- QDeclarativeDebugServer();
+ friend class QQmlDebugService;
+ friend class QQmlDebugServicePrivate;
+ friend class QQmlDebugServerThread;
+ QQmlDebugServer();
Q_PRIVATE_SLOT(d_func(), void _q_sendMessages(QList<QByteArray>))
};
@@ -102,4 +102,4 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGSERVICE_H
+#endif // QQMLDEBUGSERVICE_H
diff --git a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h b/src/qml/debugger/qqmldebugserverconnection_p.h
index aa1c8aa0f1..c9092f1911 100644
--- a/src/declarative/debugger/qdeclarativedebugserverconnection_p.h
+++ b/src/qml/debugger/qqmldebugserverconnection_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,10 +39,11 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H
-#define QDECLARATIVEDEBUGSERVERCONNECTION_H
+#ifndef QQMLDEBUGSERVERCONNECTION_H
+#define QQMLDEBUGSERVERCONNECTION_H
-#include <private/qdeclarativeglobal_p.h>
+#include <QtQml/qtqmlglobal.h>
+#include <QtCore/QtPlugin>
//
// W A R N I N G
@@ -60,14 +61,14 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugServer;
-class Q_DECLARATIVE_EXPORT QDeclarativeDebugServerConnection
+class QQmlDebugServer;
+class Q_QML_EXPORT QQmlDebugServerConnection
{
public:
- QDeclarativeDebugServerConnection() {}
- virtual ~QDeclarativeDebugServerConnection() {}
+ QQmlDebugServerConnection() {}
+ virtual ~QQmlDebugServerConnection() {}
- virtual void setServer(QDeclarativeDebugServer *server) = 0;
+ virtual void setServer(QQmlDebugServer *server) = 0;
virtual void setPort(int port, bool bock) = 0;
virtual bool isConnected() const = 0;
virtual void send(const QList<QByteArray> &messages) = 0;
@@ -75,10 +76,10 @@ public:
virtual bool waitForMessage() = 0;
};
-Q_DECLARE_INTERFACE(QDeclarativeDebugServerConnection, "com.trolltech.Qt.QDeclarativeDebugServerConnection/1.0")
+Q_DECLARE_INTERFACE(QQmlDebugServerConnection, "com.trolltech.Qt.QQmlDebugServerConnection/1.0")
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGSERVERCONNECTION_H
+#endif // QQMLDEBUGSERVERCONNECTION_H
diff --git a/src/declarative/debugger/qdeclarativedebugservice.cpp b/src/qml/debugger/qqmldebugservice.cpp
index 96344d7717..9eb9489566 100644
--- a/src/declarative/debugger/qdeclarativedebugservice.cpp
+++ b/src/qml/debugger/qqmldebugservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,55 +39,55 @@
**
****************************************************************************/
-#include "qdeclarativedebugservice_p.h"
-#include "qdeclarativedebugservice_p_p.h"
-#include "qdeclarativedebugserver_p.h"
+#include "qqmldebugservice_p.h"
+#include "qqmldebugservice_p_p.h"
+#include "qqmldebugserver_p.h"
#include <QtCore/QDebug>
#include <QtCore/QStringList>
QT_BEGIN_NAMESPACE
-QDeclarativeDebugServicePrivate::QDeclarativeDebugServicePrivate()
+QQmlDebugServicePrivate::QQmlDebugServicePrivate()
: server(0)
{
}
-QDeclarativeDebugService::QDeclarativeDebugService(const QString &name, float version, QObject *parent)
- : QObject(*(new QDeclarativeDebugServicePrivate), parent)
+QQmlDebugService::QQmlDebugService(const QString &name, float version, QObject *parent)
+ : QObject(*(new QQmlDebugServicePrivate), parent)
{
- Q_D(QDeclarativeDebugService);
+ Q_D(QQmlDebugService);
d->name = name;
d->version = version;
- d->server = QDeclarativeDebugServer::instance();
- d->state = QDeclarativeDebugService::NotConnected;
+ d->server = QQmlDebugServer::instance();
+ d->state = QQmlDebugService::NotConnected;
}
-QDeclarativeDebugService::QDeclarativeDebugService(QDeclarativeDebugServicePrivate &dd,
+QQmlDebugService::QQmlDebugService(QQmlDebugServicePrivate &dd,
const QString &name, float version, QObject *parent)
: QObject(dd, parent)
{
- Q_D(QDeclarativeDebugService);
+ Q_D(QQmlDebugService);
d->name = name;
d->version = version;
- d->server = QDeclarativeDebugServer::instance();
- d->state = QDeclarativeDebugService::NotConnected;
+ d->server = QQmlDebugServer::instance();
+ d->state = QQmlDebugService::NotConnected;
}
/**
Registers the service. This should be called in the constructor of the inherited class. From
then on the service might get asynchronous calls to messageReceived().
*/
-QDeclarativeDebugService::State QDeclarativeDebugService::registerService()
+QQmlDebugService::State QQmlDebugService::registerService()
{
- Q_D(QDeclarativeDebugService);
+ Q_D(QQmlDebugService);
if (!d->server)
return NotConnected;
if (d->server->serviceNames().contains(d->name)) {
- qWarning() << "QDeclarativeDebugService: Conflicting plugin name" << d->name;
+ qWarning() << "QQmlDebugService: Conflicting plugin name" << d->name;
d->server = 0;
} else {
d->server->addService(this);
@@ -95,29 +95,29 @@ QDeclarativeDebugService::State QDeclarativeDebugService::registerService()
return state();
}
-QDeclarativeDebugService::~QDeclarativeDebugService()
+QQmlDebugService::~QQmlDebugService()
{
- Q_D(const QDeclarativeDebugService);
+ Q_D(const QQmlDebugService);
if (d->server) {
d->server->removeService(this);
}
}
-QString QDeclarativeDebugService::name() const
+QString QQmlDebugService::name() const
{
- Q_D(const QDeclarativeDebugService);
+ Q_D(const QQmlDebugService);
return d->name;
}
-float QDeclarativeDebugService::version() const
+float QQmlDebugService::version() const
{
- Q_D(const QDeclarativeDebugService);
+ Q_D(const QQmlDebugService);
return d->version;
}
-QDeclarativeDebugService::State QDeclarativeDebugService::state() const
+QQmlDebugService::State QQmlDebugService::state() const
{
- Q_D(const QDeclarativeDebugService);
+ Q_D(const QQmlDebugService);
return d->state;
}
@@ -147,7 +147,7 @@ Q_GLOBAL_STATIC(ObjectReferenceHash, objectReferenceHash);
Returns a unique id for \a object. Calling this method multiple times
for the same object will return the same id.
*/
-int QDeclarativeDebugService::idForObject(QObject *object)
+int QQmlDebugService::idForObject(QObject *object)
{
if (!object)
return -1;
@@ -180,7 +180,7 @@ int QDeclarativeDebugService::idForObject(QObject *object)
assigned an id, through idForObject(), then 0 is returned. If the object
has been destroyed, 0 is returned.
*/
-QObject *QDeclarativeDebugService::objectForId(int id)
+QObject *QQmlDebugService::objectForId(int id)
{
ObjectReferenceHash *hash = objectReferenceHash();
@@ -202,18 +202,18 @@ QObject *QDeclarativeDebugService::objectForId(int id)
}
}
-bool QDeclarativeDebugService::isDebuggingEnabled()
+bool QQmlDebugService::isDebuggingEnabled()
{
- return QDeclarativeDebugServer::instance() != 0;
+ return QQmlDebugServer::instance() != 0;
}
-bool QDeclarativeDebugService::hasDebuggingClient()
+bool QQmlDebugService::hasDebuggingClient()
{
- return QDeclarativeDebugServer::instance() != 0
- && QDeclarativeDebugServer::instance()->hasDebuggingClient();
+ return QQmlDebugServer::instance() != 0
+ && QQmlDebugServer::instance()->hasDebuggingClient();
}
-QString QDeclarativeDebugService::objectToString(QObject *obj)
+QString QQmlDebugService::objectToString(QObject *obj)
{
if(!obj)
return QLatin1String("NULL");
@@ -228,14 +228,14 @@ QString QDeclarativeDebugService::objectToString(QObject *obj)
return rv;
}
-void QDeclarativeDebugService::sendMessage(const QByteArray &message)
+void QQmlDebugService::sendMessage(const QByteArray &message)
{
sendMessages(QList<QByteArray>() << message);
}
-void QDeclarativeDebugService::sendMessages(const QList<QByteArray> &messages)
+void QQmlDebugService::sendMessages(const QList<QByteArray> &messages)
{
- Q_D(QDeclarativeDebugService);
+ Q_D(QQmlDebugService);
if (state() != Enabled)
return;
@@ -243,9 +243,9 @@ void QDeclarativeDebugService::sendMessages(const QList<QByteArray> &messages)
d->server->sendMessages(this, messages);
}
-bool QDeclarativeDebugService::waitForMessage()
+bool QQmlDebugService::waitForMessage()
{
- Q_D(QDeclarativeDebugService);
+ Q_D(QQmlDebugService);
if (state() != Enabled)
return false;
@@ -253,15 +253,15 @@ bool QDeclarativeDebugService::waitForMessage()
return d->server->waitForMessage(this);
}
-void QDeclarativeDebugService::stateAboutToBeChanged(State)
+void QQmlDebugService::stateAboutToBeChanged(State)
{
}
-void QDeclarativeDebugService::stateChanged(State)
+void QQmlDebugService::stateChanged(State)
{
}
-void QDeclarativeDebugService::messageReceived(const QByteArray &)
+void QQmlDebugService::messageReceived(const QByteArray &)
{
}
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p.h b/src/qml/debugger/qqmldebugservice_p.h
index 203e27ad09..f19b64f42b 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p.h
+++ b/src/qml/debugger/qqmldebugservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,12 +39,12 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGSERVICE_H
-#define QDECLARATIVEDEBUGSERVICE_H
+#ifndef QQMLDEBUGSERVICE_H
+#define QQMLDEBUGSERVICE_H
#include <QtCore/qobject.h>
-#include <private/qdeclarativeglobal_p.h>
+#include <private/qtqmlglobal_p.h>
//
// W A R N I N G
@@ -62,16 +62,16 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugServicePrivate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeDebugService : public QObject
+class QQmlDebugServicePrivate;
+class Q_QML_PRIVATE_EXPORT QQmlDebugService : public QObject
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QDeclarativeDebugService)
- Q_DISABLE_COPY(QDeclarativeDebugService)
+ Q_DECLARE_PRIVATE(QQmlDebugService)
+ Q_DISABLE_COPY(QQmlDebugService)
public:
- explicit QDeclarativeDebugService(const QString &, float version, QObject *parent = 0);
- ~QDeclarativeDebugService();
+ explicit QQmlDebugService(const QString &, float version, QObject *parent = 0);
+ ~QQmlDebugService();
QString name() const;
float version() const;
@@ -92,7 +92,7 @@ public:
static bool hasDebuggingClient();
protected:
- QDeclarativeDebugService(QDeclarativeDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0);
+ QQmlDebugService(QQmlDebugServicePrivate &dd, const QString &name, float version, QObject *parent = 0);
State registerService();
@@ -101,13 +101,13 @@ protected:
virtual void messageReceived(const QByteArray &);
private:
- friend class QDeclarativeDebugServer;
- friend class QDeclarativeDebugServerPrivate;
+ friend class QQmlDebugServer;
+ friend class QQmlDebugServerPrivate;
};
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGSERVICE_H
+#endif // QQMLDEBUGSERVICE_H
diff --git a/src/declarative/debugger/qdeclarativedebugservice_p_p.h b/src/qml/debugger/qqmldebugservice_p_p.h
index 6638ccbec7..c066e41fe6 100644
--- a/src/declarative/debugger/qdeclarativedebugservice_p_p.h
+++ b/src/qml/debugger/qqmldebugservice_p_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGSERVICE_P_H
-#define QDECLARATIVEDEBUGSERVICE_P_H
+#ifndef QQMLDEBUGSERVICE_P_H
+#define QQMLDEBUGSERVICE_P_H
//
// W A R N I N G
@@ -61,22 +61,22 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeDebugServer;
+class QQmlDebugServer;
-class QDeclarativeDebugServicePrivate : public QObjectPrivate
+class QQmlDebugServicePrivate : public QObjectPrivate
{
- Q_DECLARE_PUBLIC(QDeclarativeDebugService)
+ Q_DECLARE_PUBLIC(QQmlDebugService)
public:
- QDeclarativeDebugServicePrivate();
+ QQmlDebugServicePrivate();
QString name;
float version;
- QDeclarativeDebugServer *server;
- QDeclarativeDebugService::State state;
+ QQmlDebugServer *server;
+ QQmlDebugService::State state;
};
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGSERVICE_P_H
+#endif // QQMLDEBUGSERVICE_P_H
diff --git a/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h b/src/qml/debugger/qqmldebugstatesdelegate_p.h
index 868357723d..6e3cc978f2 100644
--- a/src/declarative/debugger/qdeclarativedebugstatesdelegate_p.h
+++ b/src/qml/debugger/qqmldebugstatesdelegate_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEDEBUGSTATESDELEGATE_P_H
-#define QDECLARATIVEDEBUGSTATESDELEGATE_P_H
+#ifndef QQMLDEBUGSTATESDELEGATE_P_H
+#define QQMLDEBUGSTATESDELEGATE_P_H
//
// W A R N I N G
@@ -53,30 +53,30 @@
// We mean it.
//
-#include <private/qdeclarativeglobal_p.h>
+#include <QtQml/qtqmlglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeContext;
-class QDeclarativeProperty;
+class QQmlContext;
+class QQmlProperty;
class QObject;
class QString;
class QVariant;
-class QDeclarativeDebugStatesDelegate
+class QQmlDebugStatesDelegate
{
protected:
- QDeclarativeDebugStatesDelegate() {}
+ QQmlDebugStatesDelegate() {}
public:
- virtual ~QDeclarativeDebugStatesDelegate() {}
+ virtual ~QQmlDebugStatesDelegate() {}
- virtual void buildStatesList(QDeclarativeContext *ctxt, bool cleanList) = 0;
- virtual void updateBinding(QDeclarativeContext *context,
- const QDeclarativeProperty &property,
+ virtual void buildStatesList(QQmlContext *ctxt, bool cleanList) = 0;
+ virtual void updateBinding(QQmlContext *context,
+ const QQmlProperty &property,
const QVariant &expression, bool isLiteralValue,
const QString &fileName, int line, int column,
bool *inBaseState) = 0;
@@ -88,11 +88,11 @@ public:
const QString &propertyName) = 0;
private:
- Q_DISABLE_COPY(QDeclarativeDebugStatesDelegate)
+ Q_DISABLE_COPY(QQmlDebugStatesDelegate)
};
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEDEBUGSTATESDELEGATE_P_H
+#endif // QQMLDEBUGSTATESDELEGATE_P_H
diff --git a/src/qml/debugger/qqmlenginedebug.cpp b/src/qml/debugger/qqmlenginedebug.cpp
new file mode 100644
index 0000000000..597e7aeb04
--- /dev/null
+++ b/src/qml/debugger/qqmlenginedebug.cpp
@@ -0,0 +1,1072 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qqmlenginedebug_p.h"
+
+#include "qqmldebugclient_p.h"
+
+#include "qqmlenginedebugservice_p.h"
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+class QQmlEngineDebugClient : public QQmlDebugClient
+{
+public:
+ QQmlEngineDebugClient(QQmlDebugConnection *client, QQmlEngineDebugPrivate *p);
+
+protected:
+ virtual void stateChanged(State state);
+ virtual void messageReceived(const QByteArray &);
+
+private:
+ QQmlEngineDebugPrivate *priv;
+ friend class QQmlEngineDebugPrivate;
+};
+
+class QQmlEngineDebugPrivate : public QObjectPrivate
+{
+ Q_DECLARE_PUBLIC(QQmlEngineDebug)
+public:
+ QQmlEngineDebugPrivate(QQmlDebugConnection *);
+ ~QQmlEngineDebugPrivate();
+
+ void stateChanged(QQmlEngineDebug::State status);
+ void message(const QByteArray &);
+
+ QQmlEngineDebugClient *client;
+ int nextId;
+ int getId();
+
+ void decode(QDataStream &, QQmlDebugContextReference &);
+ void decode(QDataStream &, QQmlDebugObjectReference &, bool simple);
+
+ static void remove(QQmlEngineDebug *, QQmlDebugEnginesQuery *);
+ static void remove(QQmlEngineDebug *, QQmlDebugRootContextQuery *);
+ static void remove(QQmlEngineDebug *, QQmlDebugObjectQuery *);
+ static void remove(QQmlEngineDebug *, QQmlDebugExpressionQuery *);
+ static void remove(QQmlEngineDebug *, QQmlDebugWatch *);
+
+ QHash<int, QQmlDebugEnginesQuery *> enginesQuery;
+ QHash<int, QQmlDebugRootContextQuery *> rootContextQuery;
+ QHash<int, QQmlDebugObjectQuery *> objectQuery;
+ QHash<int, QQmlDebugExpressionQuery *> expressionQuery;
+
+ QHash<int, QQmlDebugWatch *> watched;
+};
+
+QQmlEngineDebugClient::QQmlEngineDebugClient(QQmlDebugConnection *client,
+ QQmlEngineDebugPrivate *p)
+ : QQmlDebugClient(QLatin1String("QQmlEngine"), client), priv(p)
+{
+}
+
+void QQmlEngineDebugClient::stateChanged(State status)
+{
+ if (priv)
+ priv->stateChanged(static_cast<QQmlEngineDebug::State>(status));
+}
+
+void QQmlEngineDebugClient::messageReceived(const QByteArray &data)
+{
+ if (priv)
+ priv->message(data);
+}
+
+QQmlEngineDebugPrivate::QQmlEngineDebugPrivate(QQmlDebugConnection *c)
+ : client(new QQmlEngineDebugClient(c, this)), nextId(0)
+{
+}
+
+QQmlEngineDebugPrivate::~QQmlEngineDebugPrivate()
+{
+ if (client)
+ client->priv = 0;
+ delete client;
+
+ QHash<int, QQmlDebugEnginesQuery*>::iterator enginesIter = enginesQuery.begin();
+ for (; enginesIter != enginesQuery.end(); ++enginesIter) {
+ enginesIter.value()->m_client = 0;
+ if (enginesIter.value()->state() == QQmlDebugQuery::Waiting)
+ enginesIter.value()->setState(QQmlDebugQuery::Error);
+ }
+
+ QHash<int, QQmlDebugRootContextQuery*>::iterator rootContextIter = rootContextQuery.begin();
+ for (; rootContextIter != rootContextQuery.end(); ++rootContextIter) {
+ rootContextIter.value()->m_client = 0;
+ if (rootContextIter.value()->state() == QQmlDebugQuery::Waiting)
+ rootContextIter.value()->setState(QQmlDebugQuery::Error);
+ }
+
+ QHash<int, QQmlDebugObjectQuery*>::iterator objectIter = objectQuery.begin();
+ for (; objectIter != objectQuery.end(); ++objectIter) {
+ objectIter.value()->m_client = 0;
+ if (objectIter.value()->state() == QQmlDebugQuery::Waiting)
+ objectIter.value()->setState(QQmlDebugQuery::Error);
+ }
+
+ QHash<int, QQmlDebugExpressionQuery*>::iterator exprIter = expressionQuery.begin();
+ for (; exprIter != expressionQuery.end(); ++exprIter) {
+ exprIter.value()->m_client = 0;
+ if (exprIter.value()->state() == QQmlDebugQuery::Waiting)
+ exprIter.value()->setState(QQmlDebugQuery::Error);
+ }
+
+ QHash<int, QQmlDebugWatch*>::iterator watchIter = watched.begin();
+ for (; watchIter != watched.end(); ++watchIter) {
+ watchIter.value()->m_client = 0;
+ watchIter.value()->setState(QQmlDebugWatch::Dead);
+ }
+}
+
+int QQmlEngineDebugPrivate::getId()
+{
+ return nextId++;
+}
+
+void QQmlEngineDebugPrivate::remove(QQmlEngineDebug *c, QQmlDebugEnginesQuery *q)
+{
+ if (c && q) {
+ QQmlEngineDebugPrivate *p = (QQmlEngineDebugPrivate *)QObjectPrivate::get(c);
+ p->enginesQuery.remove(q->m_queryId);
+ }
+}
+
+void QQmlEngineDebugPrivate::remove(QQmlEngineDebug *c,
+ QQmlDebugRootContextQuery *q)
+{
+ if (c && q) {
+ QQmlEngineDebugPrivate *p = (QQmlEngineDebugPrivate *)QObjectPrivate::get(c);
+ p->rootContextQuery.remove(q->m_queryId);
+ }
+}
+
+void QQmlEngineDebugPrivate::remove(QQmlEngineDebug *c, QQmlDebugObjectQuery *q)
+{
+ if (c && q) {
+ QQmlEngineDebugPrivate *p = (QQmlEngineDebugPrivate *)QObjectPrivate::get(c);
+ p->objectQuery.remove(q->m_queryId);
+ }
+}
+
+void QQmlEngineDebugPrivate::remove(QQmlEngineDebug *c, QQmlDebugExpressionQuery *q)
+{
+ if (c && q) {
+ QQmlEngineDebugPrivate *p = (QQmlEngineDebugPrivate *)QObjectPrivate::get(c);
+ p->expressionQuery.remove(q->m_queryId);
+ }
+}
+
+void QQmlEngineDebugPrivate::remove(QQmlEngineDebug *c, QQmlDebugWatch *w)
+{
+ if (c && w) {
+ QQmlEngineDebugPrivate *p = (QQmlEngineDebugPrivate *)QObjectPrivate::get(c);
+ p->watched.remove(w->m_queryId);
+ }
+}
+
+void QQmlEngineDebugPrivate::decode(QDataStream &ds, QQmlDebugObjectReference &o,
+ bool simple)
+{
+ QQmlEngineDebugService::QQmlObjectData data;
+ ds >> data;
+ o.m_debugId = data.objectId;
+ o.m_class = data.objectType;
+ o.m_idString = data.idString;
+ o.m_name = data.objectName;
+ o.m_source.m_url = data.url;
+ o.m_source.m_lineNumber = data.lineNumber;
+ o.m_source.m_columnNumber = data.columnNumber;
+ o.m_contextDebugId = data.contextId;
+
+ if (simple)
+ return;
+
+ int childCount;
+ bool recur;
+ ds >> childCount >> recur;
+
+ for (int ii = 0; ii < childCount; ++ii) {
+ o.m_children.append(QQmlDebugObjectReference());
+ decode(ds, o.m_children.last(), !recur);
+ }
+
+ int propCount;
+ ds >> propCount;
+
+ for (int ii = 0; ii < propCount; ++ii) {
+ QQmlEngineDebugService::QQmlObjectProperty data;
+ ds >> data;
+ QQmlDebugPropertyReference prop;
+ prop.m_objectDebugId = o.m_debugId;
+ prop.m_name = data.name;
+ prop.m_binding = data.binding;
+ prop.m_hasNotifySignal = data.hasNotifySignal;
+ prop.m_valueTypeName = data.valueTypeName;
+ switch (data.type) {
+ case QQmlEngineDebugService::QQmlObjectProperty::Basic:
+ case QQmlEngineDebugService::QQmlObjectProperty::List:
+ case QQmlEngineDebugService::QQmlObjectProperty::SignalProperty:
+ {
+ prop.m_value = data.value;
+ break;
+ }
+ case QQmlEngineDebugService::QQmlObjectProperty::Object:
+ {
+ QQmlDebugObjectReference obj;
+ obj.m_debugId = prop.m_value.toInt();
+ prop.m_value = QVariant::fromValue(obj);
+ break;
+ }
+ case QQmlEngineDebugService::QQmlObjectProperty::Unknown:
+ break;
+ }
+ o.m_properties << prop;
+ }
+}
+
+void QQmlEngineDebugPrivate::decode(QDataStream &ds, QQmlDebugContextReference &c)
+{
+ ds >> c.m_name >> c.m_debugId;
+
+ int contextCount;
+ ds >> contextCount;
+
+ for (int ii = 0; ii < contextCount; ++ii) {
+ c.m_contexts.append(QQmlDebugContextReference());
+ decode(ds, c.m_contexts.last());
+ }
+
+ int objectCount;
+ ds >> objectCount;
+
+ for (int ii = 0; ii < objectCount; ++ii) {
+ QQmlDebugObjectReference obj;
+ decode(ds, obj, true);
+
+ obj.m_contextDebugId = c.m_debugId;
+ c.m_objects << obj;
+ }
+}
+
+void QQmlEngineDebugPrivate::stateChanged(QQmlEngineDebug::State status)
+{
+ emit q_func()->stateChanged(status);
+}
+
+void QQmlEngineDebugPrivate::message(const QByteArray &data)
+{
+ QDataStream ds(data);
+
+ QByteArray type;
+ ds >> type;
+
+ //qDebug() << "QQmlEngineDebugPrivate::message()" << type;
+
+ if (type == "LIST_ENGINES_R") {
+ int queryId;
+ ds >> queryId;
+
+ QQmlDebugEnginesQuery *query = enginesQuery.value(queryId);
+ if (!query)
+ return;
+ enginesQuery.remove(queryId);
+
+ int count;
+ ds >> count;
+
+ for (int ii = 0; ii < count; ++ii) {
+ QQmlDebugEngineReference ref;
+ ds >> ref.m_name;
+ ds >> ref.m_debugId;
+ query->m_engines << ref;
+ }
+
+ query->m_client = 0;
+ query->setState(QQmlDebugQuery::Completed);
+ } else if (type == "LIST_OBJECTS_R") {
+ int queryId;
+ ds >> queryId;
+
+ QQmlDebugRootContextQuery *query = rootContextQuery.value(queryId);
+ if (!query)
+ return;
+ rootContextQuery.remove(queryId);
+
+ if (!ds.atEnd())
+ decode(ds, query->m_context);
+
+ query->m_client = 0;
+ query->setState(QQmlDebugQuery::Completed);
+ } else if (type == "FETCH_OBJECT_R") {
+ int queryId;
+ ds >> queryId;
+
+ QQmlDebugObjectQuery *query = objectQuery.value(queryId);
+ if (!query)
+ return;
+ objectQuery.remove(queryId);
+
+ if (!ds.atEnd())
+ decode(ds, query->m_object, false);
+
+ query->m_client = 0;
+ query->setState(QQmlDebugQuery::Completed);
+ } else if (type == "EVAL_EXPRESSION_R") {
+ int queryId;
+ QVariant result;
+ ds >> queryId >> result;
+
+ QQmlDebugExpressionQuery *query = expressionQuery.value(queryId);
+ if (!query)
+ return;
+ expressionQuery.remove(queryId);
+
+ query->m_result = result;
+ query->m_client = 0;
+ query->setState(QQmlDebugQuery::Completed);
+ } else if (type == "WATCH_PROPERTY_R") {
+ int queryId;
+ bool ok;
+ ds >> queryId >> ok;
+
+ QQmlDebugWatch *watch = watched.value(queryId);
+ if (!watch)
+ return;
+
+ watch->setState(ok ? QQmlDebugWatch::Active : QQmlDebugWatch::Inactive);
+ } else if (type == "WATCH_OBJECT_R") {
+ int queryId;
+ bool ok;
+ ds >> queryId >> ok;
+
+ QQmlDebugWatch *watch = watched.value(queryId);
+ if (!watch)
+ return;
+
+ watch->setState(ok ? QQmlDebugWatch::Active : QQmlDebugWatch::Inactive);
+ } else if (type == "WATCH_EXPR_OBJECT_R") {
+ int queryId;
+ bool ok;
+ ds >> queryId >> ok;
+
+ QQmlDebugWatch *watch = watched.value(queryId);
+ if (!watch)
+ return;
+
+ watch->setState(ok ? QQmlDebugWatch::Active : QQmlDebugWatch::Inactive);
+ } else if (type == "UPDATE_WATCH") {
+ int queryId;
+ int debugId;
+ QByteArray name;
+ QVariant value;
+ ds >> queryId >> debugId >> name >> value;
+
+ QQmlDebugWatch *watch = watched.value(queryId, 0);
+ if (!watch)
+ return;
+ emit watch->valueChanged(name, value);
+ } else if (type == "OBJECT_CREATED") {
+ emit q_func()->newObjects();
+ }
+}
+
+QQmlEngineDebug::QQmlEngineDebug(QQmlDebugConnection *client, QObject *parent)
+ : QObject(*(new QQmlEngineDebugPrivate(client)), parent)
+{
+}
+
+QQmlEngineDebug::~QQmlEngineDebug()
+{
+}
+
+QQmlEngineDebug::State QQmlEngineDebug::state() const
+{
+ Q_D(const QQmlEngineDebug);
+
+ return static_cast<QQmlEngineDebug::State>(d->client->state());
+}
+
+QQmlDebugPropertyWatch *QQmlEngineDebug::addWatch(const QQmlDebugPropertyReference &property, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugPropertyWatch *watch = new QQmlDebugPropertyWatch(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled) {
+ int queryId = d->getId();
+ watch->m_queryId = queryId;
+ watch->m_client = this;
+ watch->m_objectDebugId = property.objectDebugId();
+ watch->m_name = property.name();
+ d->watched.insert(queryId, watch);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("WATCH_PROPERTY") << queryId << property.objectDebugId() << property.name().toUtf8();
+ d->client->sendMessage(message);
+ } else {
+ watch->m_state = QQmlDebugWatch::Dead;
+ }
+
+ return watch;
+}
+
+QQmlDebugWatch *QQmlEngineDebug::addWatch(const QQmlDebugContextReference &, const QString &, QObject *)
+{
+ qWarning("QQmlEngineDebug::addWatch(): Not implemented");
+ return 0;
+}
+
+QQmlDebugObjectExpressionWatch *QQmlEngineDebug::addWatch(const QQmlDebugObjectReference &object, const QString &expr, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+ QQmlDebugObjectExpressionWatch *watch = new QQmlDebugObjectExpressionWatch(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled) {
+ int queryId = d->getId();
+ watch->m_queryId = queryId;
+ watch->m_client = this;
+ watch->m_objectDebugId = object.debugId();
+ watch->m_expr = expr;
+ d->watched.insert(queryId, watch);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("WATCH_EXPR_OBJECT") << queryId << object.debugId() << expr;
+ d->client->sendMessage(message);
+ } else {
+ watch->m_state = QQmlDebugWatch::Dead;
+ }
+ return watch;
+}
+
+QQmlDebugWatch *QQmlEngineDebug::addWatch(const QQmlDebugObjectReference &object, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugWatch *watch = new QQmlDebugWatch(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled) {
+ int queryId = d->getId();
+ watch->m_queryId = queryId;
+ watch->m_client = this;
+ watch->m_objectDebugId = object.debugId();
+ d->watched.insert(queryId, watch);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("WATCH_OBJECT") << queryId << object.debugId();
+ d->client->sendMessage(message);
+ } else {
+ watch->m_state = QQmlDebugWatch::Dead;
+ }
+
+ return watch;
+}
+
+QQmlDebugWatch *QQmlEngineDebug::addWatch(const QQmlDebugFileReference &, QObject *)
+{
+ qWarning("QQmlEngineDebug::addWatch(): Not implemented");
+ return 0;
+}
+
+void QQmlEngineDebug::removeWatch(QQmlDebugWatch *watch)
+{
+ Q_D(QQmlEngineDebug);
+
+ if (!watch || !watch->m_client)
+ return;
+
+ watch->m_client = 0;
+ watch->setState(QQmlDebugWatch::Inactive);
+
+ d->watched.remove(watch->queryId());
+
+ if (d->client && d->client->state() == QQmlDebugClient::Enabled) {
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("NO_WATCH") << watch->queryId();
+ d->client->sendMessage(message);
+ }
+}
+
+QQmlDebugEnginesQuery *QQmlEngineDebug::queryAvailableEngines(QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugEnginesQuery *query = new QQmlDebugEnginesQuery(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled) {
+ query->m_client = this;
+ int queryId = d->getId();
+ query->m_queryId = queryId;
+ d->enginesQuery.insert(queryId, query);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("LIST_ENGINES") << queryId;
+ d->client->sendMessage(message);
+ } else {
+ query->m_state = QQmlDebugQuery::Error;
+ }
+
+ return query;
+}
+
+QQmlDebugRootContextQuery *QQmlEngineDebug::queryRootContexts(const QQmlDebugEngineReference &engine, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugRootContextQuery *query = new QQmlDebugRootContextQuery(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled && engine.debugId() != -1) {
+ query->m_client = this;
+ int queryId = d->getId();
+ query->m_queryId = queryId;
+ d->rootContextQuery.insert(queryId, query);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("LIST_OBJECTS") << queryId << engine.debugId();
+ d->client->sendMessage(message);
+ } else {
+ query->m_state = QQmlDebugQuery::Error;
+ }
+
+ return query;
+}
+
+QQmlDebugObjectQuery *QQmlEngineDebug::queryObject(const QQmlDebugObjectReference &object, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugObjectQuery *query = new QQmlDebugObjectQuery(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled && object.debugId() != -1) {
+ query->m_client = this;
+ int queryId = d->getId();
+ query->m_queryId = queryId;
+ d->objectQuery.insert(queryId, query);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
+ << false << true;
+ d->client->sendMessage(message);
+ } else {
+ query->m_state = QQmlDebugQuery::Error;
+ }
+
+ return query;
+}
+
+QQmlDebugObjectQuery *QQmlEngineDebug::queryObjectRecursive(const QQmlDebugObjectReference &object, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugObjectQuery *query = new QQmlDebugObjectQuery(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled && object.debugId() != -1) {
+ query->m_client = this;
+ int queryId = d->getId();
+ query->m_queryId = queryId;
+ d->objectQuery.insert(queryId, query);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("FETCH_OBJECT") << queryId << object.debugId()
+ << true << true;
+ d->client->sendMessage(message);
+ } else {
+ query->m_state = QQmlDebugQuery::Error;
+ }
+
+ return query;
+}
+
+QQmlDebugExpressionQuery *QQmlEngineDebug::queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent)
+{
+ Q_D(QQmlEngineDebug);
+
+ QQmlDebugExpressionQuery *query = new QQmlDebugExpressionQuery(parent);
+ if (d->client->state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
+ query->m_client = this;
+ query->m_expr = expr;
+ int queryId = d->getId();
+ query->m_queryId = queryId;
+ d->expressionQuery.insert(queryId, query);
+
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("EVAL_EXPRESSION") << queryId << objectDebugId << expr;
+ d->client->sendMessage(message);
+ } else {
+ query->m_state = QQmlDebugQuery::Error;
+ }
+
+ return query;
+}
+
+bool QQmlEngineDebug::setBindingForObject(int objectDebugId, const QString &propertyName,
+ const QVariant &bindingExpression,
+ bool isLiteralValue,
+ QString source, int line)
+{
+ Q_D(QQmlEngineDebug);
+
+ if (d->client->state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("SET_BINDING") << objectDebugId << propertyName << bindingExpression << isLiteralValue << source << line;
+ d->client->sendMessage(message);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+bool QQmlEngineDebug::resetBindingForObject(int objectDebugId, const QString &propertyName)
+{
+ Q_D(QQmlEngineDebug);
+
+ if (d->client->state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("RESET_BINDING") << objectDebugId << propertyName;
+ d->client->sendMessage(message);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+bool QQmlEngineDebug::setMethodBody(int objectDebugId, const QString &methodName,
+ const QString &methodBody)
+{
+ Q_D(QQmlEngineDebug);
+
+ if (d->client->state() == QQmlDebugClient::Enabled && objectDebugId != -1) {
+ QByteArray message;
+ QDataStream ds(&message, QIODevice::WriteOnly);
+ ds << QByteArray("SET_METHOD_BODY") << objectDebugId << methodName << methodBody;
+ d->client->sendMessage(message);
+ return true;
+ } else {
+ return false;
+ }
+}
+
+QQmlDebugWatch::QQmlDebugWatch(QObject *parent)
+ : QObject(parent), m_state(Waiting), m_queryId(-1), m_client(0), m_objectDebugId(-1)
+{
+}
+
+QQmlDebugWatch::~QQmlDebugWatch()
+{
+ if (m_client && m_queryId != -1)
+ QQmlEngineDebugPrivate::remove(m_client, this);
+}
+
+int QQmlDebugWatch::queryId() const
+{
+ return m_queryId;
+}
+
+int QQmlDebugWatch::objectDebugId() const
+{
+ return m_objectDebugId;
+}
+
+QQmlDebugWatch::State QQmlDebugWatch::state() const
+{
+ return m_state;
+}
+
+void QQmlDebugWatch::setState(State s)
+{
+ if (m_state == s)
+ return;
+ m_state = s;
+ emit stateChanged(m_state);
+}
+
+QQmlDebugPropertyWatch::QQmlDebugPropertyWatch(QObject *parent)
+ : QQmlDebugWatch(parent)
+{
+}
+
+QString QQmlDebugPropertyWatch::name() const
+{
+ return m_name;
+}
+
+
+QQmlDebugObjectExpressionWatch::QQmlDebugObjectExpressionWatch(QObject *parent)
+ : QQmlDebugWatch(parent)
+{
+}
+
+QString QQmlDebugObjectExpressionWatch::expression() const
+{
+ return m_expr;
+}
+
+
+QQmlDebugQuery::QQmlDebugQuery(QObject *parent)
+ : QObject(parent), m_state(Waiting)
+{
+}
+
+QQmlDebugQuery::State QQmlDebugQuery::state() const
+{
+ return m_state;
+}
+
+bool QQmlDebugQuery::isWaiting() const
+{
+ return m_state == Waiting;
+}
+
+void QQmlDebugQuery::setState(State s)
+{
+ if (m_state == s)
+ return;
+ m_state = s;
+ emit stateChanged(m_state);
+}
+
+QQmlDebugEnginesQuery::QQmlDebugEnginesQuery(QObject *parent)
+ : QQmlDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QQmlDebugEnginesQuery::~QQmlDebugEnginesQuery()
+{
+ if (m_client && m_queryId != -1)
+ QQmlEngineDebugPrivate::remove(m_client, this);
+}
+
+QList<QQmlDebugEngineReference> QQmlDebugEnginesQuery::engines() const
+{
+ return m_engines;
+}
+
+QQmlDebugRootContextQuery::QQmlDebugRootContextQuery(QObject *parent)
+ : QQmlDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QQmlDebugRootContextQuery::~QQmlDebugRootContextQuery()
+{
+ if (m_client && m_queryId != -1)
+ QQmlEngineDebugPrivate::remove(m_client, this);
+}
+
+QQmlDebugContextReference QQmlDebugRootContextQuery::rootContext() const
+{
+ return m_context;
+}
+
+QQmlDebugObjectQuery::QQmlDebugObjectQuery(QObject *parent)
+ : QQmlDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QQmlDebugObjectQuery::~QQmlDebugObjectQuery()
+{
+ if (m_client && m_queryId != -1)
+ QQmlEngineDebugPrivate::remove(m_client, this);
+}
+
+QQmlDebugObjectReference QQmlDebugObjectQuery::object() const
+{
+ return m_object;
+}
+
+QQmlDebugExpressionQuery::QQmlDebugExpressionQuery(QObject *parent)
+ : QQmlDebugQuery(parent), m_client(0), m_queryId(-1)
+{
+}
+
+QQmlDebugExpressionQuery::~QQmlDebugExpressionQuery()
+{
+ if (m_client && m_queryId != -1)
+ QQmlEngineDebugPrivate::remove(m_client, this);
+}
+
+QVariant QQmlDebugExpressionQuery::expression() const
+{
+ return m_expr;
+}
+
+QVariant QQmlDebugExpressionQuery::result() const
+{
+ return m_result;
+}
+
+QQmlDebugEngineReference::QQmlDebugEngineReference()
+ : m_debugId(-1)
+{
+}
+
+QQmlDebugEngineReference::QQmlDebugEngineReference(int debugId)
+ : m_debugId(debugId)
+{
+}
+
+QQmlDebugEngineReference::QQmlDebugEngineReference(const QQmlDebugEngineReference &o)
+ : m_debugId(o.m_debugId), m_name(o.m_name)
+{
+}
+
+QQmlDebugEngineReference &
+QQmlDebugEngineReference::operator=(const QQmlDebugEngineReference &o)
+{
+ m_debugId = o.m_debugId; m_name = o.m_name;
+ return *this;
+}
+
+int QQmlDebugEngineReference::debugId() const
+{
+ return m_debugId;
+}
+
+QString QQmlDebugEngineReference::name() const
+{
+ return m_name;
+}
+
+QQmlDebugObjectReference::QQmlDebugObjectReference()
+ : m_debugId(-1), m_contextDebugId(-1)
+{
+}
+
+QQmlDebugObjectReference::QQmlDebugObjectReference(int debugId)
+ : m_debugId(debugId), m_contextDebugId(-1)
+{
+}
+
+QQmlDebugObjectReference::QQmlDebugObjectReference(const QQmlDebugObjectReference &o)
+ : m_debugId(o.m_debugId), m_class(o.m_class), m_idString(o.m_idString),
+ m_name(o.m_name), m_source(o.m_source), m_contextDebugId(o.m_contextDebugId),
+ m_properties(o.m_properties), m_children(o.m_children)
+{
+}
+
+QQmlDebugObjectReference &
+QQmlDebugObjectReference::operator=(const QQmlDebugObjectReference &o)
+{
+ m_debugId = o.m_debugId; m_class = o.m_class; m_idString = o.m_idString;
+ m_name = o.m_name; m_source = o.m_source; m_contextDebugId = o.m_contextDebugId;
+ m_properties = o.m_properties; m_children = o.m_children;
+ return *this;
+}
+
+int QQmlDebugObjectReference::debugId() const
+{
+ return m_debugId;
+}
+
+QString QQmlDebugObjectReference::className() const
+{
+ return m_class;
+}
+
+QString QQmlDebugObjectReference::idString() const
+{
+ return m_idString;
+}
+
+QString QQmlDebugObjectReference::name() const
+{
+ return m_name;
+}
+
+QQmlDebugFileReference QQmlDebugObjectReference::source() const
+{
+ return m_source;
+}
+
+int QQmlDebugObjectReference::contextDebugId() const
+{
+ return m_contextDebugId;
+}
+
+QList<QQmlDebugPropertyReference> QQmlDebugObjectReference::properties() const
+{
+ return m_properties;
+}
+
+QList<QQmlDebugObjectReference> QQmlDebugObjectReference::children() const
+{
+ return m_children;
+}
+
+QQmlDebugContextReference::QQmlDebugContextReference()
+ : m_debugId(-1)
+{
+}
+
+QQmlDebugContextReference::QQmlDebugContextReference(const QQmlDebugContextReference &o)
+ : m_debugId(o.m_debugId), m_name(o.m_name), m_objects(o.m_objects), m_contexts(o.m_contexts)
+{
+}
+
+QQmlDebugContextReference &QQmlDebugContextReference::operator=(const QQmlDebugContextReference &o)
+{
+ m_debugId = o.m_debugId; m_name = o.m_name; m_objects = o.m_objects;
+ m_contexts = o.m_contexts;
+ return *this;
+}
+
+int QQmlDebugContextReference::debugId() const
+{
+ return m_debugId;
+}
+
+QString QQmlDebugContextReference::name() const
+{
+ return m_name;
+}
+
+QList<QQmlDebugObjectReference> QQmlDebugContextReference::objects() const
+{
+ return m_objects;
+}
+
+QList<QQmlDebugContextReference> QQmlDebugContextReference::contexts() const
+{
+ return m_contexts;
+}
+
+QQmlDebugFileReference::QQmlDebugFileReference()
+ : m_lineNumber(-1), m_columnNumber(-1)
+{
+}
+
+QQmlDebugFileReference::QQmlDebugFileReference(const QQmlDebugFileReference &o)
+ : m_url(o.m_url), m_lineNumber(o.m_lineNumber), m_columnNumber(o.m_columnNumber)
+{
+}
+
+QQmlDebugFileReference &QQmlDebugFileReference::operator=(const QQmlDebugFileReference &o)
+{
+ m_url = o.m_url; m_lineNumber = o.m_lineNumber; m_columnNumber = o.m_columnNumber;
+ return *this;
+}
+
+QUrl QQmlDebugFileReference::url() const
+{
+ return m_url;
+}
+
+void QQmlDebugFileReference::setUrl(const QUrl &u)
+{
+ m_url = u;
+}
+
+int QQmlDebugFileReference::lineNumber() const
+{
+ return m_lineNumber;
+}
+
+void QQmlDebugFileReference::setLineNumber(int l)
+{
+ m_lineNumber = l;
+}
+
+int QQmlDebugFileReference::columnNumber() const
+{
+ return m_columnNumber;
+}
+
+void QQmlDebugFileReference::setColumnNumber(int c)
+{
+ m_columnNumber = c;
+}
+
+QQmlDebugPropertyReference::QQmlDebugPropertyReference()
+ : m_objectDebugId(-1), m_hasNotifySignal(false)
+{
+}
+
+QQmlDebugPropertyReference::QQmlDebugPropertyReference(const QQmlDebugPropertyReference &o)
+ : m_objectDebugId(o.m_objectDebugId), m_name(o.m_name), m_value(o.m_value),
+ m_valueTypeName(o.m_valueTypeName), m_binding(o.m_binding),
+ m_hasNotifySignal(o.m_hasNotifySignal)
+{
+}
+
+QQmlDebugPropertyReference &QQmlDebugPropertyReference::operator=(const QQmlDebugPropertyReference &o)
+{
+ m_objectDebugId = o.m_objectDebugId; m_name = o.m_name; m_value = o.m_value;
+ m_valueTypeName = o.m_valueTypeName; m_binding = o.m_binding;
+ m_hasNotifySignal = o.m_hasNotifySignal;
+ return *this;
+}
+
+int QQmlDebugPropertyReference::objectDebugId() const
+{
+ return m_objectDebugId;
+}
+
+QString QQmlDebugPropertyReference::name() const
+{
+ return m_name;
+}
+
+QString QQmlDebugPropertyReference::valueTypeName() const
+{
+ return m_valueTypeName;
+}
+
+QVariant QQmlDebugPropertyReference::value() const
+{
+ return m_value;
+}
+
+QString QQmlDebugPropertyReference::binding() const
+{
+ return m_binding;
+}
+
+bool QQmlDebugPropertyReference::hasNotifySignal() const
+{
+ return m_hasNotifySignal;
+}
+
+QT_END_NAMESPACE
+
diff --git a/src/qml/debugger/qqmlenginedebug_p.h b/src/qml/debugger/qqmlenginedebug_p.h
new file mode 100644
index 0000000000..0562d8755b
--- /dev/null
+++ b/src/qml/debugger/qqmlenginedebug_p.h
@@ -0,0 +1,397 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtQml module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QQMLENGINEDEBUG_H
+#define QQMLENGINEDEBUG_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 <QtCore/qobject.h>
+#include <QtCore/qurl.h>
+#include <QtCore/qvariant.h>
+
+#include <private/qtqmlglobal_p.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+
+class QQmlDebugConnection;
+class QQmlDebugWatch;
+class QQmlDebugPropertyWatch;
+class QQmlDebugObjectExpressionWatch;
+class QQmlDebugEnginesQuery;
+class QQmlDebugRootContextQuery;
+class QQmlDebugObjectQuery;
+class QQmlDebugExpressionQuery;
+class QQmlDebugPropertyReference;
+class QQmlDebugContextReference;
+class QQmlDebugObjectReference;
+class QQmlDebugFileReference;
+class QQmlDebugEngineReference;
+class QQmlEngineDebugPrivate;
+class Q_QML_PRIVATE_EXPORT QQmlEngineDebug : public QObject
+{
+ Q_OBJECT
+public:
+ enum State { NotConnected, Unavailable, Enabled };
+
+ explicit QQmlEngineDebug(QQmlDebugConnection *, QObject * = 0);
+ ~QQmlEngineDebug();
+
+ State state() const;
+
+ QQmlDebugPropertyWatch *addWatch(const QQmlDebugPropertyReference &,
+ QObject *parent = 0);
+ QQmlDebugWatch *addWatch(const QQmlDebugContextReference &, const QString &,
+ QObject *parent = 0);
+ QQmlDebugObjectExpressionWatch *addWatch(const QQmlDebugObjectReference &, const QString &,
+ QObject *parent = 0);
+ QQmlDebugWatch *addWatch(const QQmlDebugObjectReference &,
+ QObject *parent = 0);
+ QQmlDebugWatch *addWatch(const QQmlDebugFileReference &,
+ QObject *parent = 0);
+
+ void removeWatch(QQmlDebugWatch *watch);
+
+ QQmlDebugEnginesQuery *queryAvailableEngines(QObject *parent = 0);
+ QQmlDebugRootContextQuery *queryRootContexts(const QQmlDebugEngineReference &,
+ QObject *parent = 0);
+ QQmlDebugObjectQuery *queryObject(const QQmlDebugObjectReference &,
+ QObject *parent = 0);
+ QQmlDebugObjectQuery *queryObjectRecursive(const QQmlDebugObjectReference &,
+ QObject *parent = 0);
+ QQmlDebugExpressionQuery *queryExpressionResult(int objectDebugId,
+ const QString &expr,
+ QObject *parent = 0);
+ bool setBindingForObject(int objectDebugId, const QString &propertyName,
+ const QVariant &bindingExpression, bool isLiteralValue,
+ QString source = QString(), int line = -1);
+ bool resetBindingForObject(int objectDebugId, const QString &propertyName);
+ bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody);
+
+Q_SIGNALS:
+ void newObjects();
+ void stateChanged(State state);
+
+private:
+ Q_DECLARE_PRIVATE(QQmlEngineDebug)
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugWatch : public QObject
+{
+ Q_OBJECT
+public:
+ enum State { Waiting, Active, Inactive, Dead };
+
+ QQmlDebugWatch(QObject *);
+ ~QQmlDebugWatch();
+
+ int queryId() const;
+ int objectDebugId() const;
+ State state() const;
+
+Q_SIGNALS:
+ void stateChanged(QQmlDebugWatch::State);
+ //void objectChanged(int, const QQmlDebugObjectReference &);
+ //void valueChanged(int, const QVariant &);
+
+ // Server sends value as string if it is a user-type variant
+ void valueChanged(const QByteArray &name, const QVariant &value);
+
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ void setState(State);
+ State m_state;
+ int m_queryId;
+ QQmlEngineDebug *m_client;
+ int m_objectDebugId;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugPropertyWatch : public QQmlDebugWatch
+{
+ Q_OBJECT
+public:
+ QQmlDebugPropertyWatch(QObject *parent);
+
+ QString name() const;
+
+private:
+ friend class QQmlEngineDebug;
+ QString m_name;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugObjectExpressionWatch : public QQmlDebugWatch
+{
+ Q_OBJECT
+public:
+ QQmlDebugObjectExpressionWatch(QObject *parent);
+
+ QString expression() const;
+
+private:
+ friend class QQmlEngineDebug;
+ QString m_expr;
+ int m_debugId;
+};
+
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugQuery : public QObject
+{
+ Q_OBJECT
+public:
+ enum State { Waiting, Error, Completed };
+
+ State state() const;
+ bool isWaiting() const;
+
+Q_SIGNALS:
+ void stateChanged(QQmlDebugQuery::State);
+
+protected:
+ QQmlDebugQuery(QObject *);
+
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ void setState(State);
+ State m_state;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugFileReference
+{
+public:
+ QQmlDebugFileReference();
+ QQmlDebugFileReference(const QQmlDebugFileReference &);
+ QQmlDebugFileReference &operator=(const QQmlDebugFileReference &);
+
+ QUrl url() const;
+ void setUrl(const QUrl &);
+ int lineNumber() const;
+ void setLineNumber(int);
+ int columnNumber() const;
+ void setColumnNumber(int);
+
+private:
+ friend class QQmlEngineDebugPrivate;
+ QUrl m_url;
+ int m_lineNumber;
+ int m_columnNumber;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugEngineReference
+{
+public:
+ QQmlDebugEngineReference();
+ QQmlDebugEngineReference(int);
+ QQmlDebugEngineReference(const QQmlDebugEngineReference &);
+ QQmlDebugEngineReference &operator=(const QQmlDebugEngineReference &);
+
+ int debugId() const;
+ QString name() const;
+
+private:
+ friend class QQmlEngineDebugPrivate;
+ int m_debugId;
+ QString m_name;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugObjectReference
+{
+public:
+ QQmlDebugObjectReference();
+ QQmlDebugObjectReference(int);
+ QQmlDebugObjectReference(const QQmlDebugObjectReference &);
+ QQmlDebugObjectReference &operator=(const QQmlDebugObjectReference &);
+
+ int debugId() const;
+ QString className() const;
+ QString idString() const;
+ QString name() const;
+
+ QQmlDebugFileReference source() const;
+ int contextDebugId() const;
+
+ QList<QQmlDebugPropertyReference> properties() const;
+ QList<QQmlDebugObjectReference> children() const;
+
+private:
+ friend class QQmlEngineDebugPrivate;
+ int m_debugId;
+ QString m_class;
+ QString m_idString;
+ QString m_name;
+ QQmlDebugFileReference m_source;
+ int m_contextDebugId;
+ QList<QQmlDebugPropertyReference> m_properties;
+ QList<QQmlDebugObjectReference> m_children;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugContextReference
+{
+public:
+ QQmlDebugContextReference();
+ QQmlDebugContextReference(const QQmlDebugContextReference &);
+ QQmlDebugContextReference &operator=(const QQmlDebugContextReference &);
+
+ int debugId() const;
+ QString name() const;
+
+ QList<QQmlDebugObjectReference> objects() const;
+ QList<QQmlDebugContextReference> contexts() const;
+
+private:
+ friend class QQmlEngineDebugPrivate;
+ int m_debugId;
+ QString m_name;
+ QList<QQmlDebugObjectReference> m_objects;
+ QList<QQmlDebugContextReference> m_contexts;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugPropertyReference
+{
+public:
+ QQmlDebugPropertyReference();
+ QQmlDebugPropertyReference(const QQmlDebugPropertyReference &);
+ QQmlDebugPropertyReference &operator=(const QQmlDebugPropertyReference &);
+
+ int objectDebugId() const;
+ QString name() const;
+ QVariant value() const;
+ QString valueTypeName() const;
+ QString binding() const;
+ bool hasNotifySignal() const;
+
+private:
+ friend class QQmlEngineDebugPrivate;
+ int m_objectDebugId;
+ QString m_name;
+ QVariant m_value;
+ QString m_valueTypeName;
+ QString m_binding;
+ bool m_hasNotifySignal;
+};
+
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugEnginesQuery : public QQmlDebugQuery
+{
+ Q_OBJECT
+public:
+ virtual ~QQmlDebugEnginesQuery();
+ QList<QQmlDebugEngineReference> engines() const;
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ QQmlDebugEnginesQuery(QObject *);
+ QQmlEngineDebug *m_client;
+ int m_queryId;
+ QList<QQmlDebugEngineReference> m_engines;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugRootContextQuery : public QQmlDebugQuery
+{
+ Q_OBJECT
+public:
+ virtual ~QQmlDebugRootContextQuery();
+ QQmlDebugContextReference rootContext() const;
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ QQmlDebugRootContextQuery(QObject *);
+ QQmlEngineDebug *m_client;
+ int m_queryId;
+ QQmlDebugContextReference m_context;
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugObjectQuery : public QQmlDebugQuery
+{
+ Q_OBJECT
+public:
+ virtual ~QQmlDebugObjectQuery();
+ QQmlDebugObjectReference object() const;
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ QQmlDebugObjectQuery(QObject *);
+ QQmlEngineDebug *m_client;
+ int m_queryId;
+ QQmlDebugObjectReference m_object;
+
+};
+
+class Q_QML_PRIVATE_EXPORT QQmlDebugExpressionQuery : public QQmlDebugQuery
+{
+ Q_OBJECT
+public:
+ virtual ~QQmlDebugExpressionQuery();
+ QVariant expression() const;
+ QVariant result() const;
+private:
+ friend class QQmlEngineDebug;
+ friend class QQmlEngineDebugPrivate;
+ QQmlDebugExpressionQuery(QObject *);
+ QQmlEngineDebug *m_client;
+ int m_queryId;
+ QVariant m_expr;
+ QVariant m_result;
+};
+
+QT_END_NAMESPACE
+
+Q_DECLARE_METATYPE(QQmlDebugEngineReference)
+Q_DECLARE_METATYPE(QQmlDebugObjectReference)
+Q_DECLARE_METATYPE(QQmlDebugContextReference)
+Q_DECLARE_METATYPE(QQmlDebugPropertyReference)
+
+QT_END_HEADER
+
+#endif // QQMLENGINEDEBUG_H
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp b/src/qml/debugger/qqmlenginedebugservice.cpp
index 4943959c33..be2e826bdf 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice.cpp
+++ b/src/qml/debugger/qqmlenginedebugservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,36 +39,36 @@
**
****************************************************************************/
-#include "qdeclarativeenginedebugservice_p.h"
-
-#include "qdeclarativedebugstatesdelegate_p.h"
-#include <private/qdeclarativeboundsignal_p.h>
-#include <qdeclarativeengine.h>
-#include <private/qdeclarativemetatype_p.h>
-#include <qdeclarativeproperty.h>
-#include <private/qdeclarativeproperty_p.h>
-#include <private/qdeclarativebinding_p.h>
-#include <private/qdeclarativecontext_p.h>
-#include <private/qdeclarativewatcher_p.h>
-#include <private/qdeclarativevaluetype_p.h>
-#include <private/qdeclarativevmemetaobject_p.h>
-#include <private/qdeclarativeexpression_p.h>
+#include "qqmlenginedebugservice_p.h"
+
+#include "qqmldebugstatesdelegate_p.h"
+#include <private/qqmlboundsignal_p.h>
+#include <qqmlengine.h>
+#include <private/qqmlmetatype_p.h>
+#include <qqmlproperty.h>
+#include <private/qqmlproperty_p.h>
+#include <private/qqmlbinding_p.h>
+#include <private/qqmlcontext_p.h>
+#include <private/qqmlwatcher_p.h>
+#include <private/qqmlvaluetype_p.h>
+#include <private/qqmlvmemetaobject_p.h>
+#include <private/qqmlexpression_p.h>
#include <QtCore/qdebug.h>
#include <QtCore/qmetaobject.h>
QT_BEGIN_NAMESPACE
-Q_GLOBAL_STATIC(QDeclarativeEngineDebugService, qmlEngineDebugService);
+Q_GLOBAL_STATIC(QQmlEngineDebugService, qmlEngineDebugService);
-QDeclarativeEngineDebugService *QDeclarativeEngineDebugService::instance()
+QQmlEngineDebugService *QQmlEngineDebugService::instance()
{
return qmlEngineDebugService();
}
-QDeclarativeEngineDebugService::QDeclarativeEngineDebugService(QObject *parent)
- : QDeclarativeDebugService(QLatin1String("QDeclarativeEngine"), 1, parent),
- m_watch(new QDeclarativeWatcher(this)),
+QQmlEngineDebugService::QQmlEngineDebugService(QObject *parent)
+ : QQmlDebugService(QLatin1String("QQmlEngine"), 1, parent),
+ m_watch(new QQmlWatcher(this)),
m_statesDelegate(0)
{
QObject::connect(m_watch, SIGNAL(propertyChanged(int,int,QMetaProperty,QVariant)),
@@ -77,13 +77,13 @@ QDeclarativeEngineDebugService::QDeclarativeEngineDebugService(QObject *parent)
registerService();
}
-QDeclarativeEngineDebugService::~QDeclarativeEngineDebugService()
+QQmlEngineDebugService::~QQmlEngineDebugService()
{
delete m_statesDelegate;
}
QDataStream &operator<<(QDataStream &ds,
- const QDeclarativeEngineDebugService::QDeclarativeObjectData &data)
+ const QQmlEngineDebugService::QQmlObjectData &data)
{
ds << data.url << data.lineNumber << data.columnNumber << data.idString
<< data.objectName << data.objectType << data.objectId << data.contextId;
@@ -91,7 +91,7 @@ QDataStream &operator<<(QDataStream &ds,
}
QDataStream &operator>>(QDataStream &ds,
- QDeclarativeEngineDebugService::QDeclarativeObjectData &data)
+ QQmlEngineDebugService::QQmlObjectData &data)
{
ds >> data.url >> data.lineNumber >> data.columnNumber >> data.idString
>> data.objectName >> data.objectType >> data.objectId >> data.contextId;
@@ -99,7 +99,7 @@ QDataStream &operator>>(QDataStream &ds,
}
QDataStream &operator<<(QDataStream &ds,
- const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &data)
+ const QQmlEngineDebugService::QQmlObjectProperty &data)
{
ds << (int)data.type << data.name << data.value << data.valueTypeName
<< data.binding << data.hasNotifySignal;
@@ -107,12 +107,12 @@ QDataStream &operator<<(QDataStream &ds,
}
QDataStream &operator>>(QDataStream &ds,
- QDeclarativeEngineDebugService::QDeclarativeObjectProperty &data)
+ QQmlEngineDebugService::QQmlObjectProperty &data)
{
int type;
ds >> type >> data.name >> data.value >> data.valueTypeName
>> data.binding >> data.hasNotifySignal;
- data.type = (QDeclarativeEngineDebugService::QDeclarativeObjectProperty::Type)type;
+ data.type = (QQmlEngineDebugService::QQmlObjectProperty::Type)type;
return ds;
}
@@ -131,7 +131,7 @@ static bool hasValidSignal(QObject *object, const QString &propertyName)
QString signalName = propertyName.mid(2);
signalName[0] = signalName.at(0).toLower();
- int sigIdx = QDeclarativePropertyPrivate::findSignalByName(object->metaObject(), signalName.toLatin1()).methodIndex();
+ int sigIdx = QQmlPropertyPrivate::findSignalByName(object->metaObject(), signalName.toLatin1()).methodIndex();
if (sigIdx == -1)
return false;
@@ -139,32 +139,32 @@ static bool hasValidSignal(QObject *object, const QString &propertyName)
return true;
}
-QDeclarativeEngineDebugService::QDeclarativeObjectProperty
-QDeclarativeEngineDebugService::propertyData(QObject *obj, int propIdx)
+QQmlEngineDebugService::QQmlObjectProperty
+QQmlEngineDebugService::propertyData(QObject *obj, int propIdx)
{
- QDeclarativeObjectProperty rv;
+ QQmlObjectProperty rv;
QMetaProperty prop = obj->metaObject()->property(propIdx);
- rv.type = QDeclarativeObjectProperty::Unknown;
+ rv.type = QQmlObjectProperty::Unknown;
rv.valueTypeName = QString::fromUtf8(prop.typeName());
rv.name = QString::fromUtf8(prop.name());
rv.hasNotifySignal = prop.hasNotifySignal();
- QDeclarativeAbstractBinding *binding =
- QDeclarativePropertyPrivate::binding(QDeclarativeProperty(obj, rv.name));
+ QQmlAbstractBinding *binding =
+ QQmlPropertyPrivate::binding(QQmlProperty(obj, rv.name));
if (binding)
rv.binding = binding->expression();
- if (QDeclarativeValueTypeFactory::isValueType(prop.userType())) {
- rv.type = QDeclarativeObjectProperty::Basic;
- } else if (QDeclarativeMetaType::isQObject(prop.userType())) {
- rv.type = QDeclarativeObjectProperty::Object;
- } else if (QDeclarativeMetaType::isList(prop.userType())) {
- rv.type = QDeclarativeObjectProperty::List;
+ if (QQmlValueTypeFactory::isValueType(prop.userType())) {
+ rv.type = QQmlObjectProperty::Basic;
+ } else if (QQmlMetaType::isQObject(prop.userType())) {
+ rv.type = QQmlObjectProperty::Object;
+ } else if (QQmlMetaType::isList(prop.userType())) {
+ rv.type = QQmlObjectProperty::List;
}
QVariant value;
- if (rv.type != QDeclarativeObjectProperty::Unknown && prop.userType() != 0) {
+ if (rv.type != QQmlObjectProperty::Unknown && prop.userType() != 0) {
value = prop.read(obj);
}
rv.value = valueContents(value);
@@ -172,7 +172,7 @@ QDeclarativeEngineDebugService::propertyData(QObject *obj, int propIdx)
return rv;
}
-QVariant QDeclarativeEngineDebugService::valueContents(const QVariant &value) const
+QVariant QQmlEngineDebugService::valueContents(const QVariant &value) const
{
int userType = value.userType();
@@ -198,11 +198,11 @@ QVariant QDeclarativeEngineDebugService::valueContents(const QVariant &value) co
return contents;
}
- if (QDeclarativeValueTypeFactory::isValueType(userType))
+ if (QQmlValueTypeFactory::isValueType(userType))
return value;
- if (QDeclarativeMetaType::isQObject(userType)) {
- QObject *o = QDeclarativeMetaType::toQObject(value);
+ if (QQmlMetaType::isQObject(userType)) {
+ QObject *o = QQmlMetaType::toQObject(value);
if (o) {
QString name = o->objectName();
if (name.isEmpty())
@@ -214,7 +214,7 @@ QVariant QDeclarativeEngineDebugService::valueContents(const QVariant &value) co
return QLatin1String("<unknown value>");
}
-void QDeclarativeEngineDebugService::buildObjectDump(QDataStream &message,
+void QQmlEngineDebugService::buildObjectDump(QDataStream &message,
QObject *object, bool recur, bool dumpProperties)
{
message << objectData(object);
@@ -223,26 +223,26 @@ void QDeclarativeEngineDebugService::buildObjectDump(QDataStream &message,
int childrenCount = children.count();
for (int ii = 0; ii < children.count(); ++ii) {
- if (qobject_cast<QDeclarativeContext*>(children[ii]) || QDeclarativeBoundSignal::cast(children[ii]))
+ if (qobject_cast<QQmlContext*>(children[ii]) || QQmlBoundSignal::cast(children[ii]))
--childrenCount;
}
message << childrenCount << recur;
- QList<QDeclarativeObjectProperty> fakeProperties;
+ QList<QQmlObjectProperty> fakeProperties;
for (int ii = 0; ii < children.count(); ++ii) {
QObject *child = children.at(ii);
- if (qobject_cast<QDeclarativeContext*>(child))
+ if (qobject_cast<QQmlContext*>(child))
continue;
- QDeclarativeBoundSignal *signal = QDeclarativeBoundSignal::cast(child);
+ QQmlBoundSignal *signal = QQmlBoundSignal::cast(child);
if (signal) {
if (!dumpProperties)
continue;
- QDeclarativeObjectProperty prop;
- prop.type = QDeclarativeObjectProperty::SignalProperty;
+ QQmlObjectProperty prop;
+ prop.type = QQmlObjectProperty::SignalProperty;
prop.hasNotifySignal = false;
- QDeclarativeExpression *expr = signal->expression();
+ QQmlExpression *expr = signal->expression();
if (expr) {
prop.value = expr->expression();
QObject *scope = expr->scopeObject();
@@ -285,7 +285,7 @@ void QDeclarativeEngineDebugService::buildObjectDump(QDataStream &message,
message << fakeProperties[ii];
}
-void QDeclarativeEngineDebugService::prepareDeferredObjects(QObject *obj)
+void QQmlEngineDebugService::prepareDeferredObjects(QObject *obj)
{
qmlExecuteDeferred(obj);
@@ -297,18 +297,18 @@ void QDeclarativeEngineDebugService::prepareDeferredObjects(QObject *obj)
}
-void QDeclarativeEngineDebugService::buildObjectList(QDataStream &message, QDeclarativeContext *ctxt)
+void QQmlEngineDebugService::buildObjectList(QDataStream &message, QQmlContext *ctxt)
{
- QDeclarativeContextData *p = QDeclarativeContextData::get(ctxt);
+ QQmlContextData *p = QQmlContextData::get(ctxt);
QString ctxtName = ctxt->objectName();
- int ctxtId = QDeclarativeDebugService::idForObject(ctxt);
+ int ctxtId = QQmlDebugService::idForObject(ctxt);
message << ctxtName << ctxtId;
int count = 0;
- QDeclarativeContextData *child = p->childContexts;
+ QQmlContextData *child = p->childContexts;
while (child) {
++count;
child = child->nextChild;
@@ -318,12 +318,12 @@ void QDeclarativeEngineDebugService::buildObjectList(QDataStream &message, QDecl
child = p->childContexts;
while (child) {
- buildObjectList(message, child->asQDeclarativeContext());
+ buildObjectList(message, child->asQQmlContext());
child = child->nextChild;
}
// Clean deleted objects
- QDeclarativeContextPrivate *ctxtPriv = QDeclarativeContextPrivate::get(ctxt);
+ QQmlContextPrivate *ctxtPriv = QQmlContextPrivate::get(ctxt);
for (int ii = 0; ii < ctxtPriv->instances.count(); ++ii) {
if (!ctxtPriv->instances.at(ii)) {
ctxtPriv->instances.removeAt(ii);
@@ -337,17 +337,17 @@ void QDeclarativeEngineDebugService::buildObjectList(QDataStream &message, QDecl
}
}
-void QDeclarativeEngineDebugService::buildStatesList(QDeclarativeContext *ctxt, bool cleanList)
+void QQmlEngineDebugService::buildStatesList(QQmlContext *ctxt, bool cleanList)
{
if (m_statesDelegate)
m_statesDelegate->buildStatesList(ctxt, cleanList);
}
-QDeclarativeEngineDebugService::QDeclarativeObjectData
-QDeclarativeEngineDebugService::objectData(QObject *object)
+QQmlEngineDebugService::QQmlObjectData
+QQmlEngineDebugService::objectData(QObject *object)
{
- QDeclarativeData *ddata = QDeclarativeData::get(object);
- QDeclarativeObjectData rv;
+ QQmlData *ddata = QQmlData::get(object);
+ QQmlObjectData rv;
if (ddata && ddata->outerContext) {
rv.url = ddata->outerContext->url;
rv.lineNumber = ddata->lineNumber;
@@ -357,18 +357,18 @@ QDeclarativeEngineDebugService::objectData(QObject *object)
rv.columnNumber = -1;
}
- QDeclarativeContext *context = qmlContext(object);
+ QQmlContext *context = qmlContext(object);
if (context) {
- QDeclarativeContextData *cdata = QDeclarativeContextData::get(context);
+ QQmlContextData *cdata = QQmlContextData::get(context);
if (cdata)
rv.idString = cdata->findObjectId(object);
}
rv.objectName = object->objectName();
- rv.objectId = QDeclarativeDebugService::idForObject(object);
- rv.contextId = QDeclarativeDebugService::idForObject(qmlContext(object));
+ rv.objectId = QQmlDebugService::idForObject(object);
+ rv.contextId = QQmlDebugService::idForObject(qmlContext(object));
- QDeclarativeType *type = QDeclarativeMetaType::qmlType(object->metaObject());
+ QQmlType *type = QQmlMetaType::qmlType(object->metaObject());
if (type) {
QString typeName = type->qmlTypeName();
int lastSlash = typeName.lastIndexOf(QLatin1Char('/'));
@@ -383,12 +383,12 @@ QDeclarativeEngineDebugService::objectData(QObject *object)
return rv;
}
-void QDeclarativeEngineDebugService::messageReceived(const QByteArray &message)
+void QQmlEngineDebugService::messageReceived(const QByteArray &message)
{
QMetaObject::invokeMethod(this, "processMessage", Qt::QueuedConnection, Q_ARG(QByteArray, message));
}
-void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
+void QQmlEngineDebugService::processMessage(const QByteArray &message)
{
QDataStream ds(message);
@@ -405,10 +405,10 @@ void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
rs << queryId << m_engines.count();
for (int ii = 0; ii < m_engines.count(); ++ii) {
- QDeclarativeEngine *engine = m_engines.at(ii);
+ QQmlEngine *engine = m_engines.at(ii);
QString engineName = engine->objectName();
- int engineId = QDeclarativeDebugService::idForObject(engine);
+ int engineId = QQmlDebugService::idForObject(engine);
rs << engineName << engineId;
}
@@ -419,8 +419,8 @@ void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
int engineId = -1;
ds >> queryId >> engineId;
- QDeclarativeEngine *engine =
- qobject_cast<QDeclarativeEngine *>(QDeclarativeDebugService::objectForId(engineId));
+ QQmlEngine *engine =
+ qobject_cast<QQmlEngine *>(QQmlDebugService::objectForId(engineId));
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
@@ -440,7 +440,7 @@ void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
ds >> queryId >> objectId >> recurse >> dumpProperties;
- QObject *object = QDeclarativeDebugService::objectForId(objectId);
+ QObject *object = QQmlDebugService::objectForId(objectId);
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
@@ -502,11 +502,11 @@ void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
ds >> queryId >> objectId >> expr;
- QObject *object = QDeclarativeDebugService::objectForId(objectId);
- QDeclarativeContext *context = qmlContext(object);
+ QObject *object = QQmlDebugService::objectForId(objectId);
+ QQmlContext *context = qmlContext(object);
QVariant result;
if (object && context) {
- QDeclarativeExpression exprObj(context, object, expr);
+ QQmlExpression exprObj(context, object, expr);
bool undefined = false;
QVariant value = exprObj.evaluate(&undefined);
if (undefined)
@@ -548,7 +548,7 @@ void QDeclarativeEngineDebugService::processMessage(const QByteArray &message)
}
}
-void QDeclarativeEngineDebugService::setBinding(int objectId,
+void QQmlEngineDebugService::setBinding(int objectId,
const QString &propertyName,
const QVariant &expression,
bool isLiteralValue,
@@ -557,10 +557,10 @@ void QDeclarativeEngineDebugService::setBinding(int objectId,
int column)
{
QObject *object = objectForId(objectId);
- QDeclarativeContext *context = qmlContext(object);
+ QQmlContext *context = qmlContext(object);
if (object && context) {
- QDeclarativeProperty property(object, propertyName, context);
+ QQmlProperty property(object, propertyName, context);
if (property.isValid()) {
bool inBaseState = true;
@@ -573,20 +573,20 @@ void QDeclarativeEngineDebugService::setBinding(int objectId,
if (isLiteralValue) {
property.write(expression);
} else if (hasValidSignal(object, propertyName)) {
- QDeclarativeExpression *declarativeExpression = new QDeclarativeExpression(context, object, expression.toString());
- QDeclarativePropertyPrivate::setSignalExpression(property, declarativeExpression);
- declarativeExpression->setSourceLocation(filename, line, column);
+ QQmlExpression *qmlExpression = new QQmlExpression(context, object, expression.toString());
+ QQmlPropertyPrivate::setSignalExpression(property, qmlExpression);
+ qmlExpression->setSourceLocation(filename, line, column);
} else if (property.isProperty()) {
- QDeclarativeBinding *binding = new QDeclarativeBinding(expression.toString(), object, context);
+ QQmlBinding *binding = new QQmlBinding(expression.toString(), object, context);
binding->setTarget(property);
binding->setSourceLocation(filename, line, column);
binding->setNotifyOnValueChanged(true);
- QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, binding);
+ QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::setBinding(property, binding);
if (oldBinding)
oldBinding->destroy();
binding->update();
} else {
- qWarning() << "QDeclarativeEngineDebugService::setBinding: unable to set property" << propertyName << "on object" << object;
+ qWarning() << "QQmlEngineDebugService::setBinding: unable to set property" << propertyName << "on object" << object;
}
}
@@ -596,37 +596,37 @@ void QDeclarativeEngineDebugService::setBinding(int objectId,
if (m_statesDelegate)
ok = m_statesDelegate->setBindingForInvalidProperty(object, propertyName, expression, isLiteralValue);
if (!ok)
- qWarning() << "QDeclarativeEngineDebugService::setBinding: unable to set property" << propertyName << "on object" << object;
+ qWarning() << "QQmlEngineDebugService::setBinding: unable to set property" << propertyName << "on object" << object;
}
}
}
-void QDeclarativeEngineDebugService::resetBinding(int objectId, const QString &propertyName)
+void QQmlEngineDebugService::resetBinding(int objectId, const QString &propertyName)
{
QObject *object = objectForId(objectId);
- QDeclarativeContext *context = qmlContext(object);
+ QQmlContext *context = qmlContext(object);
if (object && context) {
if (object->property(propertyName.toLatin1()).isValid()) {
- QDeclarativeProperty property(object, propertyName);
- QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::binding(property);
+ QQmlProperty property(object, propertyName);
+ QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::binding(property);
if (oldBinding) {
- QDeclarativeAbstractBinding *oldBinding = QDeclarativePropertyPrivate::setBinding(property, 0);
+ QQmlAbstractBinding *oldBinding = QQmlPropertyPrivate::setBinding(property, 0);
if (oldBinding)
oldBinding->destroy();
}
if (property.isResettable()) {
// Note: this will reset the property in any case, without regard to states
- // Right now almost no QDeclarativeItem has reset methods for its properties (with the
- // notable exception of QDeclarativeAnchors), so this is not a big issue
+ // Right now almost no QQuickItem has reset methods for its properties (with the
+ // notable exception of QQuickAnchors), so this is not a big issue
// later on, setBinding does take states into account
property.reset();
} else {
// overwrite with default value
- if (QDeclarativeType *objType = QDeclarativeMetaType::qmlType(object->metaObject())) {
+ if (QQmlType *objType = QQmlMetaType::qmlType(object->metaObject())) {
if (QObject *emptyObject = objType->create()) {
if (emptyObject->property(propertyName.toLatin1()).isValid()) {
- QVariant defaultValue = QDeclarativeProperty(emptyObject, propertyName).read();
+ QVariant defaultValue = QQmlProperty(emptyObject, propertyName).read();
if (defaultValue.isValid()) {
setBinding(objectId, propertyName, defaultValue, true);
}
@@ -636,8 +636,8 @@ void QDeclarativeEngineDebugService::resetBinding(int objectId, const QString &p
}
}
} else if (hasValidSignal(object, propertyName)) {
- QDeclarativeProperty property(object, propertyName, context);
- QDeclarativePropertyPrivate::setSignalExpression(property, 0);
+ QQmlProperty property(object, propertyName, context);
+ QQmlPropertyPrivate::setSignalExpression(property, 0);
} else {
if (m_statesDelegate)
m_statesDelegate->resetBindingForInvalidProperty(object, propertyName);
@@ -645,19 +645,19 @@ void QDeclarativeEngineDebugService::resetBinding(int objectId, const QString &p
}
}
-void QDeclarativeEngineDebugService::setMethodBody(int objectId, const QString &method, const QString &body)
+void QQmlEngineDebugService::setMethodBody(int objectId, const QString &method, const QString &body)
{
QObject *object = objectForId(objectId);
- QDeclarativeContext *context = qmlContext(object);
+ QQmlContext *context = qmlContext(object);
if (!object || !context || !context->engine())
return;
- QDeclarativeContextData *contextData = QDeclarativeContextData::get(context);
+ QQmlContextData *contextData = QQmlContextData::get(context);
if (!contextData)
return;
- QDeclarativePropertyData dummy;
- QDeclarativePropertyData *prop =
- QDeclarativePropertyCache::property(context->engine(), object, method, dummy);
+ QQmlPropertyData dummy;
+ QQmlPropertyData *prop =
+ QQmlPropertyCache::property(context->engine(), object, method, dummy);
if (!prop || !prop->isVMEFunction())
return;
@@ -676,15 +676,15 @@ void QDeclarativeEngineDebugService::setMethodBody(int objectId, const QString &
jsfunction += body;
jsfunction += QLatin1String("\n})");
- QDeclarativeVMEMetaObject *vmeMetaObject =
- static_cast<QDeclarativeVMEMetaObject*>(QObjectPrivate::get(object)->metaObject);
+ QQmlVMEMetaObject *vmeMetaObject =
+ static_cast<QQmlVMEMetaObject*>(QObjectPrivate::get(object)->metaObject);
Q_ASSERT(vmeMetaObject); // the fact we found the property above should guarentee this
int lineNumber = vmeMetaObject->vmeMethodLineNumber(prop->coreIndex);
- vmeMetaObject->setVmeMethod(prop->coreIndex, QDeclarativeExpressionPrivate::evalFunction(contextData, object, jsfunction, contextData->url.toString(), lineNumber));
+ vmeMetaObject->setVmeMethod(prop->coreIndex, QQmlExpressionPrivate::evalFunction(contextData, object, jsfunction, contextData->url.toString(), lineNumber));
}
-void QDeclarativeEngineDebugService::propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value)
+void QQmlEngineDebugService::propertyChanged(int id, int objectId, const QMetaProperty &property, const QVariant &value)
{
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
@@ -694,7 +694,7 @@ void QDeclarativeEngineDebugService::propertyChanged(int id, int objectId, const
sendMessage(reply);
}
-void QDeclarativeEngineDebugService::addEngine(QDeclarativeEngine *engine)
+void QQmlEngineDebugService::addEngine(QQmlEngine *engine)
{
Q_ASSERT(engine);
Q_ASSERT(!m_engines.contains(engine));
@@ -702,7 +702,7 @@ void QDeclarativeEngineDebugService::addEngine(QDeclarativeEngine *engine)
m_engines.append(engine);
}
-void QDeclarativeEngineDebugService::remEngine(QDeclarativeEngine *engine)
+void QQmlEngineDebugService::remEngine(QQmlEngine *engine)
{
Q_ASSERT(engine);
Q_ASSERT(m_engines.contains(engine));
@@ -710,13 +710,13 @@ void QDeclarativeEngineDebugService::remEngine(QDeclarativeEngine *engine)
m_engines.removeAll(engine);
}
-void QDeclarativeEngineDebugService::objectCreated(QDeclarativeEngine *engine, QObject *object)
+void QQmlEngineDebugService::objectCreated(QQmlEngine *engine, QObject *object)
{
Q_ASSERT(engine);
Q_ASSERT(m_engines.contains(engine));
- int engineId = QDeclarativeDebugService::idForObject(engine);
- int objectId = QDeclarativeDebugService::idForObject(object);
+ int engineId = QQmlDebugService::idForObject(engine);
+ int objectId = QQmlDebugService::idForObject(object);
QByteArray reply;
QDataStream rs(&reply, QIODevice::WriteOnly);
@@ -725,7 +725,7 @@ void QDeclarativeEngineDebugService::objectCreated(QDeclarativeEngine *engine, Q
sendMessage(reply);
}
-void QDeclarativeEngineDebugService::setStatesDelegate(QDeclarativeDebugStatesDelegate *delegate)
+void QQmlEngineDebugService::setStatesDelegate(QQmlDebugStatesDelegate *delegate)
{
m_statesDelegate = delegate;
}
diff --git a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h b/src/qml/debugger/qqmlenginedebugservice_p.h
index d252654492..1a92801fcc 100644
--- a/src/declarative/debugger/qdeclarativeenginedebugservice_p.h
+++ b/src/qml/debugger/qqmlenginedebugservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEENGINEDEBUGSERVICE_P_H
-#define QDECLARATIVEENGINEDEBUGSERVICE_P_H
+#ifndef QQMLENGINEDEBUGSERVICE_P_H
+#define QQMLENGINEDEBUGSERVICE_P_H
//
// W A R N I N G
@@ -53,27 +53,27 @@
// We mean it.
//
-#include <private/qdeclarativedebugservice_p.h>
+#include <private/qqmldebugservice_p.h>
#include <QtCore/qurl.h>
#include <QtCore/qvariant.h>
QT_BEGIN_NAMESPACE
-class QDeclarativeEngine;
-class QDeclarativeContext;
-class QDeclarativeWatcher;
+class QQmlEngine;
+class QQmlContext;
+class QQmlWatcher;
class QDataStream;
-class QDeclarativeDebugStatesDelegate;
+class QQmlDebugStatesDelegate;
-class Q_DECLARATIVE_PRIVATE_EXPORT QDeclarativeEngineDebugService : public QDeclarativeDebugService
+class Q_QML_PRIVATE_EXPORT QQmlEngineDebugService : public QQmlDebugService
{
Q_OBJECT
public:
- QDeclarativeEngineDebugService(QObject * = 0);
- ~QDeclarativeEngineDebugService();
+ QQmlEngineDebugService(QObject * = 0);
+ ~QQmlEngineDebugService();
- struct QDeclarativeObjectData {
+ struct QQmlObjectData {
QUrl url;
int lineNumber;
int columnNumber;
@@ -84,7 +84,7 @@ public:
int contextId;
};
- struct QDeclarativeObjectProperty {
+ struct QQmlObjectProperty {
enum Type { Unknown, Basic, Object, List, SignalProperty };
Type type;
QString name;
@@ -94,13 +94,13 @@ public:
bool hasNotifySignal;
};
- void addEngine(QDeclarativeEngine *);
- void remEngine(QDeclarativeEngine *);
- void objectCreated(QDeclarativeEngine *, QObject *);
+ void addEngine(QQmlEngine *);
+ void remEngine(QQmlEngine *);
+ void objectCreated(QQmlEngine *, QObject *);
- void setStatesDelegate(QDeclarativeDebugStatesDelegate *);
+ void setStatesDelegate(QQmlDebugStatesDelegate *);
- static QDeclarativeEngineDebugService *instance();
+ static QQmlEngineDebugService *instance();
protected:
virtual void messageReceived(const QByteArray &);
@@ -111,26 +111,26 @@ private Q_SLOTS:
private:
void prepareDeferredObjects(QObject *);
- void buildObjectList(QDataStream &, QDeclarativeContext *);
+ void buildObjectList(QDataStream &, QQmlContext *);
void buildObjectDump(QDataStream &, QObject *, bool, bool);
- void buildStatesList(QDeclarativeContext *, bool);
- QDeclarativeObjectData objectData(QObject *);
- QDeclarativeObjectProperty propertyData(QObject *, int);
+ void buildStatesList(QQmlContext *, bool);
+ QQmlObjectData objectData(QObject *);
+ QQmlObjectProperty propertyData(QObject *, int);
QVariant valueContents(const QVariant &defaultValue) const;
void setBinding(int objectId, const QString &propertyName, const QVariant &expression, bool isLiteralValue, QString filename = QString(), int line = -1, int column = 0);
void resetBinding(int objectId, const QString &propertyName);
void setMethodBody(int objectId, const QString &method, const QString &body);
- QList<QDeclarativeEngine *> m_engines;
- QDeclarativeWatcher *m_watch;
- QDeclarativeDebugStatesDelegate *m_statesDelegate;
+ QList<QQmlEngine *> m_engines;
+ QQmlWatcher *m_watch;
+ QQmlDebugStatesDelegate *m_statesDelegate;
};
-Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectData &);
-Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectData &);
-Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QDeclarativeEngineDebugService::QDeclarativeObjectProperty &);
-Q_DECLARATIVE_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QDeclarativeEngineDebugService::QDeclarativeObjectProperty &);
+Q_QML_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QQmlEngineDebugService::QQmlObjectData &);
+Q_QML_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QQmlEngineDebugService::QQmlObjectData &);
+Q_QML_PRIVATE_EXPORT QDataStream &operator<<(QDataStream &, const QQmlEngineDebugService::QQmlObjectProperty &);
+Q_QML_PRIVATE_EXPORT QDataStream &operator>>(QDataStream &, QQmlEngineDebugService::QQmlObjectProperty &);
QT_END_NAMESPACE
-#endif // QDECLARATIVEENGINEDEBUGSERVICE_P_H
+#endif // QQMLENGINEDEBUGSERVICE_P_H
diff --git a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h b/src/qml/debugger/qqmlinspectorinterface_p.h
index e109fc015e..7f52dffa2e 100644
--- a/src/declarative/debugger/qdeclarativeinspectorinterface_p.h
+++ b/src/qml/debugger/qqmlinspectorinterface_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEINSPECTORINTERFACE_H
-#define QDECLARATIVEINSPECTORINTERFACE_H
+#ifndef QQMLINSPECTORINTERFACE_H
+#define QQMLINSPECTORINTERFACE_H
//
// W A R N I N G
@@ -53,18 +53,18 @@
// We mean it.
//
-#include <private/qdeclarativeglobal_p.h>
+#include <QtQml/qtqmlglobal.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class Q_DECLARATIVE_EXPORT QDeclarativeInspectorInterface
+class Q_QML_EXPORT QQmlInspectorInterface
{
public:
- QDeclarativeInspectorInterface() {}
- virtual ~QDeclarativeInspectorInterface() {}
+ QQmlInspectorInterface() {}
+ virtual ~QQmlInspectorInterface() {}
virtual bool canHandleView(QObject *view) = 0;
@@ -74,10 +74,10 @@ public:
virtual void clientMessage(const QByteArray &message) = 0;
};
-Q_DECLARE_INTERFACE(QDeclarativeInspectorInterface, "com.trolltech.Qt.QDeclarativeInspectorInterface/1.0")
+Q_DECLARE_INTERFACE(QQmlInspectorInterface, "com.trolltech.Qt.QQmlInspectorInterface/1.0")
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEINSPECTORINTERFACE_H
+#endif // QQMLINSPECTORINTERFACE_H
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice.cpp b/src/qml/debugger/qqmlinspectorservice.cpp
index 94b04985ba..508d12eefa 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice.cpp
+++ b/src/qml/debugger/qqmlinspectorservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,9 +39,11 @@
**
****************************************************************************/
-#include "qdeclarativeinspectorservice_p.h"
-#include "qdeclarativeinspectorinterface_p.h"
-#include "qdeclarativedebugserver_p.h"
+#include "qqmlinspectorservice_p.h"
+#include "qqmlinspectorinterface_p.h"
+#include "qqmldebugserver_p.h"
+
+#include <private/qqmlglobal_p.h>
#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
@@ -53,46 +55,46 @@ DEFINE_BOOL_CONFIG_OPTION(qmlDebugVerbose, QML_DEBUGGER_VERBOSE)
QT_BEGIN_NAMESPACE
-Q_GLOBAL_STATIC(QDeclarativeInspectorService, serviceInstance)
+Q_GLOBAL_STATIC(QQmlInspectorService, serviceInstance)
-QDeclarativeInspectorService::QDeclarativeInspectorService()
- : QDeclarativeDebugService(QLatin1String("QDeclarativeObserverMode"), 1)
+QQmlInspectorService::QQmlInspectorService()
+ : QQmlDebugService(QLatin1String("QQmlObserverMode"), 1)
, m_currentInspectorPlugin(0)
{
registerService();
}
-QDeclarativeInspectorService *QDeclarativeInspectorService::instance()
+QQmlInspectorService *QQmlInspectorService::instance()
{
return serviceInstance();
}
-void QDeclarativeInspectorService::addView(QObject *view)
+void QQmlInspectorService::addView(QObject *view)
{
m_views.append(view);
updateState();
}
-void QDeclarativeInspectorService::removeView(QObject *view)
+void QQmlInspectorService::removeView(QObject *view)
{
m_views.removeAll(view);
updateState();
}
-void QDeclarativeInspectorService::sendMessage(const QByteArray &message)
+void QQmlInspectorService::sendMessage(const QByteArray &message)
{
if (state() != Enabled)
return;
- QDeclarativeDebugService::sendMessage(message);
+ QQmlDebugService::sendMessage(message);
}
-void QDeclarativeInspectorService::stateChanged(State /*state*/)
+void QQmlInspectorService::stateChanged(State /*state*/)
{
QMetaObject::invokeMethod(this, "updateState", Qt::QueuedConnection);
}
-void QDeclarativeInspectorService::updateState()
+void QQmlInspectorService::updateState()
{
if (m_views.isEmpty()) {
if (m_currentInspectorPlugin) {
@@ -107,12 +109,12 @@ void QDeclarativeInspectorService::updateState()
loadInspectorPlugins();
if (m_inspectorPlugins.isEmpty()) {
- qWarning() << "QDeclarativeInspector: No plugins found.";
- QDeclarativeDebugServer::instance()->removeService(this);
+ qWarning() << "QQmlInspector: No plugins found.";
+ QQmlDebugServer::instance()->removeService(this);
return;
}
- foreach (QDeclarativeInspectorInterface *inspector, m_inspectorPlugins) {
+ foreach (QQmlInspectorInterface *inspector, m_inspectorPlugins) {
if (inspector->canHandleView(m_views.first())) {
m_currentInspectorPlugin = inspector;
break;
@@ -120,7 +122,7 @@ void QDeclarativeInspectorService::updateState()
}
if (!m_currentInspectorPlugin) {
- qWarning() << "QDeclarativeInspector: No plugin available for view '" << m_views.first()->metaObject()->className() << "'.";
+ qWarning() << "QQmlInspector: No plugin available for view '" << m_views.first()->metaObject()->className() << "'.";
return;
}
m_currentInspectorPlugin->activate(m_views.first());
@@ -132,18 +134,18 @@ void QDeclarativeInspectorService::updateState()
}
}
-void QDeclarativeInspectorService::messageReceived(const QByteArray &message)
+void QQmlInspectorService::messageReceived(const QByteArray &message)
{
QMetaObject::invokeMethod(this, "processMessage", Qt::QueuedConnection, Q_ARG(QByteArray, message));
}
-void QDeclarativeInspectorService::processMessage(const QByteArray &message)
+void QQmlInspectorService::processMessage(const QByteArray &message)
{
if (m_currentInspectorPlugin)
m_currentInspectorPlugin->clientMessage(message);
}
-void QDeclarativeInspectorService::loadInspectorPlugins()
+void QQmlInspectorService::loadInspectorPlugins()
{
QStringList pluginCandidates;
const QStringList paths = QCoreApplication::libraryPaths();
@@ -156,25 +158,25 @@ void QDeclarativeInspectorService::loadInspectorPlugins()
foreach (const QString &pluginPath, pluginCandidates) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeInspector: Trying to load plugin " << pluginPath << "...";
+ qDebug() << "QQmlInspector: Trying to load plugin " << pluginPath << "...";
QPluginLoader loader(pluginPath);
if (!loader.load()) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeInspector: Error while loading: " << loader.errorString();
+ qDebug() << "QQmlInspector: Error while loading: " << loader.errorString();
continue;
}
- QDeclarativeInspectorInterface *inspector =
- qobject_cast<QDeclarativeInspectorInterface*>(loader.instance());
+ QQmlInspectorInterface *inspector =
+ qobject_cast<QQmlInspectorInterface*>(loader.instance());
if (inspector) {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeInspector: Plugin successfully loaded.";
+ qDebug() << "QQmlInspector: Plugin successfully loaded.";
m_inspectorPlugins << inspector;
} else {
if (qmlDebugVerbose())
- qDebug() << "QDeclarativeInspector: Plugin does not implement interface QDeclarativeInspectorInterface.";
+ qDebug() << "QQmlInspector: Plugin does not implement interface QQmlInspectorInterface.";
loader.unload();
}
diff --git a/src/declarative/debugger/qdeclarativeinspectorservice_p.h b/src/qml/debugger/qqmlinspectorservice_p.h
index 7ed530adc0..557dc38aa8 100644
--- a/src/declarative/debugger/qdeclarativeinspectorservice_p.h
+++ b/src/qml/debugger/qqmlinspectorservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEINSPECTORSERVICE_H
-#define QDECLARATIVEINSPECTORSERVICE_H
+#ifndef QQMLINSPECTORSERVICE_H
+#define QQMLINSPECTORSERVICE_H
//
// W A R N I N G
@@ -53,9 +53,9 @@
// We mean it.
//
-#include "qdeclarativedebugservice_p.h"
-#include <private/qdeclarativeglobal_p.h>
+#include "qqmldebugservice_p.h"
+#include <QtQml/qtqmlglobal.h>
#include <QtCore/QList>
QT_BEGIN_HEADER
@@ -63,15 +63,15 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-class QDeclarativeInspectorInterface;
+class QQmlInspectorInterface;
-class Q_DECLARATIVE_EXPORT QDeclarativeInspectorService : public QDeclarativeDebugService
+class Q_QML_EXPORT QQmlInspectorService : public QQmlDebugService
{
Q_OBJECT
public:
- QDeclarativeInspectorService();
- static QDeclarativeInspectorService *instance();
+ QQmlInspectorService();
+ static QQmlInspectorService *instance();
void addView(QObject *);
void removeView(QObject *);
@@ -90,12 +90,12 @@ private:
void loadInspectorPlugins();
QList<QObject*> m_views;
- QDeclarativeInspectorInterface *m_currentInspectorPlugin;
- QList<QDeclarativeInspectorInterface*> m_inspectorPlugins;
+ QQmlInspectorInterface *m_currentInspectorPlugin;
+ QList<QQmlInspectorInterface*> m_inspectorPlugins;
};
QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEINSPECTORSERVICE_H
+#endif // QQMLINSPECTORSERVICE_H
diff --git a/src/declarative/debugger/qdeclarativeprofilerservice.cpp b/src/qml/debugger/qqmlprofilerservice.cpp
index 17ee3e5836..d6a0307836 100644
--- a/src/declarative/debugger/qdeclarativeprofilerservice.cpp
+++ b/src/qml/debugger/qqmlprofilerservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#include "qdeclarativeprofilerservice_p.h"
+#include "qqmlprofilerservice_p.h"
#include <QtCore/qdatastream.h>
#include <QtCore/qurl.h>
@@ -52,45 +52,45 @@
QT_BEGIN_NAMESPACE
-Q_GLOBAL_STATIC(QDeclarativeProfilerService, profilerInstance)
+Q_GLOBAL_STATIC(QQmlProfilerService, profilerInstance)
-QDeclarativeBindingProfiler::QDeclarativeBindingProfiler(const QString &url, int line, int column)
+QQmlBindingProfiler::QQmlBindingProfiler(const QString &url, int line, int column)
{
- QDeclarativeProfilerService::startRange(QDeclarativeProfilerService::Binding);
- QDeclarativeProfilerService::rangeLocation(QDeclarativeProfilerService::Binding, url, line, column);
+ QQmlProfilerService::startRange(QQmlProfilerService::Binding);
+ QQmlProfilerService::rangeLocation(QQmlProfilerService::Binding, url, line, column);
}
-QDeclarativeBindingProfiler::~QDeclarativeBindingProfiler()
+QQmlBindingProfiler::~QQmlBindingProfiler()
{
- QDeclarativeProfilerService::endRange(QDeclarativeProfilerService::Binding);
+ QQmlProfilerService::endRange(QQmlProfilerService::Binding);
}
-void QDeclarativeBindingProfiler::addDetail(const QString &details)
+void QQmlBindingProfiler::addDetail(const QString &details)
{
- QDeclarativeProfilerService::rangeData(QDeclarativeProfilerService::Binding, details);
+ QQmlProfilerService::rangeData(QQmlProfilerService::Binding, details);
}
// convert to a QByteArray that can be sent to the debug client
// use of QDataStream can skew results
-// (see tst_qdeclarativedebugtrace::trace() benchmark)
-QByteArray QDeclarativeProfilerData::toByteArray() const
+// (see tst_qqmldebugtrace::trace() benchmark)
+QByteArray QQmlProfilerData::toByteArray() const
{
QByteArray data;
//### using QDataStream is relatively expensive
QDataStream ds(&data, QIODevice::WriteOnly);
ds << time << messageType << detailType;
- if (messageType == (int)QDeclarativeProfilerService::RangeData)
+ if (messageType == (int)QQmlProfilerService::RangeData)
ds << detailData;
- if (messageType == (int)QDeclarativeProfilerService::RangeLocation)
+ if (messageType == (int)QQmlProfilerService::RangeLocation)
ds << detailData << line << column;
- if (messageType == (int)QDeclarativeProfilerService::Event &&
- detailType == (int)QDeclarativeProfilerService::AnimationFrame)
+ if (messageType == (int)QQmlProfilerService::Event &&
+ detailType == (int)QQmlProfilerService::AnimationFrame)
ds << framerate << animationcount;
return data;
}
-QDeclarativeProfilerService::QDeclarativeProfilerService()
- : QDeclarativeDebugService(QLatin1String("CanvasFrameRate"), 1),
+QQmlProfilerService::QQmlProfilerService()
+ : QQmlDebugService(QLatin1String("CanvasFrameRate"), 1),
m_enabled(false), m_messageReceived(false)
{
m_timer.start();
@@ -104,77 +104,77 @@ QDeclarativeProfilerService::QDeclarativeProfilerService()
}
}
-QDeclarativeProfilerService::~QDeclarativeProfilerService()
+QQmlProfilerService::~QQmlProfilerService()
{
}
-void QDeclarativeProfilerService::initialize()
+void QQmlProfilerService::initialize()
{
// just make sure that the service is properly registered
profilerInstance();
}
-bool QDeclarativeProfilerService::startProfiling()
+bool QQmlProfilerService::startProfiling()
{
return profilerInstance()->startProfilingImpl();
}
-bool QDeclarativeProfilerService::stopProfiling()
+bool QQmlProfilerService::stopProfiling()
{
return profilerInstance()->stopProfilingImpl();
}
-void QDeclarativeProfilerService::sendStartedProfilingMessage()
+void QQmlProfilerService::sendStartedProfilingMessage()
{
profilerInstance()->sendStartedProfilingMessageImpl();
}
-void QDeclarativeProfilerService::addEvent(EventType t)
+void QQmlProfilerService::addEvent(EventType t)
{
profilerInstance()->addEventImpl(t);
}
-void QDeclarativeProfilerService::startRange(RangeType t)
+void QQmlProfilerService::startRange(RangeType t)
{
profilerInstance()->startRangeImpl(t);
}
-void QDeclarativeProfilerService::rangeData(RangeType t, const QString &data)
+void QQmlProfilerService::rangeData(RangeType t, const QString &data)
{
profilerInstance()->rangeDataImpl(t, data);
}
-void QDeclarativeProfilerService::rangeData(RangeType t, const QUrl &data)
+void QQmlProfilerService::rangeData(RangeType t, const QUrl &data)
{
profilerInstance()->rangeDataImpl(t, data);
}
-void QDeclarativeProfilerService::rangeLocation(RangeType t, const QString &fileName, int line, int column)
+void QQmlProfilerService::rangeLocation(RangeType t, const QString &fileName, int line, int column)
{
profilerInstance()->rangeLocationImpl(t, fileName, line, column);
}
-void QDeclarativeProfilerService::rangeLocation(RangeType t, const QUrl &fileName, int line, int column)
+void QQmlProfilerService::rangeLocation(RangeType t, const QUrl &fileName, int line, int column)
{
profilerInstance()->rangeLocationImpl(t, fileName, line, column);
}
-void QDeclarativeProfilerService::endRange(RangeType t)
+void QQmlProfilerService::endRange(RangeType t)
{
profilerInstance()->endRangeImpl(t);
}
-void QDeclarativeProfilerService::animationFrame(qint64 delta)
+void QQmlProfilerService::animationFrame(qint64 delta)
{
profilerInstance()->animationFrameImpl(delta);
}
-void QDeclarativeProfilerService::sendProfilingData()
+void QQmlProfilerService::sendProfilingData()
{
profilerInstance()->sendMessages();
}
-bool QDeclarativeProfilerService::startProfilingImpl()
+bool QQmlProfilerService::startProfilingImpl()
{
bool success = false;
if (!profilingEnabled()) {
@@ -185,7 +185,7 @@ bool QDeclarativeProfilerService::startProfilingImpl()
return success;
}
-bool QDeclarativeProfilerService::stopProfilingImpl()
+bool QQmlProfilerService::stopProfilingImpl()
{
bool success = false;
if (profilingEnabled()) {
@@ -196,81 +196,81 @@ bool QDeclarativeProfilerService::stopProfilingImpl()
return success;
}
-void QDeclarativeProfilerService::sendStartedProfilingMessageImpl()
+void QQmlProfilerService::sendStartedProfilingMessageImpl()
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)StartTrace, QString(), -1, -1, 0, 0};
- QDeclarativeDebugService::sendMessage(ed.toByteArray());
+ QQmlProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)StartTrace, QString(), -1, -1, 0, 0};
+ QQmlDebugService::sendMessage(ed.toByteArray());
}
-void QDeclarativeProfilerService::addEventImpl(EventType event)
+void QQmlProfilerService::addEventImpl(EventType event)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0};
+ QQmlProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)event, QString(), -1, -1, 0, 0};
processMessage(ed);
}
-void QDeclarativeProfilerService::startRangeImpl(RangeType range)
+void QQmlProfilerService::startRangeImpl(RangeType range)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeStart, (int)range, QString(), -1, -1, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QString &rData)
+void QQmlProfilerService::rangeDataImpl(RangeType range, const QString &rData)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData, -1, -1, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::rangeDataImpl(RangeType range, const QUrl &rData)
+void QQmlProfilerService::rangeDataImpl(RangeType range, const QUrl &rData)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeData, (int)range, rData.toString(QUrl::FormattingOption(0x100)), -1, -1, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column)
+void QQmlProfilerService::rangeLocationImpl(RangeType range, const QString &fileName, int line, int column)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName, line, column, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column)
+void QQmlProfilerService::rangeLocationImpl(RangeType range, const QUrl &fileName, int line, int column)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeLocation, (int)range, fileName.toString(QUrl::FormattingOption(0x100)), line, column, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::endRangeImpl(RangeType range)
+void QQmlProfilerService::endRangeImpl(RangeType range)
{
- if (!QDeclarativeDebugService::isDebuggingEnabled() || !m_enabled)
+ if (!QQmlDebugService::isDebuggingEnabled() || !m_enabled)
return;
- QDeclarativeProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0};
+ QQmlProfilerData rd = {m_timer.nsecsElapsed(), (int)RangeEnd, (int)range, QString(), -1, -1, 0, 0};
processMessage(rd);
}
-void QDeclarativeProfilerService::animationFrameImpl(qint64 delta)
+void QQmlProfilerService::animationFrameImpl(qint64 delta)
{
- Q_ASSERT(QDeclarativeDebugService::isDebuggingEnabled());
+ Q_ASSERT(QQmlDebugService::isDebuggingEnabled());
if (!m_enabled)
return;
@@ -279,7 +279,7 @@ void QDeclarativeProfilerService::animationFrameImpl(qint64 delta)
if (animCount > 0 && delta > 0) {
// trim fps to integer
int fps = 1000 / delta;
- QDeclarativeProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount};
+ QQmlProfilerData ed = {m_timer.nsecsElapsed(), (int)Event, (int)AnimationFrame, QString(), -1, -1, fps, animCount};
processMessage(ed);
}
}
@@ -288,18 +288,18 @@ void QDeclarativeProfilerService::animationFrameImpl(qint64 delta)
Either send the message directly, or queue up
a list of messages to send later (via sendMessages)
*/
-void QDeclarativeProfilerService::processMessage(const QDeclarativeProfilerData &message)
+void QQmlProfilerService::processMessage(const QQmlProfilerData &message)
{
QMutexLocker locker(&m_mutex);
m_data.append(message);
}
-bool QDeclarativeProfilerService::profilingEnabled()
+bool QQmlProfilerService::profilingEnabled()
{
return m_enabled;
}
-void QDeclarativeProfilerService::setProfilingEnabled(bool enable)
+void QQmlProfilerService::setProfilingEnabled(bool enable)
{
m_enabled = enable;
}
@@ -307,7 +307,7 @@ void QDeclarativeProfilerService::setProfilingEnabled(bool enable)
/*
Send the messages queued up by processMessage
*/
-void QDeclarativeProfilerService::sendMessages()
+void QQmlProfilerService::sendMessages()
{
QMutexLocker locker(&m_mutex);
QList<QByteArray> messages;
@@ -321,10 +321,10 @@ void QDeclarativeProfilerService::sendMessages()
ds << (qint64)-1 << (int)Complete;
messages << data;
- QDeclarativeDebugService::sendMessages(messages);
+ QQmlDebugService::sendMessages(messages);
}
-void QDeclarativeProfilerService::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
+void QQmlProfilerService::stateAboutToBeChanged(QQmlDebugService::State newState)
{
if (state() == newState)
return;
@@ -336,7 +336,7 @@ void QDeclarativeProfilerService::stateAboutToBeChanged(QDeclarativeDebugService
}
}
-void QDeclarativeProfilerService::messageReceived(const QByteArray &message)
+void QQmlProfilerService::messageReceived(const QByteArray &message)
{
QByteArray rwData = message;
QDataStream stream(&rwData, QIODevice::ReadOnly);
diff --git a/src/declarative/debugger/qdeclarativeprofilerservice_p.h b/src/qml/debugger/qqmlprofilerservice_p.h
index d29690b6d6..a74ce10c74 100644
--- a/src/declarative/debugger/qdeclarativeprofilerservice_p.h
+++ b/src/qml/debugger/qqmlprofilerservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
**
****************************************************************************/
-#ifndef QDECLARATIVEPROFILERSERVICE_P_H
-#define QDECLARATIVEPROFILERSERVICE_P_H
+#ifndef QQMLPROFILERSERVICE_P_H
+#define QQMLPROFILERSERVICE_P_H
//
// W A R N I N G
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <private/qdeclarativedebugservice_p.h>
+#include <private/qqmldebugservice_p.h>
#include <QtCore/qelapsedtimer.h>
#include <QtCore/qmutex.h>
#include <QtCore/qvector.h>
@@ -62,7 +62,7 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-struct Q_AUTOTEST_EXPORT QDeclarativeProfilerData
+struct Q_AUTOTEST_EXPORT QQmlProfilerData
{
qint64 time;
int messageType;
@@ -78,20 +78,20 @@ struct Q_AUTOTEST_EXPORT QDeclarativeProfilerData
QByteArray toByteArray() const;
};
-Q_DECLARE_TYPEINFO(QDeclarativeProfilerData, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QQmlProfilerData, Q_MOVABLE_TYPE);
class QUrl;
-class QDeclarativeEngine;
+class QQmlEngine;
// RAII
-class Q_AUTOTEST_EXPORT QDeclarativeBindingProfiler {
+class Q_AUTOTEST_EXPORT QQmlBindingProfiler {
public:
- QDeclarativeBindingProfiler(const QString &url, int line, int column);
- ~QDeclarativeBindingProfiler();
+ QQmlBindingProfiler(const QString &url, int line, int column);
+ ~QQmlBindingProfiler();
void addDetail(const QString &details);
};
-class Q_DECLARATIVE_EXPORT QDeclarativeProfilerService : public QDeclarativeDebugService
+class Q_QML_EXPORT QQmlProfilerService : public QQmlDebugService
{
public:
enum Message {
@@ -142,8 +142,8 @@ public:
static void sendProfilingData();
- QDeclarativeProfilerService();
- ~QDeclarativeProfilerService();
+ QQmlProfilerService();
+ ~QQmlProfilerService();
protected:
virtual void stateAboutToBeChanged(State state);
@@ -165,13 +165,13 @@ private:
bool profilingEnabled();
void setProfilingEnabled(bool enable);
void sendMessages();
- void processMessage(const QDeclarativeProfilerData &);
+ void processMessage(const QQmlProfilerData &);
private:
QElapsedTimer m_timer;
bool m_enabled;
bool m_messageReceived;
- QVector<QDeclarativeProfilerData> m_data;
+ QVector<QQmlProfilerData> m_data;
QMutex m_mutex;
};
@@ -179,5 +179,5 @@ QT_END_NAMESPACE
QT_END_HEADER
-#endif // QDECLARATIVEPROFILERSERVICE_P_H
+#endif // QQMLPROFILERSERVICE_P_H
diff --git a/src/declarative/debugger/qv8debugservice.cpp b/src/qml/debugger/qv8debugservice.cpp
index 389c465420..ee60bff742 100644
--- a/src/declarative/debugger/qv8debugservice.cpp
+++ b/src/qml/debugger/qv8debugservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qv8debugservice_p.h"
-#include "qdeclarativedebugservice_p_p.h"
+#include "qqmldebugservice_p_p.h"
#include <private/qjsconverter_impl_p.h>
#include <private/qv8engine_p.h>
@@ -97,7 +97,7 @@ void DebugMessageHandler(const v8::Debug::Message& message)
v8ServiceInstancePtr->debugMessageHandler(QJSConverter::toString(message.GetJSON()), event);
}
-class QV8DebugServicePrivate : public QDeclarativeDebugServicePrivate
+class QV8DebugServicePrivate : public QQmlDebugServicePrivate
{
public:
QV8DebugServicePrivate()
@@ -119,7 +119,7 @@ public:
};
QV8DebugService::QV8DebugService(QObject *parent)
- : QDeclarativeDebugService(*(new QV8DebugServicePrivate()),
+ : QQmlDebugService(*(new QV8DebugServicePrivate()),
QLatin1String("V8Debugger"), 2, parent)
{
Q_D(QV8DebugService);
@@ -169,7 +169,7 @@ void QV8DebugService::debugMessageHandler(const QString &message, const v8::Debu
void QV8DebugService::signalEmitted(const QString &signal)
{
- //This function is only called by QDeclarativeBoundSignal
+ //This function is only called by QQmlBoundSignal
//only if there is a slot connected to the signal. Hence, there
//is no need for additional check.
Q_D(QV8DebugService);
@@ -205,7 +205,7 @@ void QV8DebugService::scheduledDebugBreak(bool schedule)
}
// executed in the debugger thread
-void QV8DebugService::stateChanged(QDeclarativeDebugService::State newState)
+void QV8DebugService::stateChanged(QQmlDebugService::State newState)
{
Q_D(QV8DebugService);
if (newState == Enabled) {
diff --git a/src/declarative/debugger/qv8debugservice_p.h b/src/qml/debugger/qv8debugservice_p.h
index 3f1d1ca177..8ff4adc778 100644
--- a/src/declarative/debugger/qv8debugservice_p.h
+++ b/src/qml/debugger/qv8debugservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -53,7 +53,7 @@
// We mean it.
//
-#include "qdeclarativedebugservice_p.h"
+#include "qqmldebugservice_p.h"
#include <private/qv8debug_p.h>
QT_BEGIN_HEADER
@@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE
class QV8Engine;
class QV8DebugServicePrivate;
-class QV8DebugService : public QDeclarativeDebugService
+class QV8DebugService : public QQmlDebugService
{
Q_OBJECT
public:
diff --git a/src/declarative/debugger/qv8profilerservice.cpp b/src/qml/debugger/qv8profilerservice.cpp
index 5ae2d01cc2..eba8b0feef 100644
--- a/src/declarative/debugger/qv8profilerservice.cpp
+++ b/src/qml/debugger/qv8profilerservice.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qv8profilerservice_p.h"
-#include "qdeclarativedebugservice_p_p.h"
+#include "qqmldebugservice_p_p.h"
#include "private/qjsconverter_impl_p.h"
#include <private/qv8profiler_p.h>
@@ -52,9 +52,9 @@ Q_GLOBAL_STATIC(QV8ProfilerService, v8ProfilerInstance)
class DebugServiceOutputStream : public v8::OutputStream
{
- QDeclarativeDebugService &_service;
+ QQmlDebugService &_service;
public:
- DebugServiceOutputStream(QDeclarativeDebugService &service)
+ DebugServiceOutputStream(QQmlDebugService &service)
: v8::OutputStream(),
_service(service) {}
void EndOfStream() {}
@@ -79,7 +79,7 @@ QByteArray QV8ProfilerData::toByteArray() const
return data;
}
-class QV8ProfilerServicePrivate : public QDeclarativeDebugServicePrivate
+class QV8ProfilerServicePrivate : public QQmlDebugServicePrivate
{
Q_DECLARE_PUBLIC(QV8ProfilerService)
@@ -101,7 +101,7 @@ public:
};
QV8ProfilerService::QV8ProfilerService(QObject *parent)
- : QDeclarativeDebugService(*(new QV8ProfilerServicePrivate()), QLatin1String("V8Profiler"), 1, parent)
+ : QQmlDebugService(*(new QV8ProfilerServicePrivate()), QLatin1String("V8Profiler"), 1, parent)
{
Q_D(QV8ProfilerService);
@@ -127,7 +127,7 @@ void QV8ProfilerService::initialize()
v8ProfilerInstance();
}
-void QV8ProfilerService::stateAboutToBeChanged(QDeclarativeDebugService::State newState)
+void QV8ProfilerService::stateAboutToBeChanged(QQmlDebugService::State newState)
{
Q_D(QV8ProfilerService);
@@ -171,7 +171,7 @@ void QV8ProfilerService::messageReceived(const QByteArray &message)
}
}
- QDeclarativeDebugService::messageReceived(message);
+ QQmlDebugService::messageReceived(message);
}
void QV8ProfilerService::startProfiling(const QString &title)
diff --git a/src/declarative/debugger/qv8profilerservice_p.h b/src/qml/debugger/qv8profilerservice_p.h
index 706907ae23..d408d9ed0e 100644
--- a/src/declarative/debugger/qv8profilerservice_p.h
+++ b/src/qml/debugger/qv8profilerservice_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
@@ -53,7 +53,7 @@
// We mean it.
//
-#include <private/qdeclarativedebugservice_p.h>
+#include <private/qqmldebugservice_p.h>
QT_BEGIN_HEADER
@@ -73,10 +73,10 @@ struct Q_AUTOTEST_EXPORT QV8ProfilerData
QByteArray toByteArray() const;
};
-class QDeclarativeEngine;
+class QQmlEngine;
class QV8ProfilerServicePrivate;
-class Q_AUTOTEST_EXPORT QV8ProfilerService : public QDeclarativeDebugService
+class Q_AUTOTEST_EXPORT QV8ProfilerService : public QQmlDebugService
{
Q_OBJECT
public:
diff --git a/src/declarative/declarative.pro b/src/qml/qml.pro
index 1da58ce5d9..0bbfc9ff74 100644
--- a/src/declarative/declarative.pro
+++ b/src/qml/qml.pro
@@ -1,28 +1,31 @@
load(qt_module)
-TARGET = QtDeclarative
+TARGET = QtQml
QPRO_PWD = $$PWD
CONFIG += module
-MODULE_PRI += ../../modules/qt_declarative.pri
+MODULE_PRI += ../../modules/qt_qml.pri
QT = core-private gui gui-private network v8-private
-DEFINES += QT_BUILD_DECLARATIVE_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+DEFINES += QT_BUILD_QML_LIB QT_NO_URL_CAST_FROM_STRING QT_NO_INTEGER_EVENT_COORDINATES
+
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS
solaris-cc*:QMAKE_CXXFLAGS_RELEASE -= -O2
unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui
-exists("qdeclarative_enable_gcov") {
+exists("qqml_enable_gcov") {
QMAKE_CXXFLAGS = -fprofile-arcs -ftest-coverage -fno-elide-constructors
LIBS += -lgcov
}
load(qt_module_config)
-HEADERS += qtdeclarativeversion.h
+HEADERS += qtqmlversion.h \
+ qtqmlglobal.h \
+ qtqmlglobal_p.h
#INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
#DESTDIR=.
@@ -31,4 +34,4 @@ HEADERS += qtdeclarativeversion.h
include(util/util.pri)
include(qml/qml.pri)
include(debugger/debugger.pri)
-include(animations/animations.pri) \ No newline at end of file
+include(animations/animations.pri)
diff --git a/src/declarative/qml/ftw/ftw.pri b/src/qml/qml/ftw/ftw.pri
index 26343422c5..f2fec4e2dd 100644
--- a/src/declarative/qml/ftw/ftw.pri
+++ b/src/qml/qml/ftw/ftw.pri
@@ -3,27 +3,27 @@ HEADERS += \
$$PWD/qintrusivelist_p.h \
$$PWD/qpodvector_p.h \
$$PWD/qhashedstring_p.h \
- $$PWD/qdeclarativerefcount_p.h \
- $$PWD/qdeclarativepool_p.h \
+ $$PWD/qqmlrefcount_p.h \
+ $$PWD/qqmlpool_p.h \
$$PWD/qfieldlist_p.h \
$$PWD/qfastmetabuilder_p.h \
$$PWD/qhashfield_p.h \
- $$PWD/qdeclarativethread_p.h \
+ $$PWD/qqmlthread_p.h \
$$PWD/qfinitestack_p.h \
$$PWD/qrecursionwatcher_p.h \
$$PWD/qdeletewatcher_p.h \
$$PWD/qrecyclepool_p.h \
$$PWD/qflagpointer_p.h \
- $$PWD/qdeclarativetrace_p.h \
+ $$PWD/qqmltrace_p.h \
$$PWD/qpointervaluepair_p.h \
$$PWD/qlazilyallocated_p.h \
SOURCES += \
$$PWD/qintrusivelist.cpp \
$$PWD/qhashedstring.cpp \
- $$PWD/qdeclarativepool.cpp \
+ $$PWD/qqmlpool.cpp \
$$PWD/qfastmetabuilder.cpp \
- $$PWD/qdeclarativethread.cpp \
- $$PWD/qdeclarativetrace.cpp \
+ $$PWD/qqmlthread.cpp \
+ $$PWD/qqmltrace.cpp \
contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri)
diff --git a/src/declarative/qml/ftw/qbitfield_p.h b/src/qml/qml/ftw/qbitfield_p.h
index addd21c96d..75f80dd896 100644
--- a/src/declarative/qml/ftw/qbitfield_p.h
+++ b/src/qml/qml/ftw/qbitfield_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qdeletewatcher_p.h b/src/qml/qml/ftw/qdeletewatcher_p.h
index 020907aa65..9f7b100429 100644
--- a/src/declarative/qml/ftw/qdeletewatcher_p.h
+++ b/src/qml/qml/ftw/qdeletewatcher_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qfastmetabuilder.cpp b/src/qml/qml/ftw/qfastmetabuilder.cpp
index 0395ab3309..9663c1e944 100644
--- a/src/declarative/qml/ftw/qfastmetabuilder.cpp
+++ b/src/qml/qml/ftw/qfastmetabuilder.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qfastmetabuilder_p.h b/src/qml/qml/ftw/qfastmetabuilder_p.h
index e8b7394fe4..c1f6a3de5c 100644
--- a/src/declarative/qml/ftw/qfastmetabuilder_p.h
+++ b/src/qml/qml/ftw/qfastmetabuilder_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qfieldlist_p.h b/src/qml/qml/ftw/qfieldlist_p.h
index 4253779e78..da5074b3cd 100644
--- a/src/declarative/qml/ftw/qfieldlist_p.h
+++ b/src/qml/qml/ftw/qfieldlist_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qfinitestack_p.h b/src/qml/qml/ftw/qfinitestack_p.h
index 8161b042c2..c5a9fbaedb 100644
--- a/src/declarative/qml/ftw/qfinitestack_p.h
+++ b/src/qml/qml/ftw/qfinitestack_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qflagpointer_p.h b/src/qml/qml/ftw/qflagpointer_p.h
index ac462cbe30..a4b20d9e2a 100644
--- a/src/declarative/qml/ftw/qflagpointer_p.h
+++ b/src/qml/qml/ftw/qflagpointer_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qhashedstring.cpp b/src/qml/qml/ftw/qhashedstring.cpp
index f3b5a9ebc9..1f09d50ed3 100644
--- a/src/declarative/qml/ftw/qhashedstring.cpp
+++ b/src/qml/qml/ftw/qhashedstring.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qhashedstring_p.h b/src/qml/qml/ftw/qhashedstring_p.h
index b778dd4df2..f575285ff6 100644
--- a/src/declarative/qml/ftw/qhashedstring_p.h
+++ b/src/qml/qml/ftw/qhashedstring_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qhashfield_p.h b/src/qml/qml/ftw/qhashfield_p.h
index a11e8d9486..46df9a176c 100644
--- a/src/declarative/qml/ftw/qhashfield_p.h
+++ b/src/qml/qml/ftw/qhashfield_p.h
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file is part of the QtQml module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL$
** GNU Lesser General Public License Usage
diff --git a/src/declarative/qml/ftw/qintrusivelist.cpp b/src/qml/qml/ftw/qintrusivelist.cpp
index 1893eef8cd..5a1624f1f4 100644
--- a/src/declarative/qml/ftw/qintrusivelist.cpp
+++ b/src/qml/qml/ftw/qintrusivelist.cpp
@@ -3,7 +3,7 @@
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/
**
-** This file is part of the QtDeclarative module of the Qt Toolkit.
+** This file