Merge branch 'qtquick2'

Conflicts:
	demos/declarative/flickr/common/Progress.qml
	demos/declarative/flickr/common/RssModel.qml
	demos/declarative/flickr/common/ScrollBar.qml
	demos/declarative/flickr/common/Slider.qml
	demos/declarative/flickr/mobile/Button.qml
	demos/declarative/flickr/mobile/GridDelegate.qml
	demos/declarative/flickr/mobile/ImageDetails.qml
	demos/declarative/flickr/mobile/ListDelegate.qml
	demos/declarative/flickr/mobile/TitleBar.qml
	demos/declarative/flickr/mobile/ToolBar.qml
	demos/declarative/webbrowser/content/Button.qml
	demos/declarative/webbrowser/content/FlickableWebView.qml
	demos/declarative/webbrowser/content/Header.qml
	demos/declarative/webbrowser/content/ScrollBar.qml
	demos/declarative/webbrowser/content/UrlInput.qml
	demos/declarative/webbrowser/webbrowser.qml
	doc/src/snippets/declarative/mousearea/mousearea-snippet.qml
	examples/declarative/modelviews/webview/newwindows/qml/alerts.html
	examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html
	examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png
	examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png
	examples/declarative/modelviews/webview/newwindows/qml/newwindows.html
	src/declarative/graphicsitems/qdeclarativetextinput.cpp
	src/declarative/qml/qdeclarativecompiledbindings.cpp
	src/declarative/qml/qdeclarativecompiledbindings_p.h
	src/declarative/qml/qdeclarativedom.cpp
	src/declarative/qml/qdeclarativedom_p.h
	src/declarative/qml/qdeclarativedom_p_p.h
	src/declarative/qml/qdeclarativeengine.cpp
	src/declarative/qml/qdeclarativetypeloader.cpp
	src/imports/particles/particles.cpp
	tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
	tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png
	tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png
	tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png
	tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png
	tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png
	tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png
	tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp

Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff

diff --cc demos/declarative/flickr/flickr-90.qml
Simple merge

diff --cc demos/declarative/flickr/flickr.qml
Simple merge

diff --cc demos/declarative/samegame/SamegameCore/BoomBlock.qml
Simple merge

diff --cc demos/declarative/samegame/SamegameCore/Button.qml
Simple merge

diff --cc demos/declarative/samegame/SamegameCore/Dialog.qml
Simple merge

diff --cc demos/declarative/samegame/samegame.qml
Simple merge

diff --cc doc/src/declarative/anchor-layout.qdoc
Simple merge

diff --cc doc/src/declarative/basictypes.qdoc
Simple merge

diff --cc doc/src/declarative/examples.qdoc
Simple merge

diff --cc doc/src/declarative/globalobject.qdoc
Simple merge

diff --cc doc/src/declarative/javascriptblocks.qdoc
Simple merge

diff --cc doc/src/declarative/modules.qdoc
Simple merge

diff --cc doc/src/declarative/qdeclarativeintro.qdoc
Simple merge

