Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
authorMartin Jones <martin.jones@nokia.com>
Wed, 19 Jan 2011 01:40:49 +0000 (11:40 +1000)
committerMartin Jones <martin.jones@nokia.com>
Wed, 19 Jan 2011 01:40:49 +0000 (11:40 +1000)
commitebd4bc73c46c2962742a682b6a391fb68c482aec
tree3045a1af9e65ca6500437d4e90ccfd3637fb6976
parent9c1e67d83f6175f339e6771be05ee60ba72426b3
parent5d9738ed88da269033333299c16558882d346514
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11
151 files changed:
demos/declarative/calculator/calculator.qml
demos/declarative/flickr/flickr.qml
demos/declarative/minehunt/minehunt.qml
demos/declarative/photoviewer/PhotoViewerCore/PhotoDelegate.qml
demos/declarative/snake/snake.qml
demos/declarative/webbrowser/content/FlickableWebView.qml
doc/src/declarative/extending.qdoc
doc/src/declarative/globalobject.qdoc
doc/src/declarative/qdeclarativemodels.qdoc
doc/src/declarative/qtdeclarative.qdoc
examples/declarative/text/textselection/textselection.qml
src/corelib/kernel/qmetaobject.cpp
src/corelib/kernel/qmetaobject.h
src/corelib/kernel/qmetaobject_p.h
src/corelib/kernel/qobjectdefs.h
src/declarative/debugger/qdeclarativedebugclient.cpp
src/declarative/debugger/qdeclarativedebugservice.cpp
src/declarative/debugger/qdeclarativedebugtrace.cpp
src/declarative/debugger/qdeclarativedebugtrace_p.h
src/declarative/debugger/qpacketprotocol.cpp
src/declarative/debugger/qpacketprotocol_p.h
src/declarative/graphicsitems/qdeclarativeanimatedimage.cpp
src/declarative/graphicsitems/qdeclarativeborderimage.cpp
src/declarative/graphicsitems/qdeclarativeborderimage_p.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p.h
src/declarative/graphicsitems/qdeclarativeflipable.cpp
src/declarative/graphicsitems/qdeclarativeflipable_p.h
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/graphicsitems/qdeclarativegridview_p.h
src/declarative/graphicsitems/qdeclarativeimage.cpp
src/declarative/graphicsitems/qdeclarativeimagebase.cpp
src/declarative/graphicsitems/qdeclarativeimagebase_p.h
src/declarative/graphicsitems/qdeclarativeimagebase_p_p.h
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/graphicsitems/qdeclarativeitem_p.h
src/declarative/graphicsitems/qdeclarativelistview.cpp
src/declarative/graphicsitems/qdeclarativelistview_p.h
src/declarative/graphicsitems/qdeclarativepositioners.cpp
src/declarative/graphicsitems/qdeclarativepositioners_p.h
src/declarative/graphicsitems/qdeclarativerepeater.cpp
src/declarative/graphicsitems/qdeclarativerepeater_p.h
src/declarative/graphicsitems/qdeclarativetext.cpp
src/declarative/graphicsitems/qdeclarativetext_p.h
src/declarative/graphicsitems/qdeclarativetext_p_p.h
src/declarative/graphicsitems/qdeclarativetextedit.cpp
src/declarative/graphicsitems/qdeclarativetextedit_p.h
src/declarative/graphicsitems/qdeclarativetextedit_p_p.h
src/declarative/graphicsitems/qdeclarativetextinput.cpp
src/declarative/graphicsitems/qdeclarativetextinput_p.h
src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
src/declarative/qml/qdeclarative.h
src/declarative/qml/qdeclarativebinding.cpp
src/declarative/qml/qdeclarativebinding_p.h
src/declarative/qml/qdeclarativeboundsignal.cpp
src/declarative/qml/qdeclarativecompiledbindings.cpp
src/declarative/qml/qdeclarativecompiler.cpp
src/declarative/qml/qdeclarativecompiler_p.h
src/declarative/qml/qdeclarativecomponent.cpp
src/declarative/qml/qdeclarativecontext_p.h
src/declarative/qml/qdeclarativecustomparser.cpp
src/declarative/qml/qdeclarativecustomparser_p.h
src/declarative/qml/qdeclarativedata_p.h
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeenginedebug.cpp
src/declarative/qml/qdeclarativeenginedebug_p.h
src/declarative/qml/qdeclarativeglobal_p.h
src/declarative/qml/qdeclarativeinstruction_p.h
src/declarative/qml/qdeclarativemetatype.cpp
src/declarative/qml/qdeclarativemetatype_p.h
src/declarative/qml/qdeclarativeobjectscriptclass.cpp
src/declarative/qml/qdeclarativeprivate.h
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qdeclarativeproperty_p.h
src/declarative/qml/qdeclarativepropertycache.cpp
src/declarative/qml/qdeclarativepropertycache_p.h
src/declarative/qml/qdeclarativerewrite.cpp
src/declarative/qml/qdeclarativerewrite_p.h
src/declarative/qml/qdeclarativescriptparser.cpp
src/declarative/qml/qdeclarativesqldatabase.cpp
src/declarative/qml/qdeclarativestringconverters.cpp
src/declarative/qml/qdeclarativetypeloader.cpp
src/declarative/qml/qdeclarativetypenamescriptclass.cpp
src/declarative/qml/qdeclarativevaluetype.cpp
src/declarative/qml/qdeclarativevme.cpp
src/declarative/qml/qmetaobjectbuilder.cpp
src/declarative/qml/qmetaobjectbuilder_p.h
src/declarative/util/qdeclarativeconnections.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativelistmodel_p.h
src/declarative/util/qdeclarativelistmodel_p_p.h
src/declarative/util/qdeclarativelistmodelworkeragent.cpp
src/declarative/util/qdeclarativelistmodelworkeragent_p.h
src/declarative/util/qdeclarativeopenmetaobject.cpp
src/declarative/util/qdeclarativepixmapcache.cpp
src/declarative/util/qdeclarativepixmapcache_p.h
src/declarative/util/qdeclarativepropertychanges.cpp
src/declarative/util/qdeclarativepropertychanges_p.h
src/declarative/util/qdeclarativestate.cpp
src/declarative/util/qdeclarativestate_p.h
src/declarative/util/qdeclarativestateoperations.cpp
src/declarative/util/qdeclarativeview.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
src/gui/text/qtextcontrol.cpp
src/gui/text/qtextcontrol_p.h
src/gui/text/qtextcontrol_p_p.h
src/gui/widgets/qlinecontrol.cpp
src/script/bridge/qscriptdeclarativeclass.cpp
src/script/bridge/qscriptdeclarativeclass_p.h
src/tools/moc/generator.cpp
src/tools/moc/generator.h
src/tools/moc/keywords.cpp
src/tools/moc/moc.cpp
src/tools/moc/moc.h
src/tools/moc/token.cpp
src/tools/moc/token.h
src/tools/moc/util/generate_keywords.cpp
tests/auto/bic/tst_bic.cpp
tests/auto/declarative/qdeclarativeanimatedimage/tst_qdeclarativeanimatedimage.cpp
tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
tests/auto/declarative/qdeclarativeecmascript/testtypes.h
tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
tests/auto/declarative/qdeclarativeflickable/tst_qdeclarativeflickable.cpp
tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativelanguage/testtypes.cpp
tests/auto/declarative/qdeclarativelanguage/testtypes.h
tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/declarative/qdeclarativetextedit/tst_qdeclarativetextedit.cpp
tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
tests/auto/moc/tst_moc.cpp
tools/qml/loggerwidget.cpp
tools/qml/loggerwidget.h
tools/qml/main.cpp
tools/qml/qmlruntime.cpp