diff --cc doc/src/declarative/whatsnew.qdoc
index 9757201,bf4b0df..1c53c12
--- 1/doc/src/declarative/whatsnew.qdoc
--- 2/doc/src/declarative/whatsnew.qdoc
+++ b/doc/src/declarative/whatsnew.qdoc
@@@ -26,13 -26,18 +26,19 @@@
  ****************************************************************************/
  
  /*!
 -\title What's new in Qt Quick
 +\title What's New in Qt Quick
  \page qtquick-whatsnew.html
  
+ \section1 Qt 5.0.0 includes QtQuick 2.0
+ 
+ QtQuick 2.0 is a major update.
+ 
+ MouseArea now propagates clicked, doubleClicked and pressAndHold differently.
+ 
  \section1 Qt 4.7.4 includes QtQuick 1.1
  
 -QtQuick 1.1 is a minor feature update.  \e {import QtQuick 1.1} to use the new features.
 +QtQuick 1.1 is a minor feature update.  \e {import QtQuick 1.1} to use the new
 +features.
  
  \section2 PinchArea
  

diff --cc src/declarative/debugger/qdeclarativedebug.cpp
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugserver.cpp
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugserver_p.h
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugserverconnection_p.h
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugservice.cpp
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugservice_p.h
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugtrace.cpp
Simple merge

diff --cc src/declarative/debugger/qdeclarativedebugtrace_p.h
Simple merge

diff --cc src/declarative/debugger/qpacketprotocol.cpp
Simple merge

diff --cc src/declarative/debugger/qpacketprotocol_p.h
Simple merge

diff --cc src/declarative/declarative.pro
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativegridview.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativeitem.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativeitem_p.h
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativelistview.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativemousearea.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativemousearea_p.h
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativepathview.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativetextedit.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativetextinput.cpp
Simple merge

diff --cc src/declarative/graphicsitems/qdeclarativetextinput_p_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejs.g
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsast.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsast_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsastfwd_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsastvisitor.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsastvisitor_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsengine_p.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsengine_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsglobal_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsgrammar.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsgrammar_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejslexer.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejslexer_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsmemorypool_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsnodepool_p.h
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsparser.cpp
Simple merge

diff --cc src/declarative/qml/parser/qdeclarativejsparser_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarative.h
Simple merge

diff --cc src/declarative/qml/qdeclarativebinding.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecompileddata.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecompiler.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecompiler_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativecomponent.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecomponent.h
Simple merge

diff --cc src/declarative/qml/qdeclarativecomponent_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativecontext.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativecontext_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativedirparser.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativedirparser_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeengine_p.h
index 0a3fe5d,fadedf4..c690ac7
--- 1/src/declarative/qml/qdeclarativeengine_p.h
--- 2/src/declarative/qml/qdeclarativeengine_p.h
+++ b/src/declarative/qml/qdeclarativeengine_p.h
@@@ -93,8 -94,11 +94,10 @@@ class QDeclarativeExpression
  class QDeclarativeContextScriptClass;
  class QDeclarativeImportDatabase;
  class QDeclarativeObjectScriptClass;
+ class QDeclarativeScarceResourceScriptClass;
+ class ScarceResourceData;
  class QDeclarativeTypeNameScriptClass;
  class QDeclarativeValueTypeScriptClass;
 -class QScriptEngineDebugger;
  class QNetworkReply;
  class QNetworkAccessManager;
  class QDeclarativeNetworkAccessManagerFactory;

diff --cc src/declarative/qml/qdeclarativeexpression.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeimageprovider.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeimageprovider.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeimport.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeimport_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeinfo.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeinstruction.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeinstruction_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativemetatype.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativemetatype_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeobjectscriptclass.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativeprivate.h
Simple merge

diff --cc src/declarative/qml/qdeclarativeproperty.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativepropertycache.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativepropertycache_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativescriptparser.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativescriptparser_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativetypeloader.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativetypeloader_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativetypenamecache.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativetypenamecache_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativetypenamescriptclass.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativetypenamescriptclass_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativevme.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativevme_p.h
Simple merge

diff --cc src/declarative/qml/qdeclarativevmemetaobject.cpp
Simple merge

diff --cc src/declarative/qml/qdeclarativexmlhttprequest.cpp
Simple merge

diff --cc src/declarative/qml/qmetaobjectbuilder.cpp
Simple merge

diff --cc src/declarative/qml/qmetaobjectbuilder_p.h
Simple merge

diff --cc src/declarative/util/qdeclarativepixmapcache.cpp
Simple merge

diff --cc src/declarative/util/qdeclarativepixmapcache_p.h
Simple merge

diff --cc src/declarative/util/qdeclarativeview.h
Simple merge

diff --cc src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp
Simple merge

diff --cc src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
Simple merge

diff --cc src/imports/particles/V1/qdeclarativeparticles.cpp
Simple merge

diff --cc src/imports/particles/V1/qdeclarativeparticles_p.h
Simple merge

diff --cc src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp
Simple merge

diff --cc src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h
Simple merge

diff --cc sync.profile
Simple merge

diff --cc tests/auto/declarative/examples/tst_examples.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeanchors/tst_qdeclarativeanchors.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativedebugclient/tst_qdeclarativedebugclient.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativedebugservice/tst_qdeclarativedebugservice.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeecmascript/testtypes.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeecmascript/testtypes.h
Simple merge

diff --cc tests/auto/declarative/qdeclarativeecmascript/tst_qdeclarativeecmascript.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativefolderlistmodel/tst_qdeclarativefolderlistmodel.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativefontloader/tst_qdeclarativefontloader.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativegridview/tst_qdeclarativegridview.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeimageprovider/tst_qdeclarativeimageprovider.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeinfo/tst_qdeclarativeinfo.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativelistview/tst_qdeclarativelistview.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeparticles/tst_qdeclarativeparticles.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativepathview/tst_qdeclarativepathview.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativepositioners/tst_qdeclarativepositioners.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeqt/tst_qdeclarativeqt.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativesmoothedanimation/tst_qdeclarativesmoothedanimation.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativesqldatabase/tst_qdeclarativesqldatabase.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativexmlhttprequest/tst_qdeclarativexmlhttprequest.cpp
Simple merge

diff --cc tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
Simple merge

diff --cc tests/auto/declarative/qmetaobjectbuilder/tst_qmetaobjectbuilder.cpp
Simple merge

diff --cc tests/benchmarks/declarative/binding/tst_binding.cpp
Simple merge

diff --cc tests/benchmarks/declarative/compilation/tst_compilation.cpp
Simple merge

diff --cc tests/benchmarks/declarative/script/tst_script.cpp
Simple merge

diff --cc tools/qmlviewer/loggerwidget.cpp
Simple merge

diff --cc tools/qmlviewer/main.cpp
Simple merge

diff --cc tools/qmlviewer/proxysettings.cpp
Simple merge

diff --cc tools/qmlviewer/qdeclarativetester.cpp
Simple merge

diff --cc tools/qmlviewer/qmlruntime.cpp
Simple merge