Merge remote-tracking branch 'origin/2.7'

Conflicts:
	src/plugins/pythoneditor/tools/lexical/pythonformattoken.h

Change-Id: I7b921cd975aa755166a80d219ed5e8b69888aeb0

53 files changed, 1871 insertions, 5118 deletions

diff --git a/doc/src/android/creator-projects-settings-run-android.qdocinc b/doc/src/android/creator-projects-settings-run-android.qdocinc
index 81b1802b58..38df379eeb 100644
--- a/doc/src/android/creator-projects-settings-run-android.qdocinc
+++ b/doc/src/android/creator-projects-settings-run-android.qdocinc
@@ -16,6 +16,10 @@
     \l{http://developer.android.com/guide/topics/manifest/uses-sdk-element.html#ApiLevels}
     {What is API Level?}.
 
+    The minimum API level is android-4 for Necessitas and android-9 for Qt 5.
+    \QC does not allow you to select an API level that the Qt version specified
+    for the kit does not support.
+
     \note The android-4 API level does not support multitouch. If your
     application needs multitouch, select a higher API level.
 
diff --git a/doc/src/debugger/creator-debugger-setup.qdoc b/doc/src/debugger/creator-debugger-setup.qdoc
index 94b244ec8a..e247c74ed3 100644
--- a/doc/src/debugger/creator-debugger-setup.qdoc
+++ b/doc/src/debugger/creator-debugger-setup.qdoc
@@ -242,6 +242,25 @@
 
     \endtable
 
+    \section1 Mapping Source Paths
+
+    To enable the debugger to step into the code and display the source code
+    when using a copy of the source tree at a location different from the one
+    at which the libraries where built, map the source paths to target paths:
+
+    \list 1
+
+        \li Select \gui Tools > \gui Options > \gui Debugger > \gui General >
+            \gui Add.
+
+        \li In the \gui {Source path} field, specify the source path in the
+            debug information of the executable as reported by the debugger.
+
+        \li In the \gui {Target path} field, specify the actual location of the
+            source tree on the local machine.
+
+    \endlist
+
     \section1 Setting the Symbol Server in Windows
 
     To obtain debugging information for the operating system libraries for
diff --git a/doc/src/editors/creator-editors-options-text.qdoc b/doc/src/editors/creator-editors-options-text.qdoc
index 6f1d26dd43..27cc2827f0 100644
--- a/doc/src/editors/creator-editors-options-text.qdoc
+++ b/doc/src/editors/creator-editors-options-text.qdoc
@@ -79,8 +79,23 @@
 
     \section2 File Encoding
 
-    To define the default file encoding, select the desired encoding in
-    \gui {Default encoding}. By default, \QC uses the file encoding
-    used by your system.
+    To define the default file encoding, select a suitable option in
+    \gui {Default encoding}.
+
+    Qt 5 requires UTF-8 encoded source files, and therefore the default
+    encoding was changed from \gui System to \gui UTF-8 in \QC version 2.6.
+    Detecting the correct encoding is tricky, so \QC will not try to do so.
+    Instead, it displays the following error message when you try to edit a file
+    that is not UTF-8 encoded: \gui {Error: Could not decode "filename" with
+    "UTF-8"-encoding. Editing not possible.}
+
+    To resolve the issue, use a file conversion tool such as
+    \l{http://recode.progiciels-bpi.ca/index.html}{Recode} to convert the file
+    encoding to UTF-8 when developing Qt 5 applications. Otherwise, conversion
+    of string constants to QStrings might not work as expected.
+
+    If you develop only Qt 4 applications or other than Qt applications, you
+    can set other encoding options as the default encoding. Select the
+    \gui System option to use the file encoding used by your system.
 
 */
diff --git a/doc/src/projects/creator-projects-build-run-tutorial.qdoc b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
index a4de638789..dc32f2cd0f 100644
--- a/doc/src/projects/creator-projects-build-run-tutorial.qdoc
+++ b/doc/src/projects/creator-projects-build-run-tutorial.qdoc
@@ -48,11 +48,16 @@
             press \key {Alt+Left}.
 
         \li To check that the application code can be compiled and linked for a
-            device, click the \gui {Kit Selector} and select a kit for the
+            device, click the \gui {Kit Selector} and select a
+            \l{glossary-buildandrun-kit}{kit} for the
             device.
 
             \image qtcreator-gs-build-example-kit-selector.png "Selecting a kit to build with"
 
+            If you installed \QC as part of a Qt installation, it should have
+            automatically detected the installed kit. If no kits are available,
+            see \l{Adding Kits}.
+
         \li Click
             \inlineimage qtcreator-run.png
             (\gui Run) to build and run the application.
@@ -60,6 +65,10 @@
         \li To see the compilation progress, press \key{Alt+4} to open the
             \gui {Compile Output} pane.
 
+            If build errors occur, check that a \l{Adding Qt Versions}
+            {Qt version} and \l{Adding Compilers}{compiler} are installed and
+            configured and that the necessary kits are configured.
+
             The \gui Build progress bar on the toolbar turns green when the
             project is successfully built. The application opens on the device.
 
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 13d154a315..02b36a2066 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -162,7 +162,6 @@ Project {
         Depends { name: "Qt"; submodules: ["widgets", "network"] }
         Depends { name: "Utils" }
         Depends { name: "ExtensionSystem" }
-        Depends { name: "Core" }
 
         files: [
             "src/app/main.cpp",
diff --git a/share/qtcreator/qml-type-descriptions/builtins.qmltypes b/share/qtcreator/qml-type-descriptions/builtins.qmltypes
index 5cb9b75edb..f99c636889 100644
--- a/share/qtcreator/qml-type-descriptions/builtins.qmltypes
+++ b/share/qtcreator/qml-type-descriptions/builtins.qmltypes
@@ -5,9 +5,14 @@ import QtQuick.tooling 1.1
 
 Module {
     Component {
-        name: "QDeclarative1AbstractAnimation"
+        name: "QDeclarativeAbstractAnimation"
         prototype: "QObject"
-        exports: ["QtQuick/Animation 1.0"]
+        exports: [
+            "QtQuick/Animation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Loops"
             values: {
@@ -44,9 +49,14 @@ Module {
         Method { name: "complete" }
     }
     Component {
-        name: "QDeclarative1AnchorAnimation"
-        prototype: "QDeclarative1AbstractAnimation"
-        exports: ["QtQuick/AnchorAnimation 1.0"]
+        name: "QDeclarativeAnchorAnimation"
+        prototype: "QDeclarativeAbstractAnimation"
+        exports: [
+            "QtQuick/AnchorAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "targets"; type: "QDeclarativeItem"; isList: true; isReadonly: true }
         Property { name: "duration"; type: "int" }
         Property { name: "easing"; type: "QEasingCurve" }
@@ -60,14 +70,19 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1AnchorChanges"
-        prototype: "QDeclarative1StateOperation"
-        exports: ["QtQuick/AnchorChanges 1.0"]
+        name: "QDeclarativeAnchorChanges"
+        prototype: "QDeclarativeStateOperation"
+        exports: [
+            "QtQuick/AnchorChanges 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QDeclarativeItem"; isPointer: true }
-        Property { name: "anchors"; type: "QDeclarative1AnchorSet"; isReadonly: true; isPointer: true }
+        Property { name: "anchors"; type: "QDeclarativeAnchorSet"; isReadonly: true; isPointer: true }
     }
     Component {
-        name: "QDeclarative1AnchorSet"
+        name: "QDeclarativeAnchorSet"
         prototype: "QObject"
         Property { name: "left"; type: "QDeclarativeScriptString" }
         Property { name: "right"; type: "QDeclarativeScriptString" }
@@ -78,15 +93,15 @@ Module {
         Property { name: "baseline"; type: "QDeclarativeScriptString" }
     }
     Component {
-        name: "QDeclarative1Anchors"
+        name: "QDeclarativeAnchors"
         prototype: "QObject"
-        Property { name: "left"; type: "QDeclarative1AnchorLine" }
-        Property { name: "right"; type: "QDeclarative1AnchorLine" }
-        Property { name: "horizontalCenter"; type: "QDeclarative1AnchorLine" }
-        Property { name: "top"; type: "QDeclarative1AnchorLine" }
-        Property { name: "bottom"; type: "QDeclarative1AnchorLine" }
-        Property { name: "verticalCenter"; type: "QDeclarative1AnchorLine" }
-        Property { name: "baseline"; type: "QDeclarative1AnchorLine" }
+        Property { name: "left"; type: "QDeclarativeAnchorLine" }
+        Property { name: "right"; type: "QDeclarativeAnchorLine" }
+        Property { name: "horizontalCenter"; type: "QDeclarativeAnchorLine" }
+        Property { name: "top"; type: "QDeclarativeAnchorLine" }
+        Property { name: "bottom"; type: "QDeclarativeAnchorLine" }
+        Property { name: "verticalCenter"; type: "QDeclarativeAnchorLine" }
+        Property { name: "baseline"; type: "QDeclarativeAnchorLine" }
         Property { name: "margins"; type: "qreal" }
         Property { name: "leftMargin"; type: "qreal" }
         Property { name: "rightMargin"; type: "qreal" }
@@ -97,69 +112,118 @@ Module {
         Property { name: "baselineOffset"; type: "qreal" }
         Property { name: "fill"; type: "QGraphicsObject"; isPointer: true }
         Property { name: "centerIn"; type: "QGraphicsObject"; isPointer: true }
-        Property { name: "mirrored"; revision: 1; type: "bool"; isReadonly: true }
-        Signal { name: "mirroredChanged"; revision: 1 }
-    }
-    Component {
-        name: "QDeclarative1AnimatedImage"
+        Signal { name: "leftChanged" }
+        Signal { name: "rightChanged" }
+        Signal { name: "topChanged" }
+        Signal { name: "bottomChanged" }
+        Signal { name: "verticalCenterChanged" }
+        Signal { name: "horizontalCenterChanged" }
+        Signal { name: "baselineChanged" }
+        Signal { name: "fillChanged" }
+        Signal { name: "centerInChanged" }
+        Signal { name: "leftMarginChanged" }
+        Signal { name: "rightMarginChanged" }
+        Signal { name: "topMarginChanged" }
+        Signal { name: "bottomMarginChanged" }
+        Signal { name: "marginsChanged" }
+        Signal { name: "verticalCenterOffsetChanged" }
+        Signal { name: "horizontalCenterOffsetChanged" }
+        Signal { name: "baselineOffsetChanged" }
+    }
+    Component {
+        name: "QDeclarativeAnimatedImage"
         defaultProperty: "data"
-        prototype: "QDeclarative1Image"
-        exports: ["QtQuick/AnimatedImage 1.0"]
+        prototype: "QDeclarativeImage"
+        exports: [
+            "QtQuick/AnimatedImage 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "playing"; type: "bool" }
         Property { name: "paused"; type: "bool" }
         Property { name: "currentFrame"; type: "int" }
         Property { name: "frameCount"; type: "int"; isReadonly: true }
         Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
+        Signal { name: "playingChanged" }
+        Signal { name: "pausedChanged" }
         Signal { name: "frameChanged" }
+        Signal { name: "sourceSizeChanged" }
     }
     Component {
-        name: "QDeclarative1AnimationGroup"
+        name: "QDeclarativeAnimationGroup"
         defaultProperty: "animations"
-        prototype: "QDeclarative1AbstractAnimation"
+        prototype: "QDeclarativeAbstractAnimation"
         Property {
             name: "animations"
-            type: "QDeclarative1AbstractAnimation"
+            type: "QDeclarativeAbstractAnimation"
             isList: true
             isReadonly: true
         }
     }
     Component {
-        name: "QDeclarative1Application"
+        name: "QDeclarativeApplication"
         prototype: "QObject"
-        exports: ["QtQuick/Application 1.1"]
+        exports: [
+            "QtQuick/Application 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
+        Signal { name: "activeChanged" }
+        Signal { name: "layoutDirectionChanged" }
     }
     Component {
-        name: "QDeclarative1BasePositioner"
+        name: "QDeclarativeBasePositioner"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizeItem"
+        prototype: "QDeclarativeImplicitSizeItem"
         Property { name: "spacing"; type: "int" }
-        Property { name: "move"; type: "QDeclarative1Transition"; isPointer: true }
-        Property { name: "add"; type: "QDeclarative1Transition"; isPointer: true }
+        Property { name: "move"; type: "QDeclarativeTransition"; isPointer: true }
+        Property { name: "add"; type: "QDeclarativeTransition"; isPointer: true }
+        Signal { name: "spacingChanged" }
+        Signal { name: "moveChanged" }
+        Signal { name: "addChanged" }
     }
     Component {
-        name: "QDeclarative1Behavior"
+        name: "QDeclarativeBehavior"
         defaultProperty: "animation"
         prototype: "QObject"
-        exports: ["QtQuick/Behavior 1.0"]
-        Property { name: "animation"; type: "QDeclarative1AbstractAnimation"; isPointer: true }
+        exports: [
+            "QtQuick/Behavior 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "animation"; type: "QDeclarativeAbstractAnimation"; isPointer: true }
         Property { name: "enabled"; type: "bool" }
+        Signal { name: "enabledChanged" }
     }
     Component {
-        name: "QDeclarative1Bind"
+        name: "QDeclarativeBind"
         prototype: "QObject"
-        exports: ["QtQuick/Binding 1.0"]
+        exports: [
+            "QtQuick/Binding 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
         Property { name: "value"; type: "QVariant" }
         Property { name: "when"; type: "bool" }
     }
     Component {
-        name: "QDeclarative1BorderImage"
+        name: "QDeclarativeBorderImage"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImageBase"
-        exports: ["QtQuick/BorderImage 1.0"]
+        prototype: "QDeclarativeImageBase"
+        exports: [
+            "QtQuick/BorderImage 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "TileMode"
             values: {
@@ -168,41 +232,103 @@ Module {
                 "Round": 2
             }
         }
-        Property { name: "border"; type: "QDeclarative1ScaleGrid"; isReadonly: true; isPointer: true }
+        Property { name: "border"; type: "QDeclarativeScaleGrid"; isReadonly: true; isPointer: true }
         Property { name: "horizontalTileMode"; type: "TileMode" }
         Property { name: "verticalTileMode"; type: "TileMode" }
-        Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
+        Signal { name: "horizontalTileModeChanged" }
+        Signal { name: "verticalTileModeChanged" }
     }
     Component {
-        name: "QDeclarative1ColorAnimation"
-        prototype: "QDeclarative1PropertyAnimation"
-        exports: ["QtQuick/ColorAnimation 1.0"]
+        name: "QDeclarativeColorAnimation"
+        prototype: "QDeclarativePropertyAnimation"
+        exports: [
+            "QtQuick/ColorAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "from"; type: "QColor" }
         Property { name: "to"; type: "QColor" }
     }
     Component {
-        name: "QDeclarative1Column"
+        name: "QDeclarativeColumn"
         defaultProperty: "data"
-        prototype: "QDeclarative1BasePositioner"
-        exports: ["QtQuick/Column 1.0"]
+        prototype: "QDeclarativeBasePositioner"
+        exports: [
+            "QtQuick/Column 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
     }
     Component {
-        name: "QDeclarative1Connections"
+        name: "QDeclarativeComponent"
         prototype: "QObject"
-        exports: ["QtQuick/Connections 1.0"]
+        exports: [
+            "QtQuick/Component 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        attachedType: "QDeclarativeComponentAttached"
+        Enum {
+            name: "Status"
+            values: {
+                "Null": 0,
+                "Ready": 1,
+                "Loading": 2,
+                "Error": 3
+            }
+        }
+        Property { name: "progress"; type: "qreal"; isReadonly: true }
+        Property { name: "status"; type: "Status"; isReadonly: true }
+        Property { name: "url"; type: "QUrl"; isReadonly: true }
+        Signal {
+            name: "statusChanged"
+            Parameter { type: "QDeclarativeComponent::Status" }
+        }
+        Signal {
+            name: "progressChanged"
+            Parameter { type: "qreal" }
+        }
+        Method { name: "errorString"; type: "string" }
+    }
+    Component {
+        name: "QDeclarativeComponentAttached"
+        prototype: "QObject"
+        Signal { name: "completed" }
+        Signal { name: "destruction" }
+    }
+    Component {
+        name: "QDeclarativeConnections"
+        prototype: "QObject"
+        exports: [
+            "QtQuick/Connections 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "ignoreUnknownSignals"; type: "bool" }
+        Signal { name: "targetChanged" }
     }
     Component {
-        name: "QDeclarative1Curve"
-        prototype: "QDeclarative1PathElement"
+        name: "QDeclarativeCurve"
+        prototype: "QDeclarativePathElement"
         Property { name: "x"; type: "qreal" }
         Property { name: "y"; type: "qreal" }
+        Signal { name: "xChanged" }
+        Signal { name: "yChanged" }
     }
     Component {
-        name: "QDeclarative1Drag"
+        name: "QDeclarativeDrag"
         prototype: "QObject"
-        exports: ["QtQuick/Drag 1.0"]
+        exports: [
+            "QtQuick/Drag 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Axis"
             values: {
@@ -219,13 +345,91 @@ Module {
         Property { name: "maximumY"; type: "qreal" }
         Property { name: "active"; type: "bool"; isReadonly: true }
         Property { name: "filterChildren"; type: "bool" }
+        Signal { name: "targetChanged" }
+        Signal { name: "axisChanged" }
+        Signal { name: "minimumXChanged" }
+        Signal { name: "maximumXChanged" }
+        Signal { name: "minimumYChanged" }
+        Signal { name: "maximumYChanged" }
+        Signal { name: "activeChanged" }
+        Signal { name: "filterChildrenChanged" }
     }
     Component {
-        name: "QDeclarative1Flickable"
+        name: "QDeclarativeEasingValueType"
+        prototype: "QDeclarativeValueType"
+        exports: [
+            "QtQuick/Easing 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Enum {
+            name: "Type"
+            values: {
+                "Linear": 0,
+                "InQuad": 1,
+                "OutQuad": 2,
+                "InOutQuad": 3,
+                "OutInQuad": 4,
+                "InCubic": 5,
+                "OutCubic": 6,
+                "InOutCubic": 7,
+                "OutInCubic": 8,
+                "InQuart": 9,
+                "OutQuart": 10,
+                "InOutQuart": 11,
+                "OutInQuart": 12,
+                "InQuint": 13,
+                "OutQuint": 14,
+                "InOutQuint": 15,
+                "OutInQuint": 16,
+                "InSine": 17,
+                "OutSine": 18,
+                "InOutSine": 19,
+                "OutInSine": 20,
+                "InExpo": 21,
+                "OutExpo": 22,
+                "InOutExpo": 23,
+                "OutInExpo": 24,
+                "InCirc": 25,
+                "OutCirc": 26,
+                "InOutCirc": 27,
+                "OutInCirc": 28,
+                "InElastic": 29,
+                "OutElastic": 30,
+                "InOutElastic": 31,
+                "OutInElastic": 32,
+                "InBack": 33,
+                "OutBack": 34,
+                "InOutBack": 35,
+                "OutInBack": 36,
+                "InBounce": 37,
+                "OutBounce": 38,
+                "InOutBounce": 39,
+                "OutInBounce": 40,
+                "InCurve": 41,
+                "OutCurve": 42,
+                "SineCurve": 43,
+                "CosineCurve": 44
+            }
+        }
+        Property { name: "type"; type: "Type" }
+        Property { name: "amplitude"; type: "qreal" }
+        Property { name: "overshoot"; type: "qreal" }
+        Property { name: "period"; type: "qreal" }
+    }
+    Component {
+        name: "QDeclarativeFlickable"
         defaultProperty: "flickableData"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/Flickable 1.0", "QtQuick/Flickable 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtQuick/Flickable 1.0",
+            "QtQuick/Flickable 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "BoundsBehavior"
             values: {
@@ -268,13 +472,31 @@ Module {
         Property { name: "atYBeginning"; type: "bool"; isReadonly: true }
         Property {
             name: "visibleArea"
-            type: "QDeclarative1FlickableVisibleArea"
+            type: "QDeclarativeFlickableVisibleArea"
             isReadonly: true
             isPointer: true
         }
         Property { name: "flickableData"; type: "QObject"; isList: true; isReadonly: true }
         Property { name: "flickableChildren"; type: "QGraphicsObject"; isList: true; isReadonly: true }
+        Signal { name: "contentWidthChanged" }
+        Signal { name: "contentHeightChanged" }
+        Signal { name: "contentXChanged" }
+        Signal { name: "contentYChanged" }
+        Signal { name: "movingChanged" }
+        Signal { name: "movingHorizontallyChanged" }
+        Signal { name: "movingVerticallyChanged" }
+        Signal { name: "flickingChanged" }
+        Signal { name: "flickingHorizontallyChanged" }
+        Signal { name: "flickingVerticallyChanged" }
+        Signal { name: "horizontalVelocityChanged" }
+        Signal { name: "verticalVelocityChanged" }
         Signal { name: "isAtBoundaryChanged" }
+        Signal { name: "flickableDirectionChanged" }
+        Signal { name: "interactiveChanged" }
+        Signal { name: "boundsBehaviorChanged" }
+        Signal { name: "maximumFlickVelocityChanged" }
+        Signal { name: "flickDecelerationChanged" }
+        Signal { name: "pressDelayChanged" }
         Signal { name: "movementStarted" }
         Signal { name: "movementEnded" }
         Signal { name: "flickStarted" }
@@ -289,7 +511,7 @@ Module {
         Method { name: "returnToBounds"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1FlickableVisibleArea"
+        name: "QDeclarativeFlickableVisibleArea"
         prototype: "QObject"
         Property { name: "xPosition"; type: "qreal"; isReadonly: true }
         Property { name: "yPosition"; type: "qreal"; isReadonly: true }
@@ -313,10 +535,15 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1Flipable"
+        name: "QDeclarativeFlipable"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/Flipable 1.0"]
+        exports: [
+            "QtQuick/Flipable 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Side"
             values: {
@@ -327,13 +554,22 @@ Module {
         Property { name: "front"; type: "QGraphicsObject"; isPointer: true }
         Property { name: "back"; type: "QGraphicsObject"; isPointer: true }
         Property { name: "side"; type: "Side"; isReadonly: true }
+        Signal { name: "frontChanged" }
+        Signal { name: "backChanged" }
+        Signal { name: "sideChanged" }
     }
     Component {
-        name: "QDeclarative1Flow"
+        name: "QDeclarativeFlow"
         defaultProperty: "data"
-        prototype: "QDeclarative1BasePositioner"
-        exports: ["QtQuick/Flow 1.0", "QtQuick/Flow 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeBasePositioner"
+        exports: [
+            "QtQuick/Flow 1.0",
+            "QtQuick/Flow 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "Flow"
             values: {
@@ -343,32 +579,42 @@ Module {
         }
         Property { name: "flow"; type: "Flow" }
         Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Property {
-            name: "effectiveLayoutDirection"
-            revision: 1
-            type: "Qt::LayoutDirection"
-            isReadonly: true
-        }
+        Signal { name: "flowChanged" }
         Signal { name: "layoutDirectionChanged"; revision: 1 }
-        Signal { name: "effectiveLayoutDirectionChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1FocusPanel"
+        name: "QDeclarativeFocusPanel"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/FocusPanel 1.0"]
+        exports: [
+            "QtQuick/FocusPanel 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "active"; type: "bool" }
+        Signal { name: "activeChanged" }
     }
     Component {
-        name: "QDeclarative1FocusScope"
+        name: "QDeclarativeFocusScope"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/FocusScope 1.0"]
+        exports: [
+            "QtQuick/FocusScope 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
     }
     Component {
-        name: "QDeclarative1FontLoader"
+        name: "QDeclarativeFontLoader"
         prototype: "QObject"
-        exports: ["QtQuick/FontLoader 1.0"]
+        exports: [
+            "QtQuick/FontLoader 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Status"
             values: {
@@ -381,41 +627,107 @@ Module {
         Property { name: "source"; type: "QUrl" }
         Property { name: "name"; type: "string" }
         Property { name: "status"; type: "Status"; isReadonly: true }
+        Signal { name: "sourceChanged" }
+        Signal { name: "nameChanged" }
+        Signal { name: "statusChanged" }
+    }
+    Component {
+        name: "QDeclarativeFontValueType"
+        prototype: "QDeclarativeValueType"
+        exports: [
+            "QtQuick/Font 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Enum {
+            name: "FontWeight"
+            values: {
+                "Light": 25,
+                "Normal": 50,
+                "DemiBold": 63,
+                "Bold": 75,
+                "Black": 87
+            }
+        }
+        Enum {
+            name: "Capitalization"
+            values: {
+                "MixedCase": 0,
+                "AllUppercase": 1,
+                "AllLowercase": 2,
+                "SmallCaps": 3,
+                "Capitalize": 4
+            }
+        }
+        Property { name: "family"; type: "string" }
+        Property { name: "bold"; type: "bool" }
+        Property { name: "weight"; type: "FontWeight" }
+        Property { name: "italic"; type: "bool" }
+        Property { name: "underline"; type: "bool" }
+        Property { name: "overline"; type: "bool" }
+        Property { name: "strikeout"; type: "bool" }
+        Property { name: "pointSize"; type: "qreal" }
+        Property { name: "pixelSize"; type: "int" }
+        Property { name: "capitalization"; type: "Capitalization" }
+        Property { name: "letterSpacing"; type: "qreal" }
+        Property { name: "wordSpacing"; type: "qreal" }
     }
     Component {
-        name: "QDeclarative1Gradient"
+        name: "QDeclarativeGradient"
         defaultProperty: "stops"
         prototype: "QObject"
-        exports: ["QtQuick/Gradient 1.0"]
-        Property { name: "stops"; type: "QDeclarative1GradientStop"; isList: true; isReadonly: true }
+        exports: [
+            "QtQuick/Gradient 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "stops"; type: "QDeclarativeGradientStop"; isList: true; isReadonly: true }
         Signal { name: "updated" }
     }
     Component {
-        name: "QDeclarative1GradientStop"
+        name: "QDeclarativeGradientStop"
         prototype: "QObject"
-        exports: ["QtQuick/GradientStop 1.0"]
+        exports: [
+            "QtQuick/GradientStop 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "position"; type: "qreal" }
         Property { name: "color"; type: "QColor" }
     }
     Component {
-        name: "QDeclarative1GraphicsWidget"
+        name: "QDeclarativeGraphicsWidget"
         defaultProperty: "children"
         prototype: "QGraphicsWidget"
-        exports: ["QtQuick/QGraphicsWidget 1.0"]
-        Property { name: "anchors"; type: "QDeclarative1Anchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QDeclarative1AnchorLine"; isReadonly: true }
+        exports: [
+            "QtQuick/QGraphicsWidget 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "anchors"; type: "QDeclarativeAnchors"; isReadonly: true; isPointer: true }
+        Property { name: "left"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "right"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "horizontalCenter"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "top"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "bottom"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "verticalCenter"; type: "QDeclarativeAnchorLine"; isReadonly: true }
     }
     Component {
-        name: "QDeclarative1Grid"
+        name: "QDeclarativeGrid"
         defaultProperty: "data"
-        prototype: "QDeclarative1BasePositioner"
-        exports: ["QtQuick/Grid 1.0", "QtQuick/Grid 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeBasePositioner"
+        exports: [
+            "QtQuick/Grid 1.0",
+            "QtQuick/Grid 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "Flow"
             values: {
@@ -427,22 +739,24 @@ Module {
         Property { name: "columns"; type: "int" }
         Property { name: "flow"; type: "Flow" }
         Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Property {
-            name: "effectiveLayoutDirection"
-            revision: 1
-            type: "Qt::LayoutDirection"
-            isReadonly: true
-        }
+        Signal { name: "rowsChanged" }
+        Signal { name: "columnsChanged" }
+        Signal { name: "flowChanged" }
         Signal { name: "layoutDirectionChanged"; revision: 1 }
-        Signal { name: "effectiveLayoutDirectionChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1GridView"
+        name: "QDeclarativeGridView"
         defaultProperty: "data"
-        prototype: "QDeclarative1Flickable"
-        exports: ["QtQuick/GridView 1.0", "QtQuick/GridView 1.1"]
-        exportMetaObjectRevisions: [0, 1]
-        attachedType: "QDeclarative1GridViewAttached"
+        prototype: "QDeclarativeFlickable"
+        exports: [
+            "QtQuick/GridView 1.0",
+            "QtQuick/GridView 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
+        attachedType: "QDeclarativeGridViewAttached"
         Enum {
             name: "HighlightRangeMode"
             values: {
@@ -490,12 +804,6 @@ Module {
         Property { name: "highlightRangeMode"; type: "HighlightRangeMode" }
         Property { name: "flow"; type: "Flow" }
         Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Property {
-            name: "effectiveLayoutDirection"
-            revision: 1
-            type: "Qt::LayoutDirection"
-            isReadonly: true
-        }
         Property { name: "keyNavigationWraps"; type: "bool" }
         Property { name: "cacheBuffer"; type: "int" }
         Property { name: "cellWidth"; type: "int" }
@@ -503,8 +811,25 @@ Module {
         Property { name: "snapMode"; type: "SnapMode" }
         Property { name: "header"; type: "QDeclarativeComponent"; isPointer: true }
         Property { name: "footer"; type: "QDeclarativeComponent"; isPointer: true }
+        Signal { name: "countChanged" }
+        Signal { name: "currentIndexChanged" }
+        Signal { name: "cellWidthChanged" }
+        Signal { name: "cellHeightChanged" }
+        Signal { name: "highlightChanged" }
+        Signal { name: "highlightItemChanged" }
+        Signal { name: "preferredHighlightBeginChanged" }
+        Signal { name: "preferredHighlightEndChanged" }
+        Signal { name: "highlightRangeModeChanged" }
+        Signal { name: "highlightMoveDurationChanged" }
+        Signal { name: "modelChanged" }
+        Signal { name: "delegateChanged" }
+        Signal { name: "flowChanged" }
         Signal { name: "layoutDirectionChanged"; revision: 1 }
-        Signal { name: "effectiveLayoutDirectionChanged"; revision: 1 }
+        Signal { name: "keyNavigationWrapsChanged" }
+        Signal { name: "cacheBufferChanged" }
+        Signal { name: "snapModeChanged" }
+        Signal { name: "headerChanged" }
+        Signal { name: "footerChanged" }
         Method { name: "moveCurrentIndexUp" }
         Method { name: "moveCurrentIndexDown" }
         Method { name: "moveCurrentIndexLeft" }
@@ -524,20 +849,27 @@ Module {
         Method { name: "positionViewAtEnd"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1GridViewAttached"
+        name: "QDeclarativeGridViewAttached"
         prototype: "QObject"
-        Property { name: "view"; type: "QDeclarative1GridView"; isReadonly: true; isPointer: true }
+        Property { name: "view"; type: "QDeclarativeGridView"; isReadonly: true; isPointer: true }
         Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
         Property { name: "delayRemove"; type: "bool" }
         Signal { name: "currentItemChanged" }
+        Signal { name: "delayRemoveChanged" }
         Signal { name: "add" }
         Signal { name: "remove" }
+        Signal { name: "viewChanged" }
     }
     Component {
-        name: "QDeclarative1Image"
+        name: "QDeclarativeImage"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImageBase"
-        exports: ["QtQuick/Image 1.0"]
+        prototype: "QDeclarativeImageBase"
+        exports: [
+            "QtQuick/Image 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "FillMode"
             values: {
@@ -552,14 +884,17 @@ Module {
         Property { name: "fillMode"; type: "FillMode" }
         Property { name: "paintedWidth"; type: "qreal"; isReadonly: true }
         Property { name: "paintedHeight"; type: "qreal"; isReadonly: true }
+        Signal { name: "fillModeChanged" }
         Signal { name: "paintedGeometryChanged" }
     }
     Component {
-        name: "QDeclarative1ImageBase"
+        name: "QDeclarativeImageBase"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizeItem"
-        exports: ["QtQuick/ 1.1"]
-        exportMetaObjectRevisions: [1]
+        prototype: "QDeclarativeImplicitSizeItem"
+        exports: [
+        ]
+        exportMetaObjectRevisions: [
+        ]
         Enum {
             name: "Status"
             values: {
@@ -580,43 +915,165 @@ Module {
             name: "sourceChanged"
             Parameter { type: "QUrl" }
         }
+        Signal { name: "sourceSizeChanged" }
         Signal {
             name: "statusChanged"
-            Parameter { type: "QDeclarative1ImageBase::Status" }
+            Parameter { type: "QDeclarativeImageBase::Status" }
         }
         Signal {
             name: "progressChanged"
             Parameter { name: "progress"; type: "qreal" }
         }
+        Signal { name: "asynchronousChanged" }
         Signal { name: "cacheChanged"; revision: 1 }
         Signal { name: "mirrorChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1ImplicitSizeItem"
+        name: "QDeclarativeImplicitSizeItem"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/ 1.0", "QtQuick/ 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+        ]
+        exportMetaObjectRevisions: [
+        ]
         Property { name: "implicitWidth"; revision: 1; type: "qreal"; isReadonly: true }
         Property { name: "implicitHeight"; revision: 1; type: "qreal"; isReadonly: true }
         Signal { name: "implicitWidthChanged"; revision: 1 }
         Signal { name: "implicitHeightChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1ImplicitSizePaintedItem"
+        name: "QDeclarativeImplicitSizePaintedItem"
         defaultProperty: "data"
-        prototype: "QDeclarative1PaintedItem"
-        exports: ["QtQuick/ 1.0", "QtQuick/ 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativePaintedItem"
+        exports: [
+        ]
+        exportMetaObjectRevisions: [
+        ]
         Property { name: "implicitWidth"; revision: 1; type: "qreal"; isReadonly: true }
         Property { name: "implicitHeight"; revision: 1; type: "qreal"; isReadonly: true }
         Signal { name: "implicitWidthChanged"; revision: 1 }
         Signal { name: "implicitHeightChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1KeyNavigationAttached"
+        name: "QDeclarativeItem"
+        defaultProperty: "data"
+        prototype: "QGraphicsObject"
+        exports: [
+            "QtQuick/Item 1.0",
+            "QtQuick/Item 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
+        Enum {
+            name: "TransformOrigin"
+            values: {
+                "TopLeft": 0,
+                "Top": 1,
+                "TopRight": 2,
+                "Left": 3,
+                "Center": 4,
+                "Right": 5,
+                "BottomLeft": 6,
+                "Bottom": 7,
+                "BottomRight": 8
+            }
+        }
+        Property { name: "parent"; type: "QDeclarativeItem"; isPointer: true }
+        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+        Property { name: "states"; type: "QDeclarativeState"; isList: true; isReadonly: true }
+        Property { name: "transitions"; type: "QDeclarativeTransition"; isList: true; isReadonly: true }
+        Property { name: "state"; type: "string" }
+        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+        Property { name: "anchors"; type: "QDeclarativeAnchors"; isReadonly: true; isPointer: true }
+        Property { name: "left"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "right"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "horizontalCenter"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "top"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "bottom"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "verticalCenter"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "baseline"; type: "QDeclarativeAnchorLine"; isReadonly: true }
+        Property { name: "baselineOffset"; type: "qreal" }
+        Property { name: "clip"; type: "bool" }
+        Property { name: "focus"; type: "bool" }
+        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+        Property { name: "transform"; type: "QGraphicsTransform"; isList: true; isReadonly: true }
+        Property { name: "transformOrigin"; type: "TransformOrigin" }
+        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+        Property { name: "smooth"; type: "bool" }
+        Property { name: "implicitWidth"; revision: 1; type: "qreal" }
+        Property { name: "implicitHeight"; revision: 1; type: "qreal" }
+        Signal {
+            name: "childrenRectChanged"
+            Parameter { type: "QRectF" }
+        }
+        Signal {
+            name: "baselineOffsetChanged"
+            Parameter { type: "qreal" }
+        }
+        Signal {
+            name: "stateChanged"
+            Parameter { type: "string" }
+        }
+        Signal {
+            name: "focusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "activeFocusChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "parentChanged"
+            Parameter { type: "QDeclarativeItem"; isPointer: true }
+        }
+        Signal {
+            name: "transformOriginChanged"
+            Parameter { type: "TransformOrigin" }
+        }
+        Signal {
+            name: "smoothChanged"
+            Parameter { type: "bool" }
+        }
+        Signal {
+            name: "clipChanged"
+            Parameter { type: "bool" }
+        }
+        Signal { name: "implicitWidthChanged"; revision: 1 }
+        Signal { name: "implicitHeightChanged"; revision: 1 }
+        Method {
+            name: "mapFromItem"
+            type: "QScriptValue"
+            Parameter { name: "item"; type: "QScriptValue" }
+            Parameter { name: "x"; type: "qreal" }
+            Parameter { name: "y"; type: "qreal" }
+        }
+        Method {
+            name: "mapToItem"
+            type: "QScriptValue"
+            Parameter { name: "item"; type: "QScriptValue" }
+            Parameter { name: "x"; type: "qreal" }
+            Parameter { name: "y"; type: "qreal" }
+        }
+        Method { name: "forceActiveFocus" }
+        Method {
+            name: "childAt"
+            type: "QDeclarativeItem*"
+            Parameter { name: "x"; type: "qreal" }
+            Parameter { name: "y"; type: "qreal" }
+        }
+    }
+    Component {
+        name: "QDeclarativeKeyNavigationAttached"
         prototype: "QObject"
-        exports: ["QtQuick/KeyNavigation 1.0"]
+        exports: [
+            "QtQuick/KeyNavigation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Priority"
             values: {
@@ -631,11 +1088,23 @@ Module {
         Property { name: "tab"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "backtab"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "priority"; type: "Priority" }
+        Signal { name: "leftChanged" }
+        Signal { name: "rightChanged" }
+        Signal { name: "upChanged" }
+        Signal { name: "downChanged" }
+        Signal { name: "tabChanged" }
+        Signal { name: "backtabChanged" }
+        Signal { name: "priorityChanged" }
     }
     Component {
-        name: "QDeclarative1KeysAttached"
+        name: "QDeclarativeKeysAttached"
         prototype: "QObject"
-        exports: ["QtQuick/Keys 1.0"]
+        exports: [
+            "QtQuick/Keys 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Priority"
             values: {
@@ -646,190 +1115,272 @@ Module {
         Property { name: "enabled"; type: "bool" }
         Property { name: "forwardTo"; type: "QDeclarativeItem"; isList: true; isReadonly: true }
         Property { name: "priority"; type: "Priority" }
+        Signal { name: "enabledChanged" }
+        Signal { name: "priorityChanged" }
         Signal {
             name: "pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "released"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit0Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit1Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit2Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit3Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit4Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit5Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit6Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit7Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit8Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "digit9Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "leftPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "rightPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "upPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "downPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "tabPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "backtabPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "asteriskPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "numberSignPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "escapePressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "returnPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "enterPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "deletePressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "spacePressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "backPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "cancelPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "selectPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "yesPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "noPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "context1Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "context2Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "context3Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "context4Pressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "callPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "hangupPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "flipPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "menuPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "volumeUpPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
         Signal {
             name: "volumeDownPressed"
-            Parameter { name: "event"; type: "QDeclarative1KeyEvent"; isPointer: true }
+            Parameter { name: "event"; type: "QDeclarativeKeyEvent"; isPointer: true }
         }
     }
     Component {
-        name: "QDeclarative1LayoutItem"
+        name: "QDeclarativeLayoutItem"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/LayoutItem 1.0"]
+        exports: [
+            "QtQuick/LayoutItem 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "maximumSize"; type: "QSizeF" }
         Property { name: "minimumSize"; type: "QSizeF" }
         Property { name: "preferredSize"; type: "QSizeF" }
+        Signal { name: "maximumSizeChanged" }
+        Signal { name: "minimumSizeChanged" }
+        Signal { name: "preferredSizeChanged" }
     }
     Component {
-        name: "QDeclarative1LayoutMirroringAttached"
+        name: "QDeclarativeLayoutMirroringAttached"
         prototype: "QObject"
-        exports: ["QtQuick/LayoutMirroring 1.1"]
+        exports: [
+            "QtQuick/LayoutMirroring 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "enabled"; type: "bool" }
         Property { name: "childrenInherit"; type: "bool" }
+        Signal { name: "enabledChanged" }
+        Signal { name: "childrenInheritChanged" }
+    }
+    Component {
+        name: "QDeclarativeListElement"
+        prototype: "QObject"
+        exports: [
+            "QtQuick/ListElement 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+    }
+    Component {
+        name: "QDeclarativeListModel"
+        prototype: "QListModelInterface"
+        exports: [
+            "QtQuick/ListModel 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "count"; type: "int"; isReadonly: true }
+        Signal { name: "countChanged" }
+        Method { name: "clear" }
+        Method {
+            name: "remove"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "append"
+            Parameter { type: "QScriptValue" }
+        }
+        Method {
+            name: "insert"
+            Parameter { name: "index"; type: "int" }
+            Parameter { type: "QScriptValue" }
+        }
+        Method {
+            name: "get"
+            type: "QScriptValue"
+            Parameter { name: "index"; type: "int" }
+        }
+        Method {
+            name: "set"
+            Parameter { name: "index"; type: "int" }
+            Parameter { type: "QScriptValue" }
+        }
+        Method {
+            name: "setProperty"
+            Parameter { name: "index"; type: "int" }
+            Parameter { name: "property"; type: "string" }
+            Parameter { name: "value"; type: "QVariant" }
+        }
+        Method {
+            name: "move"
+            Parameter { name: "from"; type: "int" }
+            Parameter { name: "to"; type: "int" }
+            Parameter { name: "count"; type: "int" }
+        }
+        Method { name: "sync" }
     }
     Component {
-        name: "QDeclarative1ListView"
+        name: "QDeclarativeListView"
         defaultProperty: "data"
-        prototype: "QDeclarative1Flickable"
-        exports: ["QtQuick/ListView 1.0", "QtQuick/ListView 1.1"]
-        exportMetaObjectRevisions: [0, 1]
-        attachedType: "QDeclarative1ListViewAttached"
+        prototype: "QDeclarativeFlickable"
+        exports: [
+            "QtQuick/ListView 1.0",
+            "QtQuick/ListView 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
+        attachedType: "QDeclarativeListViewAttached"
         Enum {
             name: "HighlightRangeMode"
             values: {
@@ -881,21 +1432,36 @@ Module {
         Property { name: "spacing"; type: "qreal" }
         Property { name: "orientation"; type: "Orientation" }
         Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Property {
-            name: "effectiveLayoutDirection"
-            revision: 1
-            type: "Qt::LayoutDirection"
-            isReadonly: true
-        }
         Property { name: "keyNavigationWraps"; type: "bool" }
         Property { name: "cacheBuffer"; type: "int" }
-        Property { name: "section"; type: "QDeclarative1ViewSection"; isReadonly: true; isPointer: true }
+        Property { name: "section"; type: "QDeclarativeViewSection"; isReadonly: true; isPointer: true }
         Property { name: "currentSection"; type: "string"; isReadonly: true }
         Property { name: "snapMode"; type: "SnapMode" }
         Property { name: "header"; type: "QDeclarativeComponent"; isPointer: true }
         Property { name: "footer"; type: "QDeclarativeComponent"; isPointer: true }
+        Signal { name: "countChanged" }
+        Signal { name: "spacingChanged" }
+        Signal { name: "orientationChanged" }
         Signal { name: "layoutDirectionChanged"; revision: 1 }
-        Signal { name: "effectiveLayoutDirectionChanged"; revision: 1 }
+        Signal { name: "currentIndexChanged" }
+        Signal { name: "currentSectionChanged" }
+        Signal { name: "highlightMoveSpeedChanged" }
+        Signal { name: "highlightMoveDurationChanged" }
+        Signal { name: "highlightResizeSpeedChanged" }
+        Signal { name: "highlightResizeDurationChanged" }
+        Signal { name: "highlightChanged" }
+        Signal { name: "highlightItemChanged" }
+        Signal { name: "modelChanged" }
+        Signal { name: "delegateChanged" }
+        Signal { name: "highlightFollowsCurrentItemChanged" }
+        Signal { name: "preferredHighlightBeginChanged" }
+        Signal { name: "preferredHighlightEndChanged" }
+        Signal { name: "highlightRangeModeChanged" }
+        Signal { name: "keyNavigationWrapsChanged" }
+        Signal { name: "cacheBufferChanged" }
+        Signal { name: "snapModeChanged" }
+        Signal { name: "headerChanged" }
+        Signal { name: "footerChanged" }
         Method { name: "incrementCurrentIndex" }
         Method { name: "decrementCurrentIndex" }
         Method {
@@ -913,24 +1479,33 @@ Module {
         Method { name: "positionViewAtEnd"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1ListViewAttached"
+        name: "QDeclarativeListViewAttached"
         prototype: "QObject"
-        Property { name: "view"; type: "QDeclarative1ListView"; isReadonly: true; isPointer: true }
+        Property { name: "view"; type: "QDeclarativeListView"; isReadonly: true; isPointer: true }
         Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
         Property { name: "previousSection"; type: "string"; isReadonly: true }
         Property { name: "nextSection"; type: "string"; isReadonly: true }
         Property { name: "section"; type: "string"; isReadonly: true }
         Property { name: "delayRemove"; type: "bool" }
         Signal { name: "currentItemChanged" }
+        Signal { name: "sectionChanged" }
         Signal { name: "prevSectionChanged" }
+        Signal { name: "nextSectionChanged" }
+        Signal { name: "delayRemoveChanged" }
         Signal { name: "add" }
         Signal { name: "remove" }
+        Signal { name: "viewChanged" }
     }
     Component {
-        name: "QDeclarative1Loader"
+        name: "QDeclarativeLoader"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizeItem"
-        exports: ["QtQuick/Loader 1.0"]
+        prototype: "QDeclarativeImplicitSizeItem"
+        exports: [
+            "QtQuick/Loader 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Status"
             values: {
@@ -945,14 +1520,24 @@ Module {
         Property { name: "item"; type: "QGraphicsObject"; isReadonly: true; isPointer: true }
         Property { name: "status"; type: "Status"; isReadonly: true }
         Property { name: "progress"; type: "qreal"; isReadonly: true }
+        Signal { name: "itemChanged" }
+        Signal { name: "sourceChanged" }
+        Signal { name: "statusChanged" }
+        Signal { name: "progressChanged" }
         Signal { name: "loaded" }
     }
     Component {
-        name: "QDeclarative1MouseArea"
+        name: "QDeclarativeMouseArea"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/MouseArea 1.0", "QtQuick/MouseArea 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtQuick/MouseArea 1.0",
+            "QtQuick/MouseArea 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Property { name: "mouseX"; type: "qreal"; isReadonly: true }
         Property { name: "mouseY"; type: "qreal"; isReadonly: true }
         Property { name: "containsMouse"; type: "bool"; isReadonly: true }
@@ -961,64 +1546,78 @@ Module {
         Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
         Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
         Property { name: "hoverEnabled"; type: "bool" }
-        Property { name: "drag"; type: "QDeclarative1Drag"; isReadonly: true; isPointer: true }
+        Property { name: "drag"; type: "QDeclarativeDrag"; isReadonly: true; isPointer: true }
         Property { name: "preventStealing"; revision: 1; type: "bool" }
         Signal { name: "hoveredChanged" }
+        Signal { name: "pressedChanged" }
+        Signal { name: "enabledChanged" }
+        Signal { name: "acceptedButtonsChanged" }
+        Signal { name: "hoverEnabledChanged" }
         Signal {
             name: "positionChanged"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal {
             name: "mousePositionChanged"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal { name: "preventStealingChanged"; revision: 1 }
         Signal {
             name: "pressed"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal {
             name: "pressAndHold"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal {
             name: "released"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal {
             name: "clicked"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal {
             name: "doubleClicked"
-            Parameter { name: "mouse"; type: "QDeclarative1MouseEvent"; isPointer: true }
+            Parameter { name: "mouse"; type: "QDeclarativeMouseEvent"; isPointer: true }
         }
         Signal { name: "entered" }
         Signal { name: "exited" }
         Signal { name: "canceled" }
     }
     Component {
-        name: "QDeclarative1NumberAnimation"
-        prototype: "QDeclarative1PropertyAnimation"
-        exports: ["QtQuick/NumberAnimation 1.0"]
+        name: "QDeclarativeNumberAnimation"
+        prototype: "QDeclarativePropertyAnimation"
+        exports: [
+            "QtQuick/NumberAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "from"; type: "qreal" }
         Property { name: "to"; type: "qreal" }
     }
     Component {
-        name: "QDeclarative1Package"
+        name: "QDeclarativePackage"
         defaultProperty: "data"
         prototype: "QObject"
-        exports: ["QtQuick/Package 1.0"]
-        attachedType: "QDeclarative1PackageAttached"
+        exports: [
+            "QtQuick/Package 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        attachedType: "QDeclarativePackageAttached"
         Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
     }
     Component {
-        name: "QDeclarative1PackageAttached"
+        name: "QDeclarativePackageAttached"
         prototype: "QObject"
         Property { name: "name"; type: "string" }
     }
     Component {
-        name: "QDeclarative1PaintedItem"
+        name: "QDeclarativePaintedItem"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
         Property { name: "contentsSize"; type: "QSize" }
@@ -1026,26 +1625,47 @@ Module {
         Property { name: "pixelCacheSize"; type: "int" }
         Property { name: "smoothCache"; type: "bool" }
         Property { name: "contentsScale"; type: "qreal" }
+        Signal { name: "fillColorChanged" }
+        Signal { name: "contentsSizeChanged" }
+        Signal { name: "contentsScaleChanged" }
     }
     Component {
-        name: "QDeclarative1ParallelAnimation"
+        name: "QDeclarativeParallelAnimation"
         defaultProperty: "animations"
-        prototype: "QDeclarative1AnimationGroup"
-        exports: ["QtQuick/ParallelAnimation 1.0"]
+        prototype: "QDeclarativeAnimationGroup"
+        exports: [
+            "QtQuick/ParallelAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
     }
     Component {
-        name: "QDeclarative1ParentAnimation"
+        name: "QDeclarativeParentAnimation"
         defaultProperty: "animations"
-        prototype: "QDeclarative1AnimationGroup"
-        exports: ["QtQuick/ParentAnimation 1.0"]
+        prototype: "QDeclarativeAnimationGroup"
+        exports: [
+            "QtQuick/ParentAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "newParent"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "via"; type: "QDeclarativeItem"; isPointer: true }
+        Signal { name: "targetChanged" }
+        Signal { name: "newParentChanged" }
+        Signal { name: "viaChanged" }
     }
     Component {
-        name: "QDeclarative1ParentChange"
-        prototype: "QDeclarative1StateOperation"
-        exports: ["QtQuick/ParentChange 1.0"]
+        name: "QDeclarativeParentChange"
+        prototype: "QDeclarativeStateOperation"
+        exports: [
+            "QtQuick/ParentChange 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "parent"; type: "QDeclarativeItem"; isPointer: true }
         Property { name: "x"; type: "QDeclarativeScriptString" }
@@ -1056,66 +1676,107 @@ Module {
         Property { name: "rotation"; type: "QDeclarativeScriptString" }
     }
     Component {
-        name: "QDeclarative1Path"
+        name: "QDeclarativePath"
         defaultProperty: "pathElements"
         prototype: "QObject"
-        exports: ["QtQuick/Path 1.0"]
-        Property {
-            name: "pathElements"
-            type: "QDeclarative1PathElement"
-            isList: true
-            isReadonly: true
-        }
+        exports: [
+            "QtQuick/Path 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "pathElements"; type: "QDeclarativePathElement"; isList: true; isReadonly: true }
         Property { name: "startX"; type: "qreal" }
         Property { name: "startY"; type: "qreal" }
         Property { name: "closed"; type: "bool"; isReadonly: true }
         Signal { name: "changed" }
+        Signal { name: "startXChanged" }
+        Signal { name: "startYChanged" }
     }
     Component {
-        name: "QDeclarative1PathAttribute"
-        prototype: "QDeclarative1PathElement"
-        exports: ["QtQuick/PathAttribute 1.0"]
+        name: "QDeclarativePathAttribute"
+        prototype: "QDeclarativePathElement"
+        exports: [
+            "QtQuick/PathAttribute 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "name"; type: "string" }
         Property { name: "value"; type: "qreal" }
+        Signal { name: "nameChanged" }
+        Signal { name: "valueChanged" }
     }
     Component {
-        name: "QDeclarative1PathCubic"
-        prototype: "QDeclarative1Curve"
-        exports: ["QtQuick/PathCubic 1.0"]
+        name: "QDeclarativePathCubic"
+        prototype: "QDeclarativeCurve"
+        exports: [
+            "QtQuick/PathCubic 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "control1X"; type: "qreal" }
         Property { name: "control1Y"; type: "qreal" }
         Property { name: "control2X"; type: "qreal" }
         Property { name: "control2Y"; type: "qreal" }
+        Signal { name: "control1XChanged" }
+        Signal { name: "control1YChanged" }
+        Signal { name: "control2XChanged" }
+        Signal { name: "control2YChanged" }
     }
     Component {
-        name: "QDeclarative1PathElement"
+        name: "QDeclarativePathElement"
         prototype: "QObject"
         Signal { name: "changed" }
     }
     Component {
-        name: "QDeclarative1PathLine"
-        prototype: "QDeclarative1Curve"
-        exports: ["QtQuick/PathLine 1.0"]
+        name: "QDeclarativePathLine"
+        prototype: "QDeclarativeCurve"
+        exports: [
+            "QtQuick/PathLine 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
     }
     Component {
-        name: "QDeclarative1PathPercent"
-        prototype: "QDeclarative1PathElement"
-        exports: ["QtQuick/PathPercent 1.0"]
+        name: "QDeclarativePathPercent"
+        prototype: "QDeclarativePathElement"
+        exports: [
+            "QtQuick/PathPercent 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "value"; type: "qreal" }
+        Signal { name: "valueChanged" }
     }
     Component {
-        name: "QDeclarative1PathQuad"
-        prototype: "QDeclarative1Curve"
-        exports: ["QtQuick/PathQuad 1.0"]
+        name: "QDeclarativePathQuad"
+        prototype: "QDeclarativeCurve"
+        exports: [
+            "QtQuick/PathQuad 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "controlX"; type: "qreal" }
         Property { name: "controlY"; type: "qreal" }
+        Signal { name: "controlXChanged" }
+        Signal { name: "controlYChanged" }
     }
     Component {
-        name: "QDeclarative1PathView"
+        name: "QDeclarativePathView"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/PathView 1.0"]
-        attachedType: "QDeclarative1PathViewAttached"
+        exports: [
+            "QtQuick/PathView 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        attachedType: "QDeclarativePathViewAttached"
         Enum {
             name: "HighlightRangeMode"
             values: {
@@ -1125,7 +1786,7 @@ Module {
             }
         }
         Property { name: "model"; type: "QVariant" }
-        Property { name: "path"; type: "QDeclarative1Path"; isPointer: true }
+        Property { name: "path"; type: "QDeclarativePath"; isPointer: true }
         Property { name: "currentIndex"; type: "int" }
         Property { name: "offset"; type: "qreal" }
         Property { name: "highlight"; type: "QDeclarativeComponent"; isPointer: true }
@@ -1142,7 +1803,25 @@ Module {
         Property { name: "count"; type: "int"; isReadonly: true }
         Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
         Property { name: "pathItemCount"; type: "int" }
+        Signal { name: "currentIndexChanged" }
+        Signal { name: "offsetChanged" }
+        Signal { name: "modelChanged" }
+        Signal { name: "countChanged" }
+        Signal { name: "pathChanged" }
+        Signal { name: "preferredHighlightBeginChanged" }
+        Signal { name: "preferredHighlightEndChanged" }
+        Signal { name: "highlightRangeModeChanged" }
+        Signal { name: "dragMarginChanged" }
         Signal { name: "snapPositionChanged" }
+        Signal { name: "delegateChanged" }
+        Signal { name: "pathItemCountChanged" }
+        Signal { name: "flickDecelerationChanged" }
+        Signal { name: "interactiveChanged" }
+        Signal { name: "movingChanged" }
+        Signal { name: "flickingChanged" }
+        Signal { name: "highlightChanged" }
+        Signal { name: "highlightItemChanged" }
+        Signal { name: "highlightMoveDurationChanged" }
         Signal { name: "movementStarted" }
         Signal { name: "movementEnded" }
         Signal { name: "flickStarted" }
@@ -1151,18 +1830,23 @@ Module {
         Method { name: "decrementCurrentIndex" }
     }
     Component {
-        name: "QDeclarative1PathViewAttached"
+        name: "QDeclarativePathViewAttached"
         prototype: "QObject"
-        Property { name: "view"; type: "QDeclarative1PathView"; isReadonly: true; isPointer: true }
+        Property { name: "view"; type: "QDeclarativePathView"; isReadonly: true; isPointer: true }
         Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
         Property { name: "onPath"; type: "bool"; isReadonly: true }
         Signal { name: "currentItemChanged" }
         Signal { name: "pathChanged" }
     }
     Component {
-        name: "QDeclarative1PauseAnimation"
-        prototype: "QDeclarative1AbstractAnimation"
-        exports: ["QtQuick/PauseAnimation 1.0"]
+        name: "QDeclarativePauseAnimation"
+        prototype: "QDeclarativeAbstractAnimation"
+        exports: [
+            "QtQuick/PauseAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "duration"; type: "int" }
         Signal {
             name: "durationChanged"
@@ -1170,16 +1854,21 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1Pen"
+        name: "QDeclarativePen"
         prototype: "QObject"
         Property { name: "width"; type: "int" }
         Property { name: "color"; type: "QColor" }
         Signal { name: "penChanged" }
     }
     Component {
-        name: "QDeclarative1Pinch"
+        name: "QDeclarativePinch"
         prototype: "QObject"
-        exports: ["QtQuick/Pinch 1.1"]
+        exports: [
+            "QtQuick/Pinch 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Axis"
             values: {
@@ -1200,31 +1889,53 @@ Module {
         Property { name: "minimumY"; type: "qreal" }
         Property { name: "maximumY"; type: "qreal" }
         Property { name: "active"; type: "bool"; isReadonly: true }
-    }
-    Component {
-        name: "QDeclarative1PinchArea"
+        Signal { name: "targetChanged" }
+        Signal { name: "minimumScaleChanged" }
+        Signal { name: "maximumScaleChanged" }
+        Signal { name: "minimumRotationChanged" }
+        Signal { name: "maximumRotationChanged" }
+        Signal { name: "dragAxisChanged" }
+        Signal { name: "minimumXChanged" }
+        Signal { name: "maximumXChanged" }
+        Signal { name: "minimumYChanged" }
+        Signal { name: "maximumYChanged" }
+        Signal { name: "activeChanged" }
+    }
+    Component {
+        name: "QDeclarativePinchArea"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/PinchArea 1.1"]
+        exports: [
+            "QtQuick/PinchArea 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "enabled"; type: "bool" }
-        Property { name: "pinch"; type: "QDeclarative1Pinch"; isReadonly: true; isPointer: true }
+        Property { name: "pinch"; type: "QDeclarativePinch"; isReadonly: true; isPointer: true }
+        Signal { name: "enabledChanged" }
         Signal {
             name: "pinchStarted"
-            Parameter { name: "pinch"; type: "QDeclarative1PinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QDeclarativePinchEvent"; isPointer: true }
         }
         Signal {
             name: "pinchUpdated"
-            Parameter { name: "pinch"; type: "QDeclarative1PinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QDeclarativePinchEvent"; isPointer: true }
         }
         Signal {
             name: "pinchFinished"
-            Parameter { name: "pinch"; type: "QDeclarative1PinchEvent"; isPointer: true }
+            Parameter { name: "pinch"; type: "QDeclarativePinchEvent"; isPointer: true }
         }
     }
     Component {
-        name: "QDeclarative1PropertyAction"
-        prototype: "QDeclarative1AbstractAnimation"
-        exports: ["QtQuick/PropertyAction 1.0"]
+        name: "QDeclarativePropertyAction"
+        prototype: "QDeclarativeAbstractAnimation"
+        exports: [
+            "QtQuick/PropertyAction 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "property"; type: "string" }
         Property { name: "properties"; type: "string" }
@@ -1239,11 +1950,18 @@ Module {
             name: "propertiesChanged"
             Parameter { type: "string" }
         }
+        Signal { name: "targetChanged" }
+        Signal { name: "propertyChanged" }
     }
     Component {
-        name: "QDeclarative1PropertyAnimation"
-        prototype: "QDeclarative1AbstractAnimation"
-        exports: ["QtQuick/PropertyAnimation 1.0"]
+        name: "QDeclarativePropertyAnimation"
+        prototype: "QDeclarativeAbstractAnimation"
+        exports: [
+            "QtQuick/PropertyAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "duration"; type: "int" }
         Property { name: "from"; type: "QVariant" }
         Property { name: "to"; type: "QVariant" }
@@ -1273,34 +1991,57 @@ Module {
             name: "propertiesChanged"
             Parameter { type: "string" }
         }
+        Signal { name: "targetChanged" }
+        Signal { name: "propertyChanged" }
     }
     Component {
-        name: "QDeclarative1PropertyChanges"
-        prototype: "QDeclarative1StateOperation"
-        exports: ["QtQuick/PropertyChanges 1.0"]
+        name: "QDeclarativePropertyChanges"
+        prototype: "QDeclarativeStateOperation"
+        exports: [
+            "QtQuick/PropertyChanges 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "target"; type: "QObject"; isPointer: true }
         Property { name: "restoreEntryValues"; type: "bool" }
         Property { name: "explicit"; type: "bool" }
     }
     Component {
-        name: "QDeclarative1Rectangle"
+        name: "QDeclarativeRectangle"
         defaultProperty: "data"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/Rectangle 1.0"]
+        exports: [
+            "QtQuick/Rectangle 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "color"; type: "QColor" }
-        Property { name: "gradient"; type: "QDeclarative1Gradient"; isPointer: true }
-        Property { name: "border"; type: "QDeclarative1Pen"; isReadonly: true; isPointer: true }
+        Property { name: "gradient"; type: "QDeclarativeGradient"; isPointer: true }
+        Property { name: "border"; type: "QDeclarativePen"; isReadonly: true; isPointer: true }
         Property { name: "radius"; type: "qreal" }
+        Signal { name: "colorChanged" }
+        Signal { name: "radiusChanged" }
     }
     Component {
-        name: "QDeclarative1Repeater"
+        name: "QDeclarativeRepeater"
         defaultProperty: "delegate"
         prototype: "QDeclarativeItem"
-        exports: ["QtQuick/Repeater 1.0", "QtQuick/Repeater 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        exports: [
+            "QtQuick/Repeater 1.0",
+            "QtQuick/Repeater 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
         Property { name: "count"; type: "int"; isReadonly: true }
+        Signal { name: "modelChanged" }
+        Signal { name: "delegateChanged" }
+        Signal { name: "countChanged" }
         Signal {
             name: "itemAdded"
             revision: 1
@@ -1321,9 +2062,14 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1RotationAnimation"
-        prototype: "QDeclarative1PropertyAnimation"
-        exports: ["QtQuick/RotationAnimation 1.0"]
+        name: "QDeclarativeRotationAnimation"
+        prototype: "QDeclarativePropertyAnimation"
+        exports: [
+            "QtQuick/RotationAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "RotationDirection"
             values: {
@@ -1336,25 +2082,25 @@ Module {
         Property { name: "from"; type: "qreal" }
         Property { name: "to"; type: "qreal" }
         Property { name: "direction"; type: "RotationDirection" }
+        Signal { name: "directionChanged" }
     }
     Component {
-        name: "QDeclarative1Row"
+        name: "QDeclarativeRow"
         defaultProperty: "data"
-        prototype: "QDeclarative1BasePositioner"
-        exports: ["QtQuick/Row 1.0", "QtQuick/Row 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeBasePositioner"
+        exports: [
+            "QtQuick/Row 1.0",
+            "QtQuick/Row 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Property { name: "layoutDirection"; revision: 1; type: "Qt::LayoutDirection" }
-        Property {
-            name: "effectiveLayoutDirection"
-            revision: 1
-            type: "Qt::LayoutDirection"
-            isReadonly: true
-        }
         Signal { name: "layoutDirectionChanged"; revision: 1 }
-        Signal { name: "effectiveLayoutDirectionChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1ScaleGrid"
+        name: "QDeclarativeScaleGrid"
         prototype: "QObject"
         Property { name: "left"; type: "int" }
         Property { name: "top"; type: "int" }
@@ -1363,22 +2109,37 @@ Module {
         Signal { name: "borderChanged" }
     }
     Component {
-        name: "QDeclarative1ScriptAction"
-        prototype: "QDeclarative1AbstractAnimation"
-        exports: ["QtQuick/ScriptAction 1.0"]
+        name: "QDeclarativeScriptAction"
+        prototype: "QDeclarativeAbstractAnimation"
+        exports: [
+            "QtQuick/ScriptAction 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "script"; type: "QDeclarativeScriptString" }
         Property { name: "scriptName"; type: "string" }
     }
     Component {
-        name: "QDeclarative1SequentialAnimation"
+        name: "QDeclarativeSequentialAnimation"
         defaultProperty: "animations"
-        prototype: "QDeclarative1AnimationGroup"
-        exports: ["QtQuick/SequentialAnimation 1.0"]
+        prototype: "QDeclarativeAnimationGroup"
+        exports: [
+            "QtQuick/SequentialAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
     }
     Component {
-        name: "QDeclarative1SmoothedAnimation"
-        prototype: "QDeclarative1NumberAnimation"
-        exports: ["QtQuick/SmoothedAnimation 1.0"]
+        name: "QDeclarativeSmoothedAnimation"
+        prototype: "QDeclarativeNumberAnimation"
+        exports: [
+            "QtQuick/SmoothedAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "ReversingMode"
             values: {
@@ -1390,54 +2151,84 @@ Module {
         Property { name: "velocity"; type: "qreal" }
         Property { name: "reversingMode"; type: "ReversingMode" }
         Property { name: "maximumEasingTime"; type: "qreal" }
+        Signal { name: "velocityChanged" }
+        Signal { name: "reversingModeChanged" }
+        Signal { name: "maximumEasingTimeChanged" }
     }
     Component {
-        name: "QDeclarative1SpringAnimation"
-        prototype: "QDeclarative1NumberAnimation"
-        exports: ["QtQuick/SpringAnimation 1.0"]
+        name: "QDeclarativeSpringAnimation"
+        prototype: "QDeclarativeNumberAnimation"
+        exports: [
+            "QtQuick/SpringAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "velocity"; type: "qreal" }
         Property { name: "spring"; type: "qreal" }
         Property { name: "damping"; type: "qreal" }
         Property { name: "epsilon"; type: "qreal" }
         Property { name: "modulus"; type: "qreal" }
         Property { name: "mass"; type: "qreal" }
+        Signal { name: "modulusChanged" }
+        Signal { name: "massChanged" }
         Signal { name: "syncChanged" }
     }
     Component {
-        name: "QDeclarative1State"
+        name: "QDeclarativeState"
         defaultProperty: "changes"
         prototype: "QObject"
-        exports: ["QtQuick/State 1.0"]
+        exports: [
+            "QtQuick/State 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "name"; type: "string" }
         Property { name: "when"; type: "QDeclarativeBinding"; isPointer: true }
         Property { name: "extend"; type: "string" }
-        Property { name: "changes"; type: "QDeclarative1StateOperation"; isList: true; isReadonly: true }
+        Property { name: "changes"; type: "QDeclarativeStateOperation"; isList: true; isReadonly: true }
         Signal { name: "completed" }
     }
     Component {
-        name: "QDeclarative1StateChangeScript"
-        prototype: "QDeclarative1StateOperation"
-        exports: ["QtQuick/StateChangeScript 1.0"]
+        name: "QDeclarativeStateChangeScript"
+        prototype: "QDeclarativeStateOperation"
+        exports: [
+            "QtQuick/StateChangeScript 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "script"; type: "QDeclarativeScriptString" }
         Property { name: "name"; type: "string" }
     }
     Component {
-        name: "QDeclarative1StateGroup"
+        name: "QDeclarativeStateGroup"
         prototype: "QObject"
-        exports: ["QtQuick/StateGroup 1.0"]
+        exports: [
+            "QtQuick/StateGroup 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "state"; type: "string" }
-        Property { name: "states"; type: "QDeclarative1State"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QDeclarative1Transition"; isList: true; isReadonly: true }
+        Property { name: "states"; type: "QDeclarativeState"; isList: true; isReadonly: true }
+        Property { name: "transitions"; type: "QDeclarativeTransition"; isList: true; isReadonly: true }
         Signal {
             name: "stateChanged"
             Parameter { type: "string" }
         }
     }
-    Component { name: "QDeclarative1StateOperation"; prototype: "QObject" }
+    Component { name: "QDeclarativeStateOperation"; prototype: "QObject" }
     Component {
-        name: "QDeclarative1SystemPalette"
+        name: "QDeclarativeSystemPalette"
         prototype: "QObject"
-        exports: ["QtQuick/SystemPalette 1.0"]
+        exports: [
+            "QtQuick/SystemPalette 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "ColorGroup"
             values: {
@@ -1446,7 +2237,7 @@ Module {
                 "Disabled": 1
             }
         }
-        Property { name: "colorGroup"; type: "QDeclarative1SystemPalette::ColorGroup" }
+        Property { name: "colorGroup"; type: "QDeclarativeSystemPalette::ColorGroup" }
         Property { name: "window"; type: "QColor"; isReadonly: true }
         Property { name: "windowText"; type: "QColor"; isReadonly: true }
         Property { name: "base"; type: "QColor"; isReadonly: true }
@@ -1464,11 +2255,17 @@ Module {
         Signal { name: "paletteChanged" }
     }
     Component {
-        name: "QDeclarative1Text"
+        name: "QDeclarativeText"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizeItem"
-        exports: ["QtQuick/Text 1.0", "QtQuick/Text 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeImplicitSizeItem"
+        exports: [
+            "QtQuick/Text 1.0",
+            "QtQuick/Text 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "HAlignment"
             values: {
@@ -1536,12 +2333,6 @@ Module {
         Property { name: "style"; type: "TextStyle" }
         Property { name: "styleColor"; type: "QColor" }
         Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property {
-            name: "effectiveHorizontalAlignment"
-            revision: 1
-            type: "HAlignment"
-            isReadonly: true
-        }
         Property { name: "verticalAlignment"; type: "VAlignment" }
         Property { name: "wrapMode"; type: "WrapMode" }
         Property { name: "lineCount"; revision: 1; type: "int"; isReadonly: true }
@@ -1585,6 +2376,7 @@ Module {
             name: "verticalAlignmentChanged"
             Parameter { name: "alignment"; type: "VAlignment" }
         }
+        Signal { name: "wrapModeChanged" }
         Signal { name: "lineCountChanged"; revision: 1 }
         Signal { name: "truncatedChanged"; revision: 1 }
         Signal { name: "maximumLineCountChanged"; revision: 1 }
@@ -1607,14 +2399,19 @@ Module {
             revision: 1
             Parameter { name: "mode"; type: "LineHeightMode" }
         }
-        Signal { name: "effectiveHorizontalAlignmentChanged"; revision: 1 }
     }
     Component {
-        name: "QDeclarative1TextEdit"
+        name: "QDeclarativeTextEdit"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizePaintedItem"
-        exports: ["QtQuick/TextEdit 1.0", "QtQuick/TextEdit 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeImplicitSizePaintedItem"
+        exports: [
+            "QtQuick/TextEdit 1.0",
+            "QtQuick/TextEdit 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "HAlignment"
             values: {
@@ -1663,12 +2460,6 @@ Module {
         Property { name: "selectedTextColor"; type: "QColor" }
         Property { name: "font"; type: "QFont" }
         Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property {
-            name: "effectiveHorizontalAlignment"
-            revision: 1
-            type: "HAlignment"
-            isReadonly: true
-        }
         Property { name: "verticalAlignment"; type: "VAlignment" }
         Property { name: "wrapMode"; type: "WrapMode" }
         Property { name: "lineCount"; revision: 1; type: "int"; isReadonly: true }
@@ -1696,6 +2487,10 @@ Module {
             Parameter { type: "string" }
         }
         Signal { name: "paintedSizeChanged" }
+        Signal { name: "cursorPositionChanged" }
+        Signal { name: "cursorRectangleChanged" }
+        Signal { name: "selectionStartChanged" }
+        Signal { name: "selectionEndChanged" }
         Signal { name: "selectionChanged" }
         Signal {
             name: "colorChanged"
@@ -1721,6 +2516,8 @@ Module {
             name: "verticalAlignmentChanged"
             Parameter { name: "alignment"; type: "VAlignment" }
         }
+        Signal { name: "wrapModeChanged" }
+        Signal { name: "lineCountChanged" }
         Signal {
             name: "textFormatChanged"
             Parameter { name: "textFormat"; type: "TextFormat" }
@@ -1733,6 +2530,7 @@ Module {
             name: "cursorVisibleChanged"
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
+        Signal { name: "cursorDelegateChanged" }
         Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPressed"; type: "bool" }
@@ -1761,7 +2559,6 @@ Module {
         }
         Signal { name: "canPasteChanged"; revision: 1 }
         Signal { name: "inputMethodComposingChanged"; revision: 1 }
-        Signal { name: "effectiveHorizontalAlignmentChanged"; revision: 1 }
         Method { name: "selectAll" }
         Method { name: "selectWord" }
         Method {
@@ -1805,11 +2602,17 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1TextInput"
+        name: "QDeclarativeTextInput"
         defaultProperty: "data"
-        prototype: "QDeclarative1ImplicitSizePaintedItem"
-        exports: ["QtQuick/TextInput 1.0", "QtQuick/TextInput 1.1"]
-        exportMetaObjectRevisions: [0, 1]
+        prototype: "QDeclarativeImplicitSizePaintedItem"
+        exports: [
+            "QtQuick/TextInput 1.0",
+            "QtQuick/TextInput 1.1"
+        ]
+        exportMetaObjectRevisions: [
+            0,
+            1
+        ]
         Enum {
             name: "EchoMode"
             values: {
@@ -1840,12 +2643,6 @@ Module {
         Property { name: "selectedTextColor"; type: "QColor" }
         Property { name: "font"; type: "QFont" }
         Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property {
-            name: "effectiveHorizontalAlignment"
-            revision: 1
-            type: "HAlignment"
-            isReadonly: true
-        }
         Property { name: "readOnly"; type: "bool" }
         Property { name: "cursorVisible"; type: "bool" }
         Property { name: "cursorPosition"; type: "int" }
@@ -1868,7 +2665,14 @@ Module {
         Property { name: "mouseSelectionMode"; revision: 1; type: "SelectionMode" }
         Property { name: "canPaste"; revision: 1; type: "bool"; isReadonly: true }
         Property { name: "inputMethodComposing"; revision: 1; type: "bool"; isReadonly: true }
+        Signal { name: "textChanged" }
+        Signal { name: "cursorPositionChanged" }
+        Signal { name: "cursorRectangleChanged" }
+        Signal { name: "selectionStartChanged" }
+        Signal { name: "selectionEndChanged" }
+        Signal { name: "selectedTextChanged" }
         Signal { name: "accepted" }
+        Signal { name: "acceptableInputChanged" }
         Signal {
             name: "colorChanged"
             Parameter { name: "color"; type: "QColor" }
@@ -1897,10 +2701,12 @@ Module {
             name: "cursorVisibleChanged"
             Parameter { name: "isCursorVisible"; type: "bool" }
         }
+        Signal { name: "cursorDelegateChanged" }
         Signal {
             name: "maximumLengthChanged"
             Parameter { name: "maximumLength"; type: "int" }
         }
+        Signal { name: "validatorChanged" }
         Signal {
             name: "inputMaskChanged"
             Parameter { name: "inputMask"; type: "string" }
@@ -1909,6 +2715,8 @@ Module {
             name: "echoModeChanged"
             Parameter { name: "echoMode"; type: "EchoMode" }
         }
+        Signal { name: "passwordCharacterChanged" }
+        Signal { name: "displayTextChanged" }
         Signal {
             name: "activeFocusOnPressChanged"
             Parameter { name: "activeFocusOnPress"; type: "bool" }
@@ -1928,7 +2736,6 @@ Module {
         }
         Signal { name: "canPasteChanged"; revision: 1 }
         Signal { name: "inputMethodComposingChanged"; revision: 1 }
-        Signal { name: "effectiveHorizontalAlignmentChanged"; revision: 1 }
         Method { name: "selectAll" }
         Method { name: "selectWord" }
         Method {
@@ -1978,52 +2785,87 @@ Module {
         Method { name: "closeSoftwareInputPanel" }
     }
     Component {
-        name: "QDeclarative1Timer"
+        name: "QDeclarativeTimer"
         prototype: "QObject"
-        exports: ["QtQuick/Timer 1.0"]
+        exports: [
+            "QtQuick/Timer 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "interval"; type: "int" }
         Property { name: "running"; type: "bool" }
         Property { name: "repeat"; type: "bool" }
         Property { name: "triggeredOnStart"; type: "bool" }
         Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
         Signal { name: "triggered" }
+        Signal { name: "runningChanged" }
+        Signal { name: "intervalChanged" }
+        Signal { name: "repeatChanged" }
+        Signal { name: "triggeredOnStartChanged" }
         Method { name: "start" }
         Method { name: "stop" }
         Method { name: "restart" }
     }
     Component {
-        name: "QDeclarative1Transition"
+        name: "QDeclarativeTransition"
         defaultProperty: "animations"
         prototype: "QObject"
-        exports: ["QtQuick/Transition 1.0"]
+        exports: [
+            "QtQuick/Transition 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "from"; type: "string" }
         Property { name: "to"; type: "string" }
         Property { name: "reversible"; type: "bool" }
         Property {
             name: "animations"
-            type: "QDeclarative1AbstractAnimation"
+            type: "QDeclarativeAbstractAnimation"
             isList: true
             isReadonly: true
         }
+        Signal { name: "fromChanged" }
+        Signal { name: "toChanged" }
+        Signal { name: "reversibleChanged" }
     }
     Component {
-        name: "QDeclarative1Translate"
+        name: "QDeclarativeTranslate"
         prototype: "QGraphicsTransform"
-        exports: ["QtQuick/Translate 1.0"]
+        exports: [
+            "QtQuick/Translate 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "x"; type: "qreal" }
         Property { name: "y"; type: "qreal" }
+        Signal { name: "xChanged" }
+        Signal { name: "yChanged" }
     }
+    Component { name: "QDeclarativeValueType"; prototype: "QObject" }
     Component {
-        name: "QDeclarative1Vector3dAnimation"
-        prototype: "QDeclarative1PropertyAnimation"
-        exports: ["QtQuick/Vector3dAnimation 1.0"]
+        name: "QDeclarativeVector3dAnimation"
+        prototype: "QDeclarativePropertyAnimation"
+        exports: [
+            "QtQuick/Vector3dAnimation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "from"; type: "QVector3D" }
         Property { name: "to"; type: "QVector3D" }
     }
     Component {
-        name: "QDeclarative1ViewSection"
+        name: "QDeclarativeViewSection"
         prototype: "QObject"
-        exports: ["QtQuick/ViewSection 1.0"]
+        exports: [
+            "QtQuick/ViewSection 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "SectionCriteria"
             values: {
@@ -2034,12 +2876,20 @@ Module {
         Property { name: "property"; type: "string" }
         Property { name: "criteria"; type: "SectionCriteria" }
         Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
+        Signal { name: "propertyChanged" }
+        Signal { name: "criteriaChanged" }
+        Signal { name: "delegateChanged" }
     }
     Component {
-        name: "QDeclarative1VisualDataModel"
+        name: "QDeclarativeVisualDataModel"
         defaultProperty: "delegate"
-        prototype: "QDeclarative1VisualModel"
-        exports: ["QtQuick/VisualDataModel 1.0"]
+        prototype: "QDeclarativeVisualModel"
+        exports: [
+            "QtQuick/VisualDataModel 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "model"; type: "QVariant" }
         Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
         Property { name: "part"; type: "string" }
@@ -2048,12 +2898,13 @@ Module {
         Signal {
             name: "createdPackage"
             Parameter { name: "index"; type: "int" }
-            Parameter { name: "package"; type: "QDeclarative1Package"; isPointer: true }
+            Parameter { name: "package"; type: "QDeclarativePackage"; isPointer: true }
         }
         Signal {
             name: "destroyingPackage"
-            Parameter { name: "package"; type: "QDeclarative1Package"; isPointer: true }
+            Parameter { name: "package"; type: "QDeclarativePackage"; isPointer: true }
         }
+        Signal { name: "rootIndexChanged" }
         Method {
             name: "modelIndex"
             type: "QVariant"
@@ -2061,24 +2912,32 @@ Module {
         }
         Method { name: "parentModelIndex"; type: "QVariant" }
     }
-    Component { name: "QDeclarative1VisualDataModelParts"; prototype: "QObject" }
+    Component { name: "QDeclarativeVisualDataModelParts"; prototype: "QObject" }
     Component {
-        name: "QDeclarative1VisualItemModel"
+        name: "QDeclarativeVisualItemModel"
         defaultProperty: "children"
-        prototype: "QDeclarative1VisualModel"
-        exports: ["QtQuick/VisualItemModel 1.0"]
-        attachedType: "QDeclarative1VisualItemModelAttached"
+        prototype: "QDeclarativeVisualModel"
+        exports: [
+            "QtQuick/VisualItemModel 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        attachedType: "QDeclarativeVisualItemModelAttached"
         Property { name: "children"; type: "QDeclarativeItem"; isList: true; isReadonly: true }
+        Signal { name: "childrenChanged" }
     }
     Component {
-        name: "QDeclarative1VisualItemModelAttached"
+        name: "QDeclarativeVisualItemModelAttached"
         prototype: "QObject"
         Property { name: "index"; type: "int"; isReadonly: true }
+        Signal { name: "indexChanged" }
     }
     Component {
-        name: "QDeclarative1VisualModel"
+        name: "QDeclarativeVisualModel"
         prototype: "QObject"
         Property { name: "count"; type: "int"; isReadonly: true }
+        Signal { name: "countChanged" }
         Signal {
             name: "itemsInserted"
             Parameter { name: "index"; type: "int" }
@@ -2112,10 +2971,35 @@ Module {
         }
     }
     Component {
-        name: "QDeclarative1XmlListModel"
+        name: "QDeclarativeWorkerScript"
+        prototype: "QObject"
+        exports: [
+            "QtQuick/WorkerScript 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
+        Property { name: "source"; type: "QUrl" }
+        Signal { name: "sourceChanged" }
+        Signal {
+            name: "message"
+            Parameter { name: "messageObject"; type: "QScriptValue" }
+        }
+        Method {
+            name: "sendMessage"
+            Parameter { type: "QScriptValue" }
+        }
+    }
+    Component {
+        name: "QDeclarativeXmlListModel"
         defaultProperty: "roles"
         prototype: "QListModelInterface"
-        exports: ["QtQuick/XmlListModel 1.0"]
+        exports: [
+            "QtQuick/XmlListModel 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Enum {
             name: "Status"
             values: {
@@ -2131,842 +3015,53 @@ Module {
         Property { name: "xml"; type: "string" }
         Property { name: "query"; type: "string" }
         Property { name: "namespaceDeclarations"; type: "string" }
-        Property { name: "roles"; type: "QDeclarative1XmlListModelRole"; isList: true; isReadonly: true }
+        Property { name: "roles"; type: "QDeclarativeXmlListModelRole"; isList: true; isReadonly: true }
         Property { name: "count"; type: "int"; isReadonly: true }
         Signal {
             name: "statusChanged"
-            Parameter { type: "QDeclarative1XmlListModel::Status" }
+            Parameter { type: "QDeclarativeXmlListModel::Status" }
         }
         Signal {
             name: "progressChanged"
             Parameter { name: "progress"; type: "qreal" }
         }
+        Signal { name: "countChanged" }
+        Signal { name: "sourceChanged" }
+        Signal { name: "xmlChanged" }
+        Signal { name: "queryChanged" }
+        Signal { name: "namespaceDeclarationsChanged" }
         Method { name: "reload" }
         Method {
             name: "get"
-            type: "QDeclarativeV8Handle"
+            type: "QScriptValue"
             Parameter { name: "index"; type: "int" }
         }
         Method { name: "errorString"; type: "string" }
     }
     Component {
-        name: "QDeclarative1XmlListModelRole"
-        prototype: "QObject"
-        exports: ["QtQuick/XmlRole 1.0"]
-        Property { name: "name"; type: "string" }
-        Property { name: "query"; type: "string" }
-        Property { name: "isKey"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativeAbstractAnimation"
-        prototype: "QObject"
-        exports: ["QtQuick/Animation 2.0"]
-        Enum {
-            name: "Loops"
-            values: {
-                "Infinite": -2
-            }
-        }
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Property { name: "alwaysRunToEnd"; type: "bool" }
-        Property { name: "loops"; type: "int" }
-        Signal { name: "started" }
-        Signal { name: "completed" }
-        Signal {
-            name: "runningChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "pausedChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "alwaysRunToEndChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "loopCountChanged"
-            Parameter { type: "int" }
-        }
-        Method { name: "restart" }
-        Method { name: "start" }
-        Method { name: "pause" }
-        Method { name: "resume" }
-        Method { name: "stop" }
-        Method { name: "complete" }
-    }
-    Component {
-        name: "QDeclarativeAnimationGroup"
-        defaultProperty: "animations"
-        prototype: "QDeclarativeAbstractAnimation"
-        Property {
-            name: "animations"
-            type: "QDeclarativeAbstractAnimation"
-            isList: true
-            isReadonly: true
-        }
-    }
-    Component {
-        name: "QDeclarativeApplication"
-        prototype: "QObject"
-        exports: ["QtQuick/Application 2.0"]
-        Property { name: "active"; type: "bool"; isReadonly: true }
-        Property { name: "layoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
-        Property { name: "inputPanel"; type: "QObject"; isReadonly: true; isPointer: true }
-    }
-    Component {
-        name: "QDeclarativeBehavior"
-        defaultProperty: "animation"
-        prototype: "QObject"
-        exports: ["QtQuick/Behavior 2.0"]
-        Property { name: "animation"; type: "QDeclarativeAbstractAnimation"; isPointer: true }
-        Property { name: "enabled"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativeBind"
-        prototype: "QObject"
-        exports: ["QtQuick/Binding 2.0"]
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "property"; type: "string" }
-        Property { name: "value"; type: "QVariant" }
-        Property { name: "when"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativeColorAnimation"
-        prototype: "QDeclarativePropertyAnimation"
-        exports: ["QtQuick/ColorAnimation 2.0"]
-        Property { name: "from"; type: "QColor" }
-        Property { name: "to"; type: "QColor" }
-    }
-    Component {
-        name: "QDeclarativeComponent"
+        name: "QDeclarativeXmlListModelRole"
         prototype: "QObject"
         exports: [
-            "QML/Component 1.0",
-            "QtQuick/Component 1.0",
-            "QtQuick/Component 2.0"
+            "QtQuick/XmlRole 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
         ]
-        attachedType: "QDeclarativeComponentAttached"
-        Enum {
-            name: "Status"
-            values: {
-                "Null": 0,
-                "Ready": 1,
-                "Loading": 2,
-                "Error": 3
-            }
-        }
-        Property { name: "progress"; type: "qreal"; isReadonly: true }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "url"; type: "QUrl"; isReadonly: true }
-        Signal {
-            name: "statusChanged"
-            Parameter { type: "QDeclarativeComponent::Status" }
-        }
-        Signal {
-            name: "progressChanged"
-            Parameter { type: "qreal" }
-        }
-        Method {
-            name: "loadUrl"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "setData"
-            Parameter { type: "QByteArray" }
-            Parameter { name: "baseUrl"; type: "QUrl" }
-        }
-        Method { name: "errorString"; type: "string" }
-    }
-    Component {
-        name: "QDeclarativeComponentAttached"
-        prototype: "QObject"
-        Signal { name: "completed" }
-        Signal { name: "destruction" }
-    }
-    Component {
-        name: "QDeclarativeConnections"
-        prototype: "QObject"
-        exports: ["QtQuick/Connections 2.0"]
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "ignoreUnknownSignals"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativeCurve"
-        prototype: "QDeclarativePathElement"
-        Property { name: "x"; type: "qreal" }
-        Property { name: "y"; type: "qreal" }
-        Property { name: "relativeX"; type: "qreal" }
-        Property { name: "relativeY"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativeEasingValueType"
-        prototype: "QDeclarativeValueType"
-        exports: ["QtQuick/Easing 1.0", "QtQuick/Easing 2.0"]
-        Enum {
-            name: "Type"
-            values: {
-                "Linear": 0,
-                "InQuad": 1,
-                "OutQuad": 2,
-                "InOutQuad": 3,
-                "OutInQuad": 4,
-                "InCubic": 5,
-                "OutCubic": 6,
-                "InOutCubic": 7,
-                "OutInCubic": 8,
-                "InQuart": 9,
-                "OutQuart": 10,
-                "InOutQuart": 11,
-                "OutInQuart": 12,
-                "InQuint": 13,
-                "OutQuint": 14,
-                "InOutQuint": 15,
-                "OutInQuint": 16,
-                "InSine": 17,
-                "OutSine": 18,
-                "InOutSine": 19,
-                "OutInSine": 20,
-                "InExpo": 21,
-                "OutExpo": 22,
-                "InOutExpo": 23,
-                "OutInExpo": 24,
-                "InCirc": 25,
-                "OutCirc": 26,
-                "InOutCirc": 27,
-                "OutInCirc": 28,
-                "InElastic": 29,
-                "OutElastic": 30,
-                "InOutElastic": 31,
-                "OutInElastic": 32,
-                "InBack": 33,
-                "OutBack": 34,
-                "InOutBack": 35,
-                "OutInBack": 36,
-                "InBounce": 37,
-                "OutBounce": 38,
-                "InOutBounce": 39,
-                "OutInBounce": 40,
-                "InCurve": 41,
-                "OutCurve": 42,
-                "SineCurve": 43,
-                "CosineCurve": 44,
-                "Bezier": 45
-            }
-        }
-        Property { name: "type"; type: "Type" }
-        Property { name: "amplitude"; type: "qreal" }
-        Property { name: "overshoot"; type: "qreal" }
-        Property { name: "period"; type: "qreal" }
-        Property { name: "bezierCurve"; type: "QVariantList" }
-    }
-    Component {
-        name: "QDeclarativeFontLoader"
-        prototype: "QObject"
-        exports: ["QtQuick/FontLoader 2.0"]
-        Enum {
-            name: "Status"
-            values: {
-                "Null": 0,
-                "Ready": 1,
-                "Loading": 2,
-                "Error": 3
-            }
-        }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "name"; type: "string" }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-    }
-    Component {
-        name: "QDeclarativeFontValueType"
-        prototype: "QDeclarativeValueType"
-        exports: ["QtQuick/Font 1.0", "QtQuick/Font 2.0"]
-        Enum {
-            name: "FontWeight"
-            values: {
-                "Light": 25,
-                "Normal": 50,
-                "DemiBold": 63,
-                "Bold": 75,
-                "Black": 87
-            }
-        }
-        Enum {
-            name: "Capitalization"
-            values: {
-                "MixedCase": 0,
-                "AllUppercase": 1,
-                "AllLowercase": 2,
-                "SmallCaps": 3,
-                "Capitalize": 4
-            }
-        }
-        Property { name: "family"; type: "string" }
-        Property { name: "bold"; type: "bool" }
-        Property { name: "weight"; type: "FontWeight" }
-        Property { name: "italic"; type: "bool" }
-        Property { name: "underline"; type: "bool" }
-        Property { name: "overline"; type: "bool" }
-        Property { name: "strikeout"; type: "bool" }
-        Property { name: "pointSize"; type: "qreal" }
-        Property { name: "pixelSize"; type: "int" }
-        Property { name: "capitalization"; type: "Capitalization" }
-        Property { name: "letterSpacing"; type: "qreal" }
-        Property { name: "wordSpacing"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativeItem"
-        defaultProperty: "data"
-        prototype: "QGraphicsObject"
-        exports: ["QtQuick/Item 1.0", "QtQuick/Item 1.1"]
-        exportMetaObjectRevisions: [0, 1]
-        Enum {
-            name: "TransformOrigin"
-            values: {
-                "TopLeft": 0,
-                "Top": 1,
-                "TopRight": 2,
-                "Left": 3,
-                "Center": 4,
-                "Right": 5,
-                "BottomLeft": 6,
-                "Bottom": 7,
-                "BottomRight": 8
-            }
-        }
-        Property { name: "parent"; type: "QDeclarativeItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "states"; type: "QDeclarative1State"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QDeclarative1Transition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QDeclarative1Anchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QDeclarative1AnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "qreal" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "transform"; type: "QGraphicsTransform"; isList: true; isReadonly: true }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "implicitWidth"; revision: 1; type: "qreal" }
-        Property { name: "implicitHeight"; revision: 1; type: "qreal" }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "qreal" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QDeclarativeItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Signal { name: "implicitWidthChanged"; revision: 1 }
-        Signal { name: "implicitHeightChanged"; revision: 1 }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "childAt"
-            type: "QDeclarativeItem*"
-            Parameter { name: "x"; type: "qreal" }
-            Parameter { name: "y"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QDeclarativeListElement"
-        prototype: "QObject"
-        exports: ["QtQuick/ListElement 1.0", "QtQuick/ListElement 2.0"]
-    }
-    Component {
-        name: "QDeclarativeListModel"
-        prototype: "QListModelInterface"
-        exports: ["QtQuick/ListModel 1.0", "QtQuick/ListModel 2.0"]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "dynamicRoles"; type: "bool" }
-        Method { name: "clear" }
-        Method {
-            name: "remove"
-            Parameter { name: "args"; type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "append"
-            Parameter { name: "args"; type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "insert"
-            Parameter { name: "args"; type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "get"
-            type: "QDeclarativeV8Handle"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "set"
-            Parameter { name: "index"; type: "int" }
-            Parameter { type: "QDeclarativeV8Handle" }
-        }
-        Method {
-            name: "setProperty"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "property"; type: "string" }
-            Parameter { name: "value"; type: "QVariant" }
-        }
-        Method {
-            name: "move"
-            Parameter { name: "from"; type: "int" }
-            Parameter { name: "to"; type: "int" }
-            Parameter { name: "count"; type: "int" }
-        }
-        Method { name: "sync" }
-    }
-    Component {
-        name: "QDeclarativeLocale"
-        exports: ["QtQuick/Locale 2.0"]
-        Enum {
-            name: "MeasurementSystem"
-            values: {
-                "MetricSystem": 0,
-                "ImperialSystem": 1
-            }
-        }
-        Enum {
-            name: "FormatType"
-            values: {
-                "LongFormat": 0,
-                "ShortFormat": 1,
-                "NarrowFormat": 2
-            }
-        }
-        Enum {
-            name: "CurrencySymbolFormat"
-            values: {
-                "CurrencyIsoCode": 0,
-                "CurrencySymbol": 1,
-                "CurrencyDisplayName": 2
-            }
-        }
-        Enum {
-            name: "DayOfWeek"
-            values: {
-                "Sunday": 0,
-                "Monday": 1,
-                "Tuesday": 2,
-                "Wednesday": 3,
-                "Thursday": 4,
-                "Friday": 5,
-                "Saturday": 6
-            }
-        }
-    }
-    Component {
-        name: "QDeclarativeNumberAnimation"
-        prototype: "QDeclarativePropertyAnimation"
-        exports: ["QtQuick/NumberAnimation 2.0"]
-        Property { name: "from"; type: "qreal" }
-        Property { name: "to"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativePackage"
-        defaultProperty: "data"
-        prototype: "QObject"
-        exports: ["QtQuick/Package 2.0"]
-        attachedType: "QDeclarativePackageAttached"
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-    }
-    Component {
-        name: "QDeclarativePackageAttached"
-        prototype: "QObject"
-        Property { name: "name"; type: "string" }
-    }
-    Component {
-        name: "QDeclarativeParallelAnimation"
-        defaultProperty: "animations"
-        prototype: "QDeclarativeAnimationGroup"
-        exports: ["QtQuick/ParallelAnimation 2.0"]
-    }
-    Component {
-        name: "QDeclarativePath"
-        defaultProperty: "pathElements"
-        prototype: "QObject"
-        exports: ["QtQuick/Path 2.0"]
-        Property { name: "pathElements"; type: "QDeclarativePathElement"; isList: true; isReadonly: true }
-        Property { name: "startX"; type: "qreal" }
-        Property { name: "startY"; type: "qreal" }
-        Property { name: "closed"; type: "bool"; isReadonly: true }
-        Signal { name: "changed" }
-    }
-    Component {
-        name: "QDeclarativePathArc"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathArc 2.0"]
-        Enum {
-            name: "ArcDirection"
-            values: {
-                "Clockwise": 0,
-                "Counterclockwise": 1
-            }
-        }
-        Property { name: "radiusX"; type: "qreal" }
-        Property { name: "radiusY"; type: "qreal" }
-        Property { name: "useLargeArc"; type: "bool" }
-        Property { name: "direction"; type: "ArcDirection" }
-    }
-    Component {
-        name: "QDeclarativePathAttribute"
-        prototype: "QDeclarativePathElement"
-        exports: ["QtQuick/PathAttribute 2.0"]
-        Property { name: "name"; type: "string" }
-        Property { name: "value"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativePathCatmullRomCurve"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathCurve 2.0"]
-    }
-    Component {
-        name: "QDeclarativePathCubic"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathCubic 2.0"]
-        Property { name: "control1X"; type: "qreal" }
-        Property { name: "control1Y"; type: "qreal" }
-        Property { name: "control2X"; type: "qreal" }
-        Property { name: "control2Y"; type: "qreal" }
-        Property { name: "relativeControl1X"; type: "qreal" }
-        Property { name: "relativeControl1Y"; type: "qreal" }
-        Property { name: "relativeControl2X"; type: "qreal" }
-        Property { name: "relativeControl2Y"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativePathElement"
-        prototype: "QObject"
-        Signal { name: "changed" }
-    }
-    Component {
-        name: "QDeclarativePathInterpolator"
-        prototype: "QObject"
-        exports: ["QtQuick/PathInterpolator 2.0"]
-        Property { name: "path"; type: "QDeclarativePath"; isPointer: true }
-        Property { name: "progress"; type: "qreal" }
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "angle"; type: "qreal"; isReadonly: true }
-    }
-    Component {
-        name: "QDeclarativePathLine"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathLine 2.0"]
-    }
-    Component {
-        name: "QDeclarativePathPercent"
-        prototype: "QDeclarativePathElement"
-        exports: ["QtQuick/PathPercent 2.0"]
-        Property { name: "value"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativePathQuad"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathQuad 2.0"]
-        Property { name: "controlX"; type: "qreal" }
-        Property { name: "controlY"; type: "qreal" }
-        Property { name: "relativeControlX"; type: "qreal" }
-        Property { name: "relativeControlY"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativePathSvg"
-        prototype: "QDeclarativeCurve"
-        exports: ["QtQuick/PathSvg 2.0"]
-        Property { name: "path"; type: "string" }
-    }
-    Component {
-        name: "QDeclarativePauseAnimation"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/PauseAnimation 2.0"]
-        Property { name: "duration"; type: "int" }
-        Signal {
-            name: "durationChanged"
-            Parameter { type: "int" }
-        }
-    }
-    Component {
-        name: "QDeclarativePropertyAction"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/PropertyAction 2.0"]
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "property"; type: "string" }
-        Property { name: "properties"; type: "string" }
-        Property { name: "targets"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "exclude"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "value"; type: "QVariant" }
-        Signal {
-            name: "valueChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "propertiesChanged"
-            Parameter { type: "string" }
-        }
-    }
-    Component {
-        name: "QDeclarativePropertyAnimation"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/PropertyAnimation 2.0"]
-        Property { name: "duration"; type: "int" }
-        Property { name: "from"; type: "QVariant" }
-        Property { name: "to"; type: "QVariant" }
-        Property { name: "easing"; type: "QEasingCurve" }
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "property"; type: "string" }
-        Property { name: "properties"; type: "string" }
-        Property { name: "targets"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "exclude"; type: "QObject"; isList: true; isReadonly: true }
-        Signal {
-            name: "durationChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "fromChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "toChanged"
-            Parameter { type: "QVariant" }
-        }
-        Signal {
-            name: "easingChanged"
-            Parameter { type: "QEasingCurve" }
-        }
-        Signal {
-            name: "propertiesChanged"
-            Parameter { type: "string" }
-        }
-    }
-    Component {
-        name: "QDeclarativePropertyChanges"
-        prototype: "QDeclarativeStateOperation"
-        exports: ["QtQuick/PropertyChanges 2.0"]
-        Property { name: "target"; type: "QObject"; isPointer: true }
-        Property { name: "restoreEntryValues"; type: "bool" }
-        Property { name: "explicit"; type: "bool" }
-    }
-    Component {
-        name: "QDeclarativeRotationAnimation"
-        prototype: "QDeclarativePropertyAnimation"
-        exports: ["QtQuick/RotationAnimation 2.0"]
-        Enum {
-            name: "RotationDirection"
-            values: {
-                "Numerical": 0,
-                "Shortest": 1,
-                "Clockwise": 2,
-                "Counterclockwise": 3
-            }
-        }
-        Property { name: "from"; type: "qreal" }
-        Property { name: "to"; type: "qreal" }
-        Property { name: "direction"; type: "RotationDirection" }
-    }
-    Component {
-        name: "QDeclarativeScriptAction"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/ScriptAction 2.0"]
-        Property { name: "script"; type: "QDeclarativeScriptString" }
-        Property { name: "scriptName"; type: "string" }
-    }
-    Component {
-        name: "QDeclarativeSequentialAnimation"
-        defaultProperty: "animations"
-        prototype: "QDeclarativeAnimationGroup"
-        exports: ["QtQuick/SequentialAnimation 2.0"]
-    }
-    Component {
-        name: "QDeclarativeSmoothedAnimation"
-        prototype: "QDeclarativeNumberAnimation"
-        exports: ["QtQuick/SmoothedAnimation 2.0"]
-        Enum {
-            name: "ReversingMode"
-            values: {
-                "Eased": 0,
-                "Immediate": 1,
-                "Sync": 2
-            }
-        }
-        Property { name: "velocity"; type: "qreal" }
-        Property { name: "reversingMode"; type: "ReversingMode" }
-        Property { name: "maximumEasingTime"; type: "qreal" }
-    }
-    Component {
-        name: "QDeclarativeSpringAnimation"
-        prototype: "QDeclarativeNumberAnimation"
-        exports: ["QtQuick/SpringAnimation 2.0"]
-        Property { name: "velocity"; type: "qreal" }
-        Property { name: "spring"; type: "qreal" }
-        Property { name: "damping"; type: "qreal" }
-        Property { name: "epsilon"; type: "qreal" }
-        Property { name: "modulus"; type: "qreal" }
-        Property { name: "mass"; type: "qreal" }
-        Signal { name: "syncChanged" }
-    }
-    Component {
-        name: "QDeclarativeState"
-        defaultProperty: "changes"
-        prototype: "QObject"
-        exports: ["QtQuick/State 2.0"]
-        Property { name: "name"; type: "string" }
-        Property { name: "when"; type: "QDeclarativeBinding"; isPointer: true }
-        Property { name: "extend"; type: "string" }
-        Property { name: "changes"; type: "QDeclarativeStateOperation"; isList: true; isReadonly: true }
-        Signal { name: "completed" }
-    }
-    Component {
-        name: "QDeclarativeStateChangeScript"
-        prototype: "QDeclarativeStateOperation"
-        exports: ["QtQuick/StateChangeScript 2.0"]
-        Property { name: "script"; type: "QDeclarativeScriptString" }
         Property { name: "name"; type: "string" }
-    }
-    Component {
-        name: "QDeclarativeStateGroup"
-        prototype: "QObject"
-        exports: ["QtQuick/StateGroup 2.0"]
-        Property { name: "state"; type: "string" }
-        Property { name: "states"; type: "QDeclarativeState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QDeclarativeTransition"; isList: true; isReadonly: true }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-    }
-    Component { name: "QDeclarativeStateOperation"; prototype: "QObject" }
-    Component {
-        name: "QDeclarativeSystemPalette"
-        prototype: "QObject"
-        exports: ["QtQuick/SystemPalette 2.0"]
-        Enum {
-            name: "ColorGroup"
-            values: {
-                "Active": 0,
-                "Inactive": 2,
-                "Disabled": 1
-            }
-        }
-        Property { name: "colorGroup"; type: "QDeclarativeSystemPalette::ColorGroup" }
-        Property { name: "window"; type: "QColor"; isReadonly: true }
-        Property { name: "windowText"; type: "QColor"; isReadonly: true }
-        Property { name: "base"; type: "QColor"; isReadonly: true }
-        Property { name: "text"; type: "QColor"; isReadonly: true }
-        Property { name: "alternateBase"; type: "QColor"; isReadonly: true }
-        Property { name: "button"; type: "QColor"; isReadonly: true }
-        Property { name: "buttonText"; type: "QColor"; isReadonly: true }
-        Property { name: "light"; type: "QColor"; isReadonly: true }
-        Property { name: "midlight"; type: "QColor"; isReadonly: true }
-        Property { name: "dark"; type: "QColor"; isReadonly: true }
-        Property { name: "mid"; type: "QColor"; isReadonly: true }
-        Property { name: "shadow"; type: "QColor"; isReadonly: true }
-        Property { name: "highlight"; type: "QColor"; isReadonly: true }
-        Property { name: "highlightedText"; type: "QColor"; isReadonly: true }
-        Signal { name: "paletteChanged" }
-    }
-    Component {
-        name: "QDeclarativeTimer"
-        prototype: "QObject"
-        exports: ["QtQuick/Timer 2.0"]
-        Property { name: "interval"; type: "int" }
-        Property { name: "running"; type: "bool" }
-        Property { name: "repeat"; type: "bool" }
-        Property { name: "triggeredOnStart"; type: "bool" }
-        Property { name: "parent"; type: "QObject"; isReadonly: true; isPointer: true }
-        Signal { name: "triggered" }
-        Method { name: "start" }
-        Method { name: "stop" }
-        Method { name: "restart" }
-    }
-    Component {
-        name: "QDeclarativeTransition"
-        defaultProperty: "animations"
-        prototype: "QObject"
-        exports: ["QtQuick/Transition 2.0"]
-        Property { name: "from"; type: "string" }
-        Property { name: "to"; type: "string" }
-        Property { name: "reversible"; type: "bool" }
-        Property {
-            name: "animations"
-            type: "QDeclarativeAbstractAnimation"
-            isList: true
-            isReadonly: true
-        }
-        Property { name: "enabled"; type: "bool" }
-    }
-    Component { name: "QDeclarativeValueType"; prototype: "QObject" }
-    Component {
-        name: "QDeclarativeVector3dAnimation"
-        prototype: "QDeclarativePropertyAnimation"
-        exports: ["QtQuick/Vector3dAnimation 2.0"]
-        Property { name: "from"; type: "QVector3D" }
-        Property { name: "to"; type: "QVector3D" }
-    }
-    Component {
-        name: "QDeclarativeWorkerScript"
-        prototype: "QObject"
-        exports: ["QtQuick/WorkerScript 1.0", "QtQuick/WorkerScript 2.0"]
-        Property { name: "source"; type: "QUrl" }
-        Signal {
-            name: "message"
-            Parameter { name: "messageObject"; type: "QDeclarativeV8Handle" }
-        }
-        Method {
-            name: "sendMessage"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
+        Property { name: "query"; type: "string" }
+        Property { name: "isKey"; type: "bool" }
+        Signal { name: "nameChanged" }
+        Signal { name: "queryChanged" }
+        Signal { name: "isKeyChanged" }
     }
     Component {
         name: "QDoubleValidator"
         prototype: "QValidator"
         exports: [
-            "QtQuick/DoubleValidator 1.0",
-            "QtQuick/DoubleValidator 2.0"
+            "QtQuick/DoubleValidator 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
         ]
         Enum {
             name: "Notation"
@@ -2979,22 +3074,6 @@ Module {
         Property { name: "top"; type: "double" }
         Property { name: "decimals"; type: "int" }
         Property { name: "notation"; type: "Notation" }
-        Signal {
-            name: "bottomChanged"
-            Parameter { name: "bottom"; type: "double" }
-        }
-        Signal {
-            name: "topChanged"
-            Parameter { name: "top"; type: "double" }
-        }
-        Signal {
-            name: "decimalsChanged"
-            Parameter { name: "decimals"; type: "int" }
-        }
-        Signal {
-            name: "notationChanged"
-            Parameter { name: "notation"; type: "QDoubleValidator::Notation" }
-        }
     }
     Component {
         name: "QGraphicsObject"
@@ -3015,23 +3094,52 @@ Module {
         Property { name: "children"; type: "QGraphicsObject"; isList: true; isReadonly: true }
         Property { name: "width"; type: "qreal" }
         Property { name: "height"; type: "qreal" }
+        Signal { name: "parentChanged" }
+        Signal { name: "opacityChanged" }
+        Signal { name: "visibleChanged" }
+        Signal { name: "enabledChanged" }
+        Signal { name: "xChanged" }
+        Signal { name: "yChanged" }
+        Signal { name: "zChanged" }
+        Signal { name: "rotationChanged" }
+        Signal { name: "scaleChanged" }
+        Signal { name: "childrenChanged" }
+        Signal { name: "widthChanged" }
+        Signal { name: "heightChanged" }
     }
     Component {
         name: "QGraphicsRotation"
         prototype: "QGraphicsTransform"
-        exports: ["QtQuick/Rotation 1.0"]
+        exports: [
+            "QtQuick/Rotation 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "origin"; type: "QVector3D" }
         Property { name: "angle"; type: "qreal" }
         Property { name: "axis"; type: "QVector3D" }
+        Signal { name: "originChanged" }
+        Signal { name: "angleChanged" }
+        Signal { name: "axisChanged" }
     }
     Component {
         name: "QGraphicsScale"
         prototype: "QGraphicsTransform"
-        exports: ["QtQuick/Scale 1.0"]
+        exports: [
+            "QtQuick/Scale 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "origin"; type: "QVector3D" }
         Property { name: "xScale"; type: "qreal" }
         Property { name: "yScale"; type: "qreal" }
         Property { name: "zScale"; type: "qreal" }
+        Signal { name: "originChanged" }
+        Signal { name: "xScaleChanged" }
+        Signal { name: "yScaleChanged" }
+        Signal { name: "zScaleChanged" }
         Signal { name: "scaleChanged" }
     }
     Component { name: "QGraphicsTransform"; prototype: "QObject" }
@@ -3053,52 +3161,21 @@ Module {
         Property { name: "geometry"; type: "QRectF" }
         Property { name: "autoFillBackground"; type: "bool" }
         Property { name: "layout"; type: "QGraphicsLayout"; isPointer: true }
+        Signal { name: "geometryChanged" }
+        Signal { name: "layoutChanged" }
         Method { name: "close"; type: "bool" }
     }
     Component {
-        name: "QInputPanel"
-        prototype: "QObject"
-        exports: ["QtQuick/InputPanel 2.0"]
-        Enum {
-            name: "Action"
-            values: {
-                "Click": 0,
-                "ContextMenu": 1
-            }
-        }
-        Property { name: "inputItem"; type: "QObject"; isPointer: true }
-        Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "keyboardRectangle"; type: "QRectF"; isReadonly: true }
-        Property { name: "visible"; type: "bool"; isReadonly: true }
-        Property { name: "animating"; type: "bool"; isReadonly: true }
-        Method { name: "show" }
-        Method { name: "hide" }
-        Method {
-            name: "update"
-            Parameter { name: "queries"; type: "Qt::InputMethodQueries" }
-        }
-        Method { name: "reset" }
-        Method { name: "commit" }
-        Method {
-            name: "invokeAction"
-            Parameter { name: "a"; type: "Action" }
-            Parameter { name: "cursorPosition"; type: "int" }
-        }
-    }
-    Component {
         name: "QIntValidator"
         prototype: "QValidator"
-        exports: ["QtQuick/IntValidator 1.0", "QtQuick/IntValidator 2.0"]
+        exports: [
+            "QtQuick/IntValidator 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "bottom"; type: "int" }
         Property { name: "top"; type: "int" }
-        Signal {
-            name: "bottomChanged"
-            Parameter { name: "bottom"; type: "int" }
-        }
-        Signal {
-            name: "topChanged"
-            Parameter { name: "top"; type: "int" }
-        }
     }
     Component {
         name: "QListModelInterface"
@@ -3128,3504 +3205,33 @@ Module {
     }
     Component {
         name: "QObject"
-        exports: ["QtQuick/QtObject 1.0", "QtQuick/QtObject 2.0"]
+        exports: [
+            "QtQuick/QtObject 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
+        ]
         Property { name: "objectName"; type: "string" }
-        Method { name: "toString" }
-        Method { name: "destroy" }
-        Method {
-            name: "destroy"
-            Parameter { name: "delay"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickAgeAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Age 2.0"]
-        Property { name: "lifeLeft"; type: "int" }
-        Property { name: "advancePosition"; type: "bool" }
-        Signal {
-            name: "lifeLeftChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "advancePositionChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setLifeLeft"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setAdvancePosition"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickAnchorAnimation"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/AnchorAnimation 2.0"]
-        Property { name: "targets"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "duration"; type: "int" }
-        Property { name: "easing"; type: "QEasingCurve" }
-        Signal {
-            name: "durationChanged"
-            Parameter { type: "int" }
-        }
         Signal {
-            name: "easingChanged"
-            Parameter { type: "QEasingCurve" }
-        }
-    }
-    Component {
-        name: "QQuickAnchorChanges"
-        prototype: "QDeclarativeStateOperation"
-        exports: ["QtQuick/AnchorChanges 2.0"]
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "anchors"; type: "QQuickAnchorSet"; isReadonly: true; isPointer: true }
-    }
-    Component {
-        name: "QQuickAnchorSet"
-        prototype: "QObject"
-        Property { name: "left"; type: "QDeclarativeScriptString" }
-        Property { name: "right"; type: "QDeclarativeScriptString" }
-        Property { name: "horizontalCenter"; type: "QDeclarativeScriptString" }
-        Property { name: "top"; type: "QDeclarativeScriptString" }
-        Property { name: "bottom"; type: "QDeclarativeScriptString" }
-        Property { name: "verticalCenter"; type: "QDeclarativeScriptString" }
-        Property { name: "baseline"; type: "QDeclarativeScriptString" }
-    }
-    Component {
-        name: "QQuickAnchors"
-        prototype: "QObject"
-        Property { name: "left"; type: "QQuickAnchorLine" }
-        Property { name: "right"; type: "QQuickAnchorLine" }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine" }
-        Property { name: "top"; type: "QQuickAnchorLine" }
-        Property { name: "bottom"; type: "QQuickAnchorLine" }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine" }
-        Property { name: "baseline"; type: "QQuickAnchorLine" }
-        Property { name: "margins"; type: "qreal" }
-        Property { name: "leftMargin"; type: "qreal" }
-        Property { name: "rightMargin"; type: "qreal" }
-        Property { name: "horizontalCenterOffset"; type: "qreal" }
-        Property { name: "topMargin"; type: "qreal" }
-        Property { name: "bottomMargin"; type: "qreal" }
-        Property { name: "verticalCenterOffset"; type: "qreal" }
-        Property { name: "baselineOffset"; type: "qreal" }
-        Property { name: "fill"; type: "QQuickItem"; isPointer: true }
-        Property { name: "centerIn"; type: "QQuickItem"; isPointer: true }
-        Property { name: "mirrored"; type: "bool"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickAngleDirection"
-        prototype: "QQuickDirection"
-        exports: ["QtQuick.Particles/AngleDirection 2.0"]
-        Property { name: "angle"; type: "qreal" }
-        Property { name: "magnitude"; type: "qreal" }
-        Property { name: "angleVariation"; type: "qreal" }
-        Property { name: "magnitudeVariation"; type: "qreal" }
-        Signal {
-            name: "angleChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "magnitudeChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "angleVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "magnitudeVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAngle"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setMagnitude"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAngleVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setMagnitudeVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickAnimatedImage"
-        defaultProperty: "data"
-        prototype: "QQuickImage"
-        exports: ["QtQuick/AnimatedImage 2.0"]
-        Property { name: "playing"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Property { name: "currentFrame"; type: "int" }
-        Property { name: "frameCount"; type: "int"; isReadonly: true }
-        Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
-        Signal { name: "frameChanged" }
-    }
-    Component {
-        name: "QQuickAttractorAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Attractor 2.0"]
-        Enum {
-            name: "Proportion"
-            values: {
-                "Constant": 0,
-                "Linear": 1,
-                "Quadratic": 2,
-                "InverseLinear": 3,
-                "InverseQuadratic": 4
-            }
-        }
-        Enum {
-            name: "AffectableParameters"
-            values: {
-                "Position": 0,
-                "Velocity": 1,
-                "Acceleration": 2
-            }
-        }
-        Property { name: "strength"; type: "qreal" }
-        Property { name: "pointX"; type: "qreal" }
-        Property { name: "pointY"; type: "qreal" }
-        Property { name: "affectedParameter"; type: "AffectableParameters" }
-        Property { name: "proportionalToDistance"; type: "Proportion" }
-        Signal {
-            name: "strengthChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "pointXChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "pointYChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "affectedParameterChanged"
-            Parameter { name: "arg"; type: "AffectableParameters" }
-        }
-        Signal {
-            name: "proportionalToDistanceChanged"
-            Parameter { name: "arg"; type: "Proportion" }
-        }
-        Method {
-            name: "setStrength"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setPointX"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setPointY"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAffectedParameter"
-            Parameter { name: "arg"; type: "AffectableParameters" }
-        }
-        Method {
-            name: "setProportionalToDistance"
-            Parameter { name: "arg"; type: "Proportion" }
-        }
-    }
-    Component {
-        name: "QQuickBasePositioner"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/Positioner 2.0"]
-        attachedType: "QQuickPositionerAttached"
-        Property { name: "spacing"; type: "int" }
-        Property { name: "move"; type: "QDeclarativeTransition"; isPointer: true }
-        Property { name: "add"; type: "QDeclarativeTransition"; isPointer: true }
-    }
-    Component {
-        name: "QQuickBorderImage"
-        defaultProperty: "data"
-        prototype: "QQuickImageBase"
-        exports: ["QtQuick/BorderImage 2.0"]
-        Enum {
-            name: "TileMode"
-            values: {
-                "Stretch": 0,
-                "Repeat": 1,
-                "Round": 2
-            }
-        }
-        Property { name: "border"; type: "QQuickScaleGrid"; isReadonly: true; isPointer: true }
-        Property { name: "horizontalTileMode"; type: "TileMode" }
-        Property { name: "verticalTileMode"; type: "TileMode" }
-        Property { name: "sourceSize"; type: "QSize"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickCanvas"
-        defaultProperty: "data"
-        prototype: "QWindow"
-        exports: ["QtQuick.Window/Window 2.0"]
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "color"; type: "QColor" }
-        Signal { name: "frameSwapped" }
-        Signal { name: "sceneGraphInitialized" }
-        Signal { name: "beforeRendering" }
-        Signal { name: "afterRendering" }
-        Signal {
-            name: "clearColorChanged"
-            Parameter { type: "QColor" }
-        }
-    }
-    Component {
-        name: "QQuickCanvasItem"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/Canvas 2.0"]
-        Enum {
-            name: "RenderTarget"
-            values: {
-                "Image": 0,
-                "FramebufferObject": 1
-            }
-        }
-        Enum {
-            name: "ImageFilterMode"
-            values: {
-                "Threshold": 0,
-                "Mono": 1,
-                "GrayScale": 2,
-                "Brightness": 3,
-                "Invert": 4,
-                "Blur": 5,
-                "Opaque": 6,
-                "Convolute": 7
-            }
-        }
-        Property { name: "canvasSize"; type: "QSizeF" }
-        Property { name: "tileSize"; type: "QSize" }
-        Property { name: "canvasWindow"; type: "QRectF" }
-        Property { name: "renderInThread"; type: "bool" }
-        Property { name: "renderTarget"; type: "RenderTarget" }
-        Signal {
-            name: "paint"
-            Parameter { name: "context"; type: "QDeclarativeV8Handle" }
-            Parameter { name: "region"; type: "QRect" }
-        }
-        Signal { name: "painted" }
-        Signal { name: "textureChanged" }
-        Signal { name: "imageLoaded" }
-        Method {
-            name: "toDataURL"
-            type: "string"
-            Parameter { name: "type"; type: "string" }
-        }
-        Method { name: "toDataURL"; type: "string" }
-        Method {
-            name: "getContext"
-            type: "QDeclarativeV8Handle"
-            Parameter { type: "string" }
-        }
-        Method { name: "getContext"; type: "QDeclarativeV8Handle" }
-        Method {
-            name: "markDirty"
-            Parameter { name: "region"; type: "QRectF" }
-        }
-        Method { name: "requestPaint" }
-        Method {
-            name: "save"
-            type: "bool"
-            Parameter { name: "filename"; type: "string" }
-        }
-        Method {
-            name: "loadImage"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "unloadImage"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageLoaded"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageLoading"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-        Method {
-            name: "isImageError"
-            type: "bool"
-            Parameter { name: "url"; type: "QUrl" }
-        }
-    }
-    Component {
-        name: "QQuickColumn"
-        defaultProperty: "data"
-        prototype: "QQuickBasePositioner"
-        exports: ["QtQuick/Column 2.0"]
-    }
-    Component {
-        name: "QQuickCumulativeDirection"
-        defaultProperty: "directions"
-        prototype: "QQuickDirection"
-        exports: ["QtQuick.Particles/CumulativeDirection 2.0"]
-        Property { name: "directions"; type: "QQuickDirection"; isList: true; isReadonly: true }
-    }
-    Component {
-        name: "QQuickCustomAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Affector 2.0"]
-        Property { name: "relative"; type: "bool" }
-        Property { name: "position"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "speed"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "acceleration"; type: "QQuickDirection"; isPointer: true }
-        Signal {
-            name: "affectParticles"
-            Parameter { name: "particles"; type: "QDeclarativeV8Handle" }
-            Parameter { name: "dt"; type: "qreal" }
-        }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "speedChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "accelerationChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "relativeChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setPosition"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setSpeed"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setAcceleration"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setRelative"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickCustomParticle"
-        defaultProperty: "data"
-        prototype: "QQuickParticlePainter"
-        exports: ["QtQuick.Particles/CustomParticle 2.0"]
-        Property { name: "fragmentShader"; type: "QByteArray" }
-        Property { name: "vertexShader"; type: "QByteArray" }
-        Method { name: "updateData" }
-        Method {
-            name: "changeSource"
-            Parameter { type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickDirection"
-        prototype: "QObject"
-        exports: ["QtQuick.Particles/NullVector 2.0"]
-    }
-    Component {
-        name: "QQuickDrag"
-        prototype: "QObject"
-        exports: ["QtQuick/Drag 2.0"]
-        attachedType: "QQuickDragAttached"
-        Enum {
-            name: "Axis"
-            values: {
-                "XAxis": 1,
-                "YAxis": 2,
-                "XandYAxis": 3
-            }
-        }
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "axis"; type: "Axis" }
-        Property { name: "minimumX"; type: "qreal" }
-        Property { name: "maximumX"; type: "qreal" }
-        Property { name: "minimumY"; type: "qreal" }
-        Property { name: "maximumY"; type: "qreal" }
-        Property { name: "active"; type: "bool"; isReadonly: true }
-        Property { name: "filterChildren"; type: "bool" }
-    }
-    Component {
-        name: "QQuickDragAttached"
-        prototype: "QObject"
-        Property { name: "active"; type: "bool" }
-        Property { name: "source"; type: "QObject"; isPointer: true }
-        Property { name: "target"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "hotSpot"; type: "QPointF" }
-        Property { name: "keys"; type: "QStringList" }
-        Property { name: "supportedActions"; type: "Qt::DropActions" }
-        Property { name: "proposedAction"; type: "Qt::DropAction" }
-        Method {
-            name: "start"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method { name: "cancel" }
-        Method { name: "drop"; type: "int" }
-    }
-    Component {
-        name: "QQuickDropArea"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/DropArea 2.0"]
-        Property { name: "containsDrag"; type: "bool"; isReadonly: true }
-        Property { name: "keys"; type: "QStringList" }
-        Property { name: "drag"; type: "QQuickDropAreaDrag"; isReadonly: true; isPointer: true }
-        Signal { name: "sourceChanged" }
-        Signal {
-            name: "entered"
-            Parameter { name: "drag"; type: "QQuickDropEvent"; isPointer: true }
-        }
-        Signal { name: "exited" }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "drag"; type: "QQuickDropEvent"; isPointer: true }
-        }
-        Signal {
-            name: "dropped"
-            Parameter { name: "drop"; type: "QQuickDropEvent"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickDropAreaDrag"
-        prototype: "QObject"
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "source"; type: "QObject"; isReadonly: true; isPointer: true }
-        Signal { name: "positionChanged" }
-    }
-    Component {
-        name: "QQuickEllipseExtruder"
-        prototype: "QQuickParticleExtruder"
-        exports: ["QtQuick.Particles/EllipseShape 2.0"]
-        Property { name: "fill"; type: "bool" }
-        Signal {
-            name: "fillChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setFill"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickFlickable"
-        defaultProperty: "flickableData"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/Flickable 2.0"]
-        Enum {
-            name: "BoundsBehavior"
-            values: {
-                "StopAtBounds": 0,
-                "DragOverBounds": 1,
-                "DragAndOvershootBounds": 2
-            }
-        }
-        Enum {
-            name: "FlickableDirection"
-            values: {
-                "AutoFlickDirection": 0,
-                "HorizontalFlick": 1,
-                "VerticalFlick": 2,
-                "HorizontalAndVerticalFlick": 3
-            }
-        }
-        Property { name: "contentWidth"; type: "qreal" }
-        Property { name: "contentHeight"; type: "qreal" }
-        Property { name: "contentX"; type: "qreal" }
-        Property { name: "contentY"; type: "qreal" }
-        Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "topMargin"; type: "qreal" }
-        Property { name: "bottomMargin"; type: "qreal" }
-        Property { name: "yOrigin"; type: "qreal"; isReadonly: true }
-        Property { name: "leftMargin"; type: "qreal" }
-        Property { name: "rightMargin"; type: "qreal" }
-        Property { name: "xOrigin"; type: "qreal"; isReadonly: true }
-        Property { name: "horizontalVelocity"; type: "qreal"; isReadonly: true }
-        Property { name: "verticalVelocity"; type: "qreal"; isReadonly: true }
-        Property { name: "boundsBehavior"; type: "BoundsBehavior" }
-        Property { name: "maximumFlickVelocity"; type: "qreal" }
-        Property { name: "flickDeceleration"; type: "qreal" }
-        Property { name: "moving"; type: "bool"; isReadonly: true }
-        Property { name: "movingHorizontally"; type: "bool"; isReadonly: true }
-        Property { name: "movingVertically"; type: "bool"; isReadonly: true }
-        Property { name: "flicking"; type: "bool"; isReadonly: true }
-        Property { name: "flickingHorizontally"; type: "bool"; isReadonly: true }
-        Property { name: "flickingVertically"; type: "bool"; isReadonly: true }
-        Property { name: "dragging"; type: "bool"; isReadonly: true }
-        Property { name: "draggingHorizontally"; type: "bool"; isReadonly: true }
-        Property { name: "draggingVertically"; type: "bool"; isReadonly: true }
-        Property { name: "flickableDirection"; type: "FlickableDirection" }
-        Property { name: "interactive"; type: "bool" }
-        Property { name: "pressDelay"; type: "int" }
-        Property { name: "atXEnd"; type: "bool"; isReadonly: true }
-        Property { name: "atYEnd"; type: "bool"; isReadonly: true }
-        Property { name: "atXBeginning"; type: "bool"; isReadonly: true }
-        Property { name: "atYBeginning"; type: "bool"; isReadonly: true }
-        Property {
-            name: "visibleArea"
-            type: "QQuickFlickableVisibleArea"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "pixelAligned"; type: "bool" }
-        Property { name: "flickableData"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "flickableChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Signal { name: "isAtBoundaryChanged" }
-        Signal { name: "movementStarted" }
-        Signal { name: "movementEnded" }
-        Signal { name: "flickStarted" }
-        Signal { name: "flickEnded" }
-        Signal { name: "dragStarted" }
-        Signal { name: "dragEnded" }
-        Method {
-            name: "resizeContent"
-            Parameter { name: "w"; type: "qreal" }
-            Parameter { name: "h"; type: "qreal" }
-            Parameter { name: "center"; type: "QPointF" }
-        }
-        Method { name: "returnToBounds" }
-    }
-    Component {
-        name: "QQuickFlickableVisibleArea"
-        prototype: "QObject"
-        Property { name: "xPosition"; type: "qreal"; isReadonly: true }
-        Property { name: "yPosition"; type: "qreal"; isReadonly: true }
-        Property { name: "widthRatio"; type: "qreal"; isReadonly: true }
-        Property { name: "heightRatio"; type: "qreal"; isReadonly: true }
-        Signal {
-            name: "xPositionChanged"
-            Parameter { name: "xPosition"; type: "qreal" }
-        }
-        Signal {
-            name: "yPositionChanged"
-            Parameter { name: "yPosition"; type: "qreal" }
-        }
-        Signal {
-            name: "widthRatioChanged"
-            Parameter { name: "widthRatio"; type: "qreal" }
-        }
-        Signal {
-            name: "heightRatioChanged"
-            Parameter { name: "heightRatio"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickFlipable"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/Flipable 2.0"]
-        Enum {
-            name: "Side"
-            values: {
-                "Front": 0,
-                "Back": 1
-            }
-        }
-        Property { name: "front"; type: "QQuickItem"; isPointer: true }
-        Property { name: "back"; type: "QQuickItem"; isPointer: true }
-        Property { name: "side"; type: "Side"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickFlow"
-        defaultProperty: "data"
-        prototype: "QQuickBasePositioner"
-        exports: ["QtQuick/Flow 2.0"]
-        Enum {
-            name: "Flow"
-            values: {
-                "LeftToRight": 0,
-                "TopToBottom": 1
-            }
-        }
-        Property { name: "flow"; type: "Flow" }
-        Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
-        Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickFocusScope"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/FocusScope 2.0"]
-    }
-    Component {
-        name: "QQuickFrictionAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Friction 2.0"]
-        Property { name: "factor"; type: "qreal" }
-        Property { name: "threshold"; type: "qreal" }
-        Signal {
-            name: "factorChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "thresholdChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setFactor"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setThreshold"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickGradient"
-        defaultProperty: "stops"
-        prototype: "QObject"
-        exports: ["QtQuick/Gradient 2.0"]
-        Property { name: "stops"; type: "QQuickGradientStop"; isList: true; isReadonly: true }
-        Signal { name: "updated" }
-    }
-    Component {
-        name: "QQuickGradientStop"
-        prototype: "QObject"
-        exports: ["QtQuick/GradientStop 2.0"]
-        Property { name: "position"; type: "qreal" }
-        Property { name: "color"; type: "QColor" }
-    }
-    Component {
-        name: "QQuickGravityAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Gravity 2.0"]
-        Property { name: "magnitude"; type: "qreal" }
-        Property { name: "acceleration"; type: "qreal" }
-        Property { name: "angle"; type: "qreal" }
-        Signal {
-            name: "magnitudeChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "angleChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAcceleration"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setMagnitude"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAngle"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickGrid"
-        defaultProperty: "data"
-        prototype: "QQuickBasePositioner"
-        exports: ["QtQuick/Grid 2.0"]
-        Enum {
-            name: "Flow"
-            values: {
-                "LeftToRight": 0,
-                "TopToBottom": 1
-            }
-        }
-        Property { name: "rows"; type: "int" }
-        Property { name: "columns"; type: "int" }
-        Property { name: "rowSpacing"; type: "int" }
-        Property { name: "columnSpacing"; type: "int" }
-        Property { name: "flow"; type: "Flow" }
-        Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
-        Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickGridMesh"
-        prototype: "QQuickShaderEffectMesh"
-        exports: ["QtQuick/GridMesh 2.0"]
-        Property { name: "resolution"; type: "QSize" }
-    }
-    Component {
-        name: "QQuickGridView"
-        defaultProperty: "data"
-        prototype: "QQuickItemView"
-        exports: ["QtQuick/GridView 2.0"]
-        attachedType: "QQuickGridViewAttached"
-        Enum {
-            name: "Flow"
-            values: {
-                "LeftToRight": 0,
-                "TopToBottom": 1
-            }
-        }
-        Enum {
-            name: "SnapMode"
-            values: {
-                "NoSnap": 0,
-                "SnapToRow": 1,
-                "SnapOneRow": 2
-            }
-        }
-        Property { name: "flow"; type: "Flow" }
-        Property { name: "cellWidth"; type: "qreal" }
-        Property { name: "cellHeight"; type: "qreal" }
-        Property { name: "snapMode"; type: "SnapMode" }
-        Signal { name: "highlightMoveDurationChanged" }
-        Method { name: "moveCurrentIndexUp" }
-        Method { name: "moveCurrentIndexDown" }
-        Method { name: "moveCurrentIndexLeft" }
-        Method { name: "moveCurrentIndexRight" }
-    }
-    Component {
-        name: "QQuickGridViewAttached"
-        prototype: "QQuickItemViewAttached"
-        Property { name: "view"; type: "QQuickGridView"; isReadonly: true; isPointer: true }
-    }
-    Component {
-        name: "QQuickGroupGoalAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/GroupGoal 2.0"]
-        Property { name: "goalState"; type: "string" }
-        Property { name: "jump"; type: "bool" }
-        Signal {
-            name: "goalStateChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Signal {
-            name: "jumpChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setGoalState"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "setJump"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickImage"
-        defaultProperty: "data"
-        prototype: "QQuickImageBase"
-        exports: ["QtQuick/Image 2.0"]
-        Enum {
-            name: "HAlignment"
-            values: {
-                "AlignLeft": 1,
-                "AlignRight": 2,
-                "AlignHCenter": 4
-            }
-        }
-        Enum {
-            name: "VAlignment"
-            values: {
-                "AlignTop": 32,
-                "AlignBottom": 64,
-                "AlignVCenter": 128
-            }
-        }
-        Enum {
-            name: "FillMode"
-            values: {
-                "Stretch": 0,
-                "PreserveAspectFit": 1,
-                "PreserveAspectCrop": 2,
-                "Tile": 3,
-                "TileVertically": 4,
-                "TileHorizontally": 5,
-                "Pad": 6
-            }
-        }
-        Property { name: "fillMode"; type: "FillMode" }
-        Property { name: "paintedWidth"; type: "qreal"; isReadonly: true }
-        Property { name: "paintedHeight"; type: "qreal"; isReadonly: true }
-        Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property { name: "verticalAlignment"; type: "VAlignment" }
-        Signal { name: "paintedGeometryChanged" }
-        Signal {
-            name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
-        }
-        Signal {
-            name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
-        }
-    }
-    Component {
-        name: "QQuickImageBase"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        Enum {
-            name: "Status"
-            values: {
-                "Null": 0,
-                "Ready": 1,
-                "Loading": 2,
-                "Error": 3
-            }
-        }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "progress"; type: "qreal"; isReadonly: true }
-        Property { name: "asynchronous"; type: "bool" }
-        Property { name: "cache"; type: "bool" }
-        Property { name: "sourceSize"; type: "QSize" }
-        Property { name: "mirror"; type: "bool" }
-        Signal {
-            name: "sourceChanged"
-            Parameter { type: "QUrl" }
-        }
-        Signal {
-            name: "statusChanged"
-            Parameter { type: "QQuickImageBase::Status" }
-        }
-        Signal {
-            name: "progressChanged"
-            Parameter { name: "progress"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickImageParticle"
-        defaultProperty: "data"
-        prototype: "QQuickParticlePainter"
-        exports: ["QtQuick.Particles/ImageParticle 2.0"]
-        Enum {
-            name: "EntryEffect"
-            values: {
-                "None": 0,
-                "Fade": 1,
-                "Scale": 2
-            }
-        }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "colorTable"; type: "QUrl" }
-        Property { name: "sizeTable"; type: "QUrl" }
-        Property { name: "opacityTable"; type: "QUrl" }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "colorVariation"; type: "qreal" }
-        Property { name: "redVariation"; type: "qreal" }
-        Property { name: "greenVariation"; type: "qreal" }
-        Property { name: "blueVariation"; type: "qreal" }
-        Property { name: "alpha"; type: "qreal" }
-        Property { name: "alphaVariation"; type: "qreal" }
-        Property { name: "rotation"; type: "qreal" }
-        Property { name: "rotationVariation"; type: "qreal" }
-        Property { name: "rotationSpeed"; type: "qreal" }
-        Property { name: "rotationSpeedVariation"; type: "qreal" }
-        Property { name: "autoRotation"; type: "bool" }
-        Property { name: "xVector"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "yVector"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "sprites"; type: "QQuickSprite"; isList: true; isReadonly: true }
-        Property { name: "spritesInterpolate"; type: "bool" }
-        Property { name: "entryEffect"; type: "EntryEffect" }
-        Property { name: "bloat"; type: "bool" }
-        Signal { name: "imageChanged" }
-        Signal { name: "colortableChanged" }
-        Signal { name: "sizetableChanged" }
-        Signal { name: "opacitytableChanged" }
-        Signal {
-            name: "alphaVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "alphaChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "redVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "greenVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "blueVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "rotationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "rotationVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "rotationSpeedChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "rotationSpeedVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "autoRotationChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "xVectorChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "yVectorChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "spritesInterpolateChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "bloatChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "entryEffectChanged"
-            Parameter { name: "arg"; type: "EntryEffect" }
-        }
-        Method {
-            name: "reloadColor"
-            Parameter { name: "c"; type: "Color4ub" }
-            Parameter { name: "d"; type: "QQuickParticleData"; isPointer: true }
-        }
-        Method {
-            name: "setAlphaVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAlpha"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setRedVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setGreenVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setBlueVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setRotation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setRotationVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setRotationSpeed"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setRotationSpeedVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAutoRotation"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setXVector"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setYVector"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setSpritesInterpolate"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setBloat"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setEntryEffect"
-            Parameter { name: "arg"; type: "EntryEffect" }
-        }
-    }
-    Component {
-        name: "QQuickImplicitSizeItem"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        Property { name: "implicitWidth"; type: "qreal"; isReadonly: true }
-        Property { name: "implicitHeight"; type: "qreal"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickItem"
-        defaultProperty: "data"
-        prototype: "QObject"
-        exports: ["QtQuick/Item 2.0"]
-        Enum {
-            name: "TransformOrigin"
-            values: {
-                "TopLeft": 0,
-                "Top": 1,
-                "TopRight": 2,
-                "Left": 3,
-                "Center": 4,
-                "Right": 5,
-                "BottomLeft": 6,
-                "Bottom": 7,
-                "BottomRight": 8
-            }
-        }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "pos"; type: "QPointF"; isReadonly: true }
-        Property { name: "x"; type: "qreal" }
-        Property { name: "y"; type: "qreal" }
-        Property { name: "z"; type: "qreal" }
-        Property { name: "width"; type: "qreal" }
-        Property { name: "height"; type: "qreal" }
-        Property { name: "opacity"; type: "qreal" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "states"; type: "QDeclarativeState"; isList: true; isReadonly: true }
-        Property { name: "transitions"; type: "QDeclarativeTransition"; isList: true; isReadonly: true }
-        Property { name: "state"; type: "string" }
-        Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
-        Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
-        Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
-        Property { name: "baselineOffset"; type: "qreal" }
-        Property { name: "clip"; type: "bool" }
-        Property { name: "focus"; type: "bool" }
-        Property { name: "activeFocus"; type: "bool"; isReadonly: true }
-        Property { name: "rotation"; type: "qreal" }
-        Property { name: "scale"; type: "qreal" }
-        Property { name: "transformOrigin"; type: "TransformOrigin" }
-        Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
-        Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
-        Property { name: "smooth"; type: "bool" }
-        Property { name: "implicitWidth"; type: "qreal" }
-        Property { name: "implicitHeight"; type: "qreal" }
-        Signal {
-            name: "childrenRectChanged"
-            Parameter { type: "QRectF" }
-        }
-        Signal {
-            name: "baselineOffsetChanged"
-            Parameter { type: "qreal" }
-        }
-        Signal {
-            name: "stateChanged"
-            Parameter { type: "string" }
-        }
-        Signal {
-            name: "focusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "activeFocusChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "parentChanged"
-            Parameter { type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "transformOriginChanged"
-            Parameter { type: "TransformOrigin" }
-        }
-        Signal {
-            name: "smoothChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "clipChanged"
-            Parameter { type: "bool" }
-        }
-        Method { name: "update" }
-        Method { name: "updateMicroFocus" }
-        Method {
-            name: "mapFromItem"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "mapToItem"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method { name: "forceActiveFocus" }
-        Method {
-            name: "childAt"
-            type: "QQuickItem*"
-            Parameter { name: "x"; type: "qreal" }
-            Parameter { name: "y"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickItemParticle"
-        defaultProperty: "data"
-        prototype: "QQuickParticlePainter"
-        exports: ["QtQuick.Particles/ItemParticle 2.0"]
-        attachedType: "QQuickItemParticleAttached"
-        Property { name: "fade"; type: "bool" }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Signal {
-            name: "delegateChanged"
-            Parameter { name: "arg"; type: "QDeclarativeComponent"; isPointer: true }
-        }
-        Method {
-            name: "freeze"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "unfreeze"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "take"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-            Parameter { name: "prioritize"; type: "bool" }
-        }
-        Method {
-            name: "take"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "give"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "setFade"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setDelegate"
-            Parameter { name: "arg"; type: "QDeclarativeComponent"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickItemParticleAttached"
-        prototype: "QObject"
-        Property { name: "particle"; type: "QQuickItemParticle"; isReadonly: true; isPointer: true }
-        Signal { name: "detached" }
-        Signal { name: "attached" }
-    }
-    Component {
-        name: "QQuickItemView"
-        defaultProperty: "flickableData"
-        prototype: "QQuickFlickable"
-        Enum {
-            name: "HighlightRangeMode"
-            values: {
-                "NoHighlightRange": 0,
-                "ApplyRange": 1,
-                "StrictlyEnforceRange": 2
-            }
-        }
-        Enum {
-            name: "PositionMode"
-            values: {
-                "Beginning": 0,
-                "Center": 1,
-                "End": 2,
-                "Visible": 3,
-                "Contain": 4
-            }
-        }
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "currentIndex"; type: "int" }
-        Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "keyNavigationWraps"; type: "bool" }
-        Property { name: "cacheBuffer"; type: "int" }
-        Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
-        Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
-        Property { name: "header"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "headerItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "footer"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "footerItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "highlight"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "highlightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "highlightFollowsCurrentItem"; type: "bool" }
-        Property { name: "highlightRangeMode"; type: "HighlightRangeMode" }
-        Property { name: "preferredHighlightBegin"; type: "qreal" }
-        Property { name: "preferredHighlightEnd"; type: "qreal" }
-        Property { name: "highlightMoveDuration"; type: "int" }
-        Method {
-            name: "positionViewAtIndex"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "mode"; type: "int" }
-        }
-        Method {
-            name: "indexAt"
-            type: "int"
-            Parameter { name: "x"; type: "qreal" }
-            Parameter { name: "y"; type: "qreal" }
-        }
-        Method { name: "positionViewAtBeginning" }
-        Method { name: "positionViewAtEnd" }
-    }
-    Component {
-        name: "QQuickItemViewAttached"
-        prototype: "QObject"
-        Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
-        Property { name: "delayRemove"; type: "bool" }
-        Property { name: "section"; type: "string"; isReadonly: true }
-        Property { name: "previousSection"; type: "string"; isReadonly: true }
-        Property { name: "nextSection"; type: "string"; isReadonly: true }
-        Signal { name: "currentItemChanged" }
-        Signal { name: "add" }
-        Signal { name: "remove" }
-        Signal { name: "prevSectionChanged" }
-    }
-    Component {
-        name: "QQuickKeyNavigationAttached"
-        prototype: "QObject"
-        exports: ["QtQuick/KeyNavigation 2.0"]
-        Enum {
-            name: "Priority"
-            values: {
-                "BeforeItem": 0,
-                "AfterItem": 1
-            }
-        }
-        Property { name: "left"; type: "QQuickItem"; isPointer: true }
-        Property { name: "right"; type: "QQuickItem"; isPointer: true }
-        Property { name: "up"; type: "QQuickItem"; isPointer: true }
-        Property { name: "down"; type: "QQuickItem"; isPointer: true }
-        Property { name: "tab"; type: "QQuickItem"; isPointer: true }
-        Property { name: "backtab"; type: "QQuickItem"; isPointer: true }
-        Property { name: "priority"; type: "Priority" }
-    }
-    Component {
-        name: "QQuickKeysAttached"
-        prototype: "QObject"
-        exports: ["QtQuick/Keys 2.0"]
-        Enum {
-            name: "Priority"
-            values: {
-                "BeforeItem": 0,
-                "AfterItem": 1
-            }
-        }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "forwardTo"; type: "QQuickItem"; isList: true; isReadonly: true }
-        Property { name: "priority"; type: "Priority" }
-        Signal {
-            name: "pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "released"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit0Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit1Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit2Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit3Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit4Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit5Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit6Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit7Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit8Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "digit9Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "leftPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "rightPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "upPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "downPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "tabPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "backtabPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "asteriskPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "numberSignPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "escapePressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "returnPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "enterPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "deletePressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "spacePressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "backPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "cancelPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "selectPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "yesPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "noPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "context1Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "context2Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "context3Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "context4Pressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "callPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "hangupPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "flipPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "menuPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "volumeUpPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-        Signal {
-            name: "volumeDownPressed"
-            Parameter { name: "event"; type: "QQuickKeyEvent"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickLayoutMirroringAttached"
-        prototype: "QObject"
-        exports: ["QtQuick/LayoutMirroring 2.0"]
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "childrenInherit"; type: "bool" }
-    }
-    Component {
-        name: "QQuickLineExtruder"
-        prototype: "QQuickParticleExtruder"
-        exports: ["QtQuick.Particles/LineShape 2.0"]
-        Property { name: "mirrored"; type: "bool" }
-        Signal {
-            name: "mirroredChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setmirrored"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickListView"
-        defaultProperty: "data"
-        prototype: "QQuickItemView"
-        exports: ["QtQuick/ListView 2.0"]
-        attachedType: "QQuickListViewAttached"
-        Enum {
-            name: "Orientation"
-            values: {
-                "Horizontal": 1,
-                "Vertical": 2
-            }
-        }
-        Enum {
-            name: "SnapMode"
-            values: {
-                "NoSnap": 0,
-                "SnapToItem": 1,
-                "SnapOneItem": 2
-            }
-        }
-        Property { name: "highlightMoveSpeed"; type: "qreal" }
-        Property { name: "highlightResizeSpeed"; type: "qreal" }
-        Property { name: "highlightResizeDuration"; type: "int" }
-        Property { name: "spacing"; type: "qreal" }
-        Property { name: "orientation"; type: "Orientation" }
-        Property { name: "section"; type: "QQuickViewSection"; isReadonly: true; isPointer: true }
-        Property { name: "currentSection"; type: "string"; isReadonly: true }
-        Property { name: "snapMode"; type: "SnapMode" }
-        Method { name: "incrementCurrentIndex" }
-        Method { name: "decrementCurrentIndex" }
-    }
-    Component {
-        name: "QQuickListViewAttached"
-        prototype: "QQuickItemViewAttached"
-        Property { name: "view"; type: "QQuickListView"; isReadonly: true; isPointer: true }
-    }
-    Component {
-        name: "QQuickLoader"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/Loader 2.0"]
-        Enum {
-            name: "Status"
-            values: {
-                "Null": 0,
-                "Ready": 1,
-                "Loading": 2,
-                "Error": 3
-            }
-        }
-        Property { name: "active"; type: "bool" }
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "sourceComponent"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "item"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "status"; type: "Status"; isReadonly: true }
-        Property { name: "progress"; type: "qreal"; isReadonly: true }
-        Property { name: "asynchronous"; type: "bool" }
-        Signal { name: "loaded" }
-        Method {
-            name: "setSource"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickMaskExtruder"
-        prototype: "QQuickParticleExtruder"
-        exports: ["QtQuick.Particles/MaskShape 2.0"]
-        Property { name: "source"; type: "QUrl" }
-        Signal {
-            name: "sourceChanged"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-        Method {
-            name: "setSource"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-    }
-    Component {
-        name: "QQuickMouseArea"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/MouseArea 2.0"]
-        Property { name: "mouseX"; type: "qreal"; isReadonly: true }
-        Property { name: "mouseY"; type: "qreal"; isReadonly: true }
-        Property { name: "containsMouse"; type: "bool"; isReadonly: true }
-        Property { name: "pressed"; type: "bool"; isReadonly: true }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "pressedButtons"; type: "Qt::MouseButtons"; isReadonly: true }
-        Property { name: "acceptedButtons"; type: "Qt::MouseButtons" }
-        Property { name: "hoverEnabled"; type: "bool" }
-        Property { name: "drag"; type: "QQuickDrag"; isReadonly: true; isPointer: true }
-        Property { name: "preventStealing"; type: "bool" }
-        Property { name: "propagateComposedEvents"; type: "bool" }
-        Signal { name: "hoveredChanged" }
-        Signal {
-            name: "positionChanged"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "mouseXChanged"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "mouseYChanged"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pressed"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pressAndHold"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "released"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "clicked"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal {
-            name: "doubleClicked"
-            Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
-        }
-        Signal { name: "entered" }
-        Signal { name: "exited" }
-        Signal { name: "canceled" }
-    }
-    Component {
-        name: "QQuickMouseEvent"
-        prototype: "QObject"
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "button"; type: "int"; isReadonly: true }
-        Property { name: "buttons"; type: "int"; isReadonly: true }
-        Property { name: "modifiers"; type: "int"; isReadonly: true }
-        Property { name: "wasHeld"; type: "bool"; isReadonly: true }
-        Property { name: "isClick"; type: "bool"; isReadonly: true }
-        Property { name: "accepted"; type: "bool" }
-    }
-    Component {
-        name: "QQuickMultiPointTouchArea"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/MultiPointTouchArea 2.0"]
-        Property { name: "touchPoints"; type: "QQuickTouchPoint"; isList: true; isReadonly: true }
-        Property { name: "minimumTouchPoints"; type: "int" }
-        Property { name: "maximumTouchPoints"; type: "int" }
-        Signal {
-            name: "touchPointsPressed"
-            Parameter { name: "touchPoints"; type: "QList<QObject*>" }
-        }
-        Signal {
-            name: "touchPointsUpdated"
-            Parameter { name: "touchPoints"; type: "QList<QObject*>" }
-        }
-        Signal {
-            name: "touchPointsReleased"
-            Parameter { name: "touchPoints"; type: "QList<QObject*>" }
-        }
-        Signal {
-            name: "touchPointsCanceled"
-            Parameter { name: "touchPoints"; type: "QList<QObject*>" }
-        }
-        Signal {
-            name: "gestureStarted"
-            Parameter { name: "gesture"; type: "QQuickGrabGestureEvent"; isPointer: true }
-        }
-        Signal {
-            name: "touchUpdated"
-            Parameter { name: "touchPoints"; type: "QList<QObject*>" }
-        }
-    }
-    Component {
-        name: "QQuickPaintedItem"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/PaintedItem 2.0"]
-        Enum {
-            name: "RenderTarget"
-            values: {
-                "Image": 0,
-                "FramebufferObject": 1,
-                "InvertedYFramebufferObject": 2
-            }
-        }
-        Property { name: "contentsSize"; type: "QSize" }
-        Property { name: "fillColor"; type: "QColor" }
-        Property { name: "contentsScale"; type: "qreal" }
-        Property { name: "renderTarget"; type: "RenderTarget" }
-    }
-    Component {
-        name: "QQuickParentAnimation"
-        defaultProperty: "animations"
-        prototype: "QDeclarativeAnimationGroup"
-        exports: ["QtQuick/ParentAnimation 2.0"]
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "newParent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "via"; type: "QQuickItem"; isPointer: true }
-    }
-    Component {
-        name: "QQuickParentChange"
-        prototype: "QDeclarativeStateOperation"
-        exports: ["QtQuick/ParentChange 2.0"]
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "parent"; type: "QQuickItem"; isPointer: true }
-        Property { name: "x"; type: "QDeclarativeScriptString" }
-        Property { name: "y"; type: "QDeclarativeScriptString" }
-        Property { name: "width"; type: "QDeclarativeScriptString" }
-        Property { name: "height"; type: "QDeclarativeScriptString" }
-        Property { name: "scale"; type: "QDeclarativeScriptString" }
-        Property { name: "rotation"; type: "QDeclarativeScriptString" }
-    }
-    Component {
-        name: "QQuickParticleAffector"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick.Particles/ParticleAffector 2.0"]
-        Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
-        Property { name: "groups"; type: "QStringList" }
-        Property { name: "whenCollidingWith"; type: "QStringList" }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "once"; type: "bool" }
-        Property { name: "shape"; type: "QQuickParticleExtruder"; isPointer: true }
-        Signal {
-            name: "systemChanged"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Signal {
-            name: "groupsChanged"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Signal {
-            name: "enabledChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "onceChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "shapeChanged"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-        Signal {
-            name: "affected"
-            Parameter { name: "x"; type: "qreal" }
-            Parameter { name: "y"; type: "qreal" }
-        }
-        Signal {
-            name: "whenCollidingWithChanged"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Method {
-            name: "setSystem"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Method {
-            name: "setGroups"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Method {
-            name: "setEnabled"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setOnceOff"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setShape"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-        Method {
-            name: "setWhenCollidingWith"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Method { name: "updateOffsets" }
-    }
-    Component {
-        name: "QQuickParticleEmitter"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick.Particles/Emitter 2.0"]
-        Enum {
-            name: "Lifetime"
-            values: {
-                "InfiniteLife": 600000
-            }
-        }
-        Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
-        Property { name: "group"; type: "string" }
-        Property { name: "shape"; type: "QQuickParticleExtruder"; isPointer: true }
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "startTime"; type: "int" }
-        Property { name: "emitRate"; type: "qreal" }
-        Property { name: "lifeSpan"; type: "int" }
-        Property { name: "lifeSpanVariation"; type: "int" }
-        Property { name: "maximumEmitted"; type: "int" }
-        Property { name: "size"; type: "qreal" }
-        Property { name: "endSize"; type: "qreal" }
-        Property { name: "sizeVariation"; type: "qreal" }
-        Property { name: "speed"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "acceleration"; type: "QQuickDirection"; isPointer: true }
-        Property { name: "speedFromMovement"; type: "qreal" }
-        Signal {
-            name: "emitParticles"
-            Parameter { name: "particles"; type: "QDeclarativeV8Handle" }
-        }
-        Signal {
-            name: "particlesPerSecondChanged"
-            Parameter { type: "qreal" }
-        }
-        Signal {
-            name: "particleDurationChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "enabledChanged"
-            Parameter { type: "bool" }
-        }
-        Signal {
-            name: "systemChanged"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Signal {
-            name: "groupChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Signal {
-            name: "particleDurationVariationChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "extruderChanged"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-        Signal {
-            name: "particleSizeChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "particleEndSizeChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "particleSizeVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "speedChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "accelerationChanged"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Signal {
-            name: "maximumEmittedChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal { name: "particleCountChanged" }
-        Signal {
-            name: "startTimeChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "pulse"
-            Parameter { name: "milliseconds"; type: "int" }
-        }
-        Method {
-            name: "burst"
-            Parameter { name: "num"; type: "int" }
-        }
-        Method {
-            name: "burst"
-            Parameter { name: "num"; type: "int" }
-            Parameter { name: "x"; type: "qreal" }
-            Parameter { name: "y"; type: "qreal" }
-        }
-        Method {
-            name: "setEnabled"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setParticlesPerSecond"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setParticleDuration"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setSystem"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Method {
-            name: "setGroup"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "setParticleDurationVariation"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setExtruder"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-        Method {
-            name: "setParticleSize"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setParticleEndSize"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setParticleSizeVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setSpeed"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setAcceleration"
-            Parameter { name: "arg"; type: "QQuickDirection"; isPointer: true }
-        }
-        Method {
-            name: "setMaxParticleCount"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setStartTime"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method { name: "reset" }
-    }
-    Component {
-        name: "QQuickParticleExtruder"
-        prototype: "QObject"
-        exports: ["QtQuick.Particles/ParticleExtruder 2.0"]
-    }
-    Component {
-        name: "QQuickParticleGroup"
-        defaultProperty: "particleChildren"
-        prototype: "QQuickStochasticState"
-        exports: ["QtQuick.Particles/ParticleGroup 2.0"]
-        Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
-        Property { name: "particleChildren"; type: "QObject"; isList: true; isReadonly: true }
-        Signal {
-            name: "maximumAliveChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "systemChanged"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Method {
-            name: "setMaximumAlive"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setSystem"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Method {
-            name: "delayRedirect"
-            Parameter { name: "obj"; type: "QObject"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickParticlePainter"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick.Particles/ParticlePainter 2.0"]
-        Property { name: "system"; type: "QQuickParticleSystem"; isPointer: true }
-        Property { name: "groups"; type: "QStringList" }
-        Signal { name: "countChanged" }
-        Signal {
-            name: "systemChanged"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Signal {
-            name: "groupsChanged"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Method {
-            name: "setSystem"
-            Parameter { name: "arg"; type: "QQuickParticleSystem"; isPointer: true }
-        }
-        Method {
-            name: "setGroups"
-            Parameter { name: "arg"; type: "QStringList" }
-        }
-        Method {
-            name: "calcSystemOffset"
-            Parameter { name: "resetPending"; type: "bool" }
-        }
-        Method { name: "calcSystemOffset" }
-    }
-    Component {
-        name: "QQuickParticleSystem"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick.Particles/ParticleSystem 2.0"]
-        Property { name: "running"; type: "bool" }
-        Property { name: "paused"; type: "bool" }
-        Property { name: "empty"; type: "bool"; isReadonly: true }
-        Signal { name: "systemInitialized" }
-        Signal {
-            name: "runningChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "pausedChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "emptyChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method { name: "start" }
-        Method { name: "stop" }
-        Method { name: "restart" }
-        Method { name: "pause" }
-        Method { name: "resume" }
-        Method { name: "reset" }
-        Method {
-            name: "setRunning"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setPaused"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method { name: "duration"; type: "int" }
-    }
-    Component {
-        name: "QQuickPathAnimation"
-        prototype: "QDeclarativeAbstractAnimation"
-        exports: ["QtQuick/PathAnimation 2.0"]
-        Enum {
-            name: "Orientation"
-            values: {
-                "Fixed": 0,
-                "RightFirst": 1,
-                "LeftFirst": 2,
-                "BottomFirst": 3,
-                "TopFirst": 4
-            }
-        }
-        Property { name: "duration"; type: "int" }
-        Property { name: "easing"; type: "QEasingCurve" }
-        Property { name: "path"; type: "QDeclarativePath"; isPointer: true }
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "orientation"; type: "Orientation" }
-        Property { name: "anchorPoint"; type: "QPointF" }
-        Property { name: "orientationEntryInterval"; type: "qreal" }
-        Property { name: "orientationExitInterval"; type: "qreal" }
-        Property { name: "endRotation"; type: "qreal" }
-        Signal {
-            name: "durationChanged"
-            Parameter { type: "int" }
-        }
-        Signal {
-            name: "easingChanged"
-            Parameter { type: "QEasingCurve" }
-        }
-        Signal {
-            name: "orientationChanged"
-            Parameter { type: "Orientation" }
-        }
-        Signal {
-            name: "anchorPointChanged"
-            Parameter { type: "QPointF" }
-        }
-        Signal {
-            name: "orientationEntryIntervalChanged"
-            Parameter { type: "qreal" }
-        }
-        Signal {
-            name: "orientationExitIntervalChanged"
-            Parameter { type: "qreal" }
-        }
-        Signal {
-            name: "endRotationChanged"
-            Parameter { type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickPathView"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/PathView 2.0"]
-        attachedType: "QQuickPathViewAttached"
-        Enum {
-            name: "HighlightRangeMode"
-            values: {
-                "NoHighlightRange": 0,
-                "ApplyRange": 1,
-                "StrictlyEnforceRange": 2
-            }
-        }
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "path"; type: "QDeclarativePath"; isPointer: true }
-        Property { name: "currentIndex"; type: "int" }
-        Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "offset"; type: "qreal" }
-        Property { name: "highlight"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "highlightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
-        Property { name: "preferredHighlightBegin"; type: "qreal" }
-        Property { name: "preferredHighlightEnd"; type: "qreal" }
-        Property { name: "highlightRangeMode"; type: "HighlightRangeMode" }
-        Property { name: "highlightMoveDuration"; type: "int" }
-        Property { name: "dragMargin"; type: "qreal" }
-        Property { name: "flickDeceleration"; type: "qreal" }
-        Property { name: "interactive"; type: "bool" }
-        Property { name: "moving"; type: "bool"; isReadonly: true }
-        Property { name: "flicking"; type: "bool"; isReadonly: true }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "pathItemCount"; type: "int" }
-        Signal { name: "snapPositionChanged" }
-        Signal { name: "movementStarted" }
-        Signal { name: "movementEnded" }
-        Signal { name: "flickStarted" }
-        Signal { name: "flickEnded" }
-        Method { name: "incrementCurrentIndex" }
-        Method { name: "decrementCurrentIndex" }
-    }
-    Component {
-        name: "QQuickPathViewAttached"
-        prototype: "QObject"
-        Property { name: "view"; type: "QQuickPathView"; isReadonly: true; isPointer: true }
-        Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
-        Property { name: "onPath"; type: "bool"; isReadonly: true }
-        Signal { name: "currentItemChanged" }
-        Signal { name: "pathChanged" }
-    }
-    Component {
-        name: "QQuickPen"
-        prototype: "QObject"
-        Property { name: "width"; type: "qreal" }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "aligned"; type: "bool" }
-        Signal { name: "penChanged" }
-    }
-    Component {
-        name: "QQuickPinch"
-        prototype: "QObject"
-        exports: ["QtQuick/Pinch 2.0"]
-        Enum {
-            name: "Axis"
-            values: {
-                "NoDrag": 0,
-                "XAxis": 1,
-                "YAxis": 2,
-                "XandYAxis": 3
-            }
-        }
-        Property { name: "target"; type: "QQuickItem"; isPointer: true }
-        Property { name: "minimumScale"; type: "qreal" }
-        Property { name: "maximumScale"; type: "qreal" }
-        Property { name: "minimumRotation"; type: "qreal" }
-        Property { name: "maximumRotation"; type: "qreal" }
-        Property { name: "dragAxis"; type: "Axis" }
-        Property { name: "minimumX"; type: "qreal" }
-        Property { name: "maximumX"; type: "qreal" }
-        Property { name: "minimumY"; type: "qreal" }
-        Property { name: "maximumY"; type: "qreal" }
-        Property { name: "active"; type: "bool"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickPinchArea"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/PinchArea 2.0"]
-        Property { name: "enabled"; type: "bool" }
-        Property { name: "pinch"; type: "QQuickPinch"; isReadonly: true; isPointer: true }
-        Signal {
-            name: "pinchStarted"
-            Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pinchUpdated"
-            Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
-        }
-        Signal {
-            name: "pinchFinished"
-            Parameter { name: "pinch"; type: "QQuickPinchEvent"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickPointDirection"
-        prototype: "QQuickDirection"
-        exports: ["QtQuick.Particles/PointDirection 2.0"]
-        Property { name: "x"; type: "qreal" }
-        Property { name: "y"; type: "qreal" }
-        Property { name: "xVariation"; type: "qreal" }
-        Property { name: "yVariation"; type: "qreal" }
-        Signal {
-            name: "xChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "yChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "xVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "yVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setX"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setY"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setXVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setYVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-    }
-    Component {
-        name: "QQuickPositionerAttached"
-        prototype: "QObject"
-        Property { name: "index"; type: "int"; isReadonly: true }
-        Property { name: "isFirstItem"; type: "bool"; isReadonly: true }
-        Property { name: "isLastItem"; type: "bool"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickRectangle"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/Rectangle 2.0"]
-        Property { name: "color"; type: "QColor" }
-        Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
-        Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
-        Property { name: "radius"; type: "qreal" }
-    }
-    Component {
-        name: "QQuickRectangleExtruder"
-        prototype: "QQuickParticleExtruder"
-        exports: ["QtQuick.Particles/RectangleShape 2.0"]
-        Property { name: "fill"; type: "bool" }
-        Signal {
-            name: "fillChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setFill"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickRepeater"
-        defaultProperty: "delegate"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/Repeater 2.0"]
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Signal {
-            name: "itemAdded"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "itemRemoved"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "itemAt"
-            type: "QQuickItem*"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickRotation"
-        prototype: "QQuickTransform"
-        exports: ["QtQuick/Rotation 2.0"]
-        Property { name: "origin"; type: "QVector3D" }
-        Property { name: "angle"; type: "qreal" }
-        Property { name: "axis"; type: "QVector3D" }
-    }
-    Component {
-        name: "QQuickRow"
-        defaultProperty: "data"
-        prototype: "QQuickBasePositioner"
-        exports: ["QtQuick/Row 2.0"]
-        Property { name: "layoutDirection"; type: "Qt::LayoutDirection" }
-        Property { name: "effectiveLayoutDirection"; type: "Qt::LayoutDirection"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickScale"
-        prototype: "QQuickTransform"
-        exports: ["QtQuick/Scale 2.0"]
-        Property { name: "origin"; type: "QVector3D" }
-        Property { name: "xScale"; type: "qreal" }
-        Property { name: "yScale"; type: "qreal" }
-        Property { name: "zScale"; type: "qreal" }
-        Signal { name: "scaleChanged" }
-    }
-    Component {
-        name: "QQuickScaleGrid"
-        prototype: "QObject"
-        Property { name: "left"; type: "int" }
-        Property { name: "top"; type: "int" }
-        Property { name: "right"; type: "int" }
-        Property { name: "bottom"; type: "int" }
-        Signal { name: "borderChanged" }
-    }
-    Component {
-        name: "QQuickShaderEffect"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/ShaderEffect 2.0"]
-        Enum {
-            name: "CullMode"
-            values: {
-                "NoCulling": 0,
-                "BackFaceCulling": 1,
-                "FrontFaceCulling": 2
-            }
-        }
-        Property { name: "fragmentShader"; type: "QByteArray" }
-        Property { name: "vertexShader"; type: "QByteArray" }
-        Property { name: "blending"; type: "bool" }
-        Property { name: "mesh"; type: "QVariant" }
-        Property { name: "culling"; type: "CullMode" }
-        Signal { name: "cullModeChanged" }
-    }
-    Component {
-        name: "QQuickShaderEffectMesh"
-        prototype: "QObject"
-        exports: ["QtQuick/ShaderEffectMesh 2.0"]
-        Signal { name: "geometryChanged" }
-    }
-    Component {
-        name: "QQuickShaderEffectSource"
-        defaultProperty: "data"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/ShaderEffectSource 2.0"]
-        Enum {
-            name: "WrapMode"
-            values: {
-                "ClampToEdge": 0,
-                "RepeatHorizontally": 1,
-                "RepeatVertically": 2,
-                "Repeat": 3
-            }
-        }
-        Enum {
-            name: "Format"
-            values: {
-                "Alpha": 6406,
-                "RGB": 6407,
-                "RGBA": 6408
-            }
-        }
-        Property { name: "wrapMode"; type: "WrapMode" }
-        Property { name: "sourceItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "sourceRect"; type: "QRectF" }
-        Property { name: "textureSize"; type: "QSize" }
-        Property { name: "format"; type: "Format" }
-        Property { name: "live"; type: "bool" }
-        Property { name: "hideSource"; type: "bool" }
-        Property { name: "mipmap"; type: "bool" }
-        Property { name: "recursive"; type: "bool" }
-        Signal { name: "scheduledUpdateCompleted" }
-        Method { name: "scheduleUpdate" }
-    }
-    Component {
-        name: "QQuickSprite"
-        prototype: "QQuickStochasticState"
-        exports: ["QtQuick/Sprite 2.0"]
-        Property { name: "source"; type: "QUrl" }
-        Property { name: "frameHeight"; type: "int" }
-        Property { name: "frameWidth"; type: "int" }
-        Signal {
-            name: "sourceChanged"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-        Signal {
-            name: "frameHeightChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "frameWidthChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setSource"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-        Method {
-            name: "setFrameHeight"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setFrameWidth"
-            Parameter { name: "arg"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickSpriteGoalAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/SpriteGoal 2.0"]
-        Property { name: "goalState"; type: "string" }
-        Property { name: "jump"; type: "bool" }
-        Property { name: "systemStates"; type: "bool" }
-        Signal {
-            name: "goalStateChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Signal {
-            name: "jumpChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "systemStatesChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setGoalState"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "setJump"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setSystemStates"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickSpriteImage"
-        defaultProperty: "sprites"
-        prototype: "QQuickItem"
-        exports: ["QtQuick/SpriteImage 2.0"]
-        Property { name: "running"; type: "bool" }
-        Property { name: "interpolate"; type: "bool" }
-        Property { name: "goalState"; type: "string" }
-        Property { name: "sprites"; type: "QQuickSprite"; isList: true; isReadonly: true }
-        Signal {
-            name: "runningChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "interpolateChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "goalStateChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "jumpTo"
-            Parameter { name: "sprite"; type: "string" }
-        }
-        Method {
-            name: "setGoalState"
-            Parameter { name: "sprite"; type: "string" }
-        }
-        Method {
-            name: "setRunning"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setInterpolate"
-            Parameter { name: "arg"; type: "bool" }
-        }
-    }
-    Component {
-        name: "QQuickStochasticState"
-        prototype: "QObject"
-        Property { name: "duration"; type: "int" }
-        Property { name: "durationVariation"; type: "int" }
-        Property { name: "to"; type: "QVariantMap" }
-        Property { name: "name"; type: "string" }
-        Property { name: "speedModifiesDuration"; type: "qreal" }
-        Property { name: "frames"; type: "int" }
-        Signal {
-            name: "durationChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "nameChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Signal {
-            name: "toChanged"
-            Parameter { name: "arg"; type: "QVariantMap" }
-        }
-        Signal {
-            name: "speedModifierChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "durationVarianceChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal { name: "entered" }
-        Signal {
-            name: "framesChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setDuration"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setName"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "setTo"
-            Parameter { name: "arg"; type: "QVariantMap" }
-        }
-        Method {
-            name: "setSpeedModifier"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setDurationVariance"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setFrames"
-            Parameter { name: "arg"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickTargetDirection"
-        prototype: "QQuickDirection"
-        exports: ["QtQuick.Particles/TargetDirection 2.0"]
-        Property { name: "targetX"; type: "qreal" }
-        Property { name: "targetY"; type: "qreal" }
-        Property { name: "targetItem"; type: "QQuickItem"; isPointer: true }
-        Property { name: "targetVariation"; type: "qreal" }
-        Property { name: "proportionalMagnitude"; type: "bool" }
-        Property { name: "magnitude"; type: "qreal" }
-        Property { name: "magnitudeVariation"; type: "qreal" }
-        Signal {
-            name: "targetXChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "targetYChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "targetVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "magnitudeChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "proprotionalMagnitudeChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "magnitudeVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "targetItemChanged"
-            Parameter { name: "arg"; type: "QQuickItem"; isPointer: true }
-        }
-        Method {
-            name: "setTargetX"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setTargetY"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setTargetVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setMagnitude"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setProportionalMagnitude"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Method {
-            name: "setMagnitudeVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setTargetItem"
-            Parameter { name: "arg"; type: "QQuickItem"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickText"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/Text 2.0"]
-        Enum {
-            name: "HAlignment"
-            values: {
-                "AlignLeft": 1,
-                "AlignRight": 2,
-                "AlignHCenter": 4,
-                "AlignJustify": 8
-            }
-        }
-        Enum {
-            name: "VAlignment"
-            values: {
-                "AlignTop": 32,
-                "AlignBottom": 64,
-                "AlignVCenter": 128
-            }
-        }
-        Enum {
-            name: "TextStyle"
-            values: {
-                "Normal": 0,
-                "Outline": 1,
-                "Raised": 2,
-                "Sunken": 3
-            }
-        }
-        Enum {
-            name: "TextFormat"
-            values: {
-                "PlainText": 0,
-                "RichText": 1,
-                "AutoText": 2,
-                "StyledText": 4
-            }
-        }
-        Enum {
-            name: "TextElideMode"
-            values: {
-                "ElideLeft": 0,
-                "ElideRight": 1,
-                "ElideMiddle": 2,
-                "ElideNone": 3
-            }
-        }
-        Enum {
-            name: "WrapMode"
-            values: {
-                "NoWrap": 0,
-                "WordWrap": 1,
-                "WrapAnywhere": 3,
-                "WrapAtWordBoundaryOrAnywhere": 4,
-                "Wrap": 4
-            }
-        }
-        Enum {
-            name: "LineHeightMode"
-            values: {
-                "ProportionalHeight": 0,
-                "FixedHeight": 1
-            }
-        }
-        Property { name: "text"; type: "string" }
-        Property { name: "font"; type: "QFont" }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "style"; type: "TextStyle" }
-        Property { name: "styleColor"; type: "QColor" }
-        Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
-        Property { name: "verticalAlignment"; type: "VAlignment" }
-        Property { name: "wrapMode"; type: "WrapMode" }
-        Property { name: "lineCount"; type: "int"; isReadonly: true }
-        Property { name: "truncated"; type: "bool"; isReadonly: true }
-        Property { name: "maximumLineCount"; type: "int" }
-        Property { name: "textFormat"; type: "TextFormat" }
-        Property { name: "elide"; type: "TextElideMode" }
-        Property { name: "paintedWidth"; type: "qreal"; isReadonly: true }
-        Property { name: "paintedHeight"; type: "qreal"; isReadonly: true }
-        Property { name: "lineHeight"; type: "qreal" }
-        Property { name: "lineHeightMode"; type: "LineHeightMode" }
-        Signal {
-            name: "textChanged"
-            Parameter { name: "text"; type: "string" }
-        }
-        Signal {
-            name: "linkActivated"
-            Parameter { name: "link"; type: "string" }
-        }
-        Signal {
-            name: "fontChanged"
-            Parameter { name: "font"; type: "QFont" }
-        }
-        Signal {
-            name: "colorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "styleChanged"
-            Parameter { name: "style"; type: "TextStyle" }
-        }
-        Signal {
-            name: "styleColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
-        }
-        Signal {
-            name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
-        }
-        Signal {
-            name: "textFormatChanged"
-            Parameter { name: "textFormat"; type: "TextFormat" }
-        }
-        Signal {
-            name: "elideModeChanged"
-            Parameter { name: "mode"; type: "TextElideMode" }
-        }
-        Signal { name: "paintedSizeChanged" }
-        Signal {
-            name: "lineHeightChanged"
-            Parameter { name: "lineHeight"; type: "qreal" }
-        }
-        Signal {
-            name: "lineHeightModeChanged"
-            Parameter { name: "mode"; type: "LineHeightMode" }
-        }
-        Signal {
-            name: "lineLaidOut"
-            Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true }
-        }
-        Method { name: "doLayout" }
-    }
-    Component {
-        name: "QQuickTextEdit"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/TextEdit 2.0"]
-        Enum {
-            name: "HAlignment"
-            values: {
-                "AlignLeft": 1,
-                "AlignRight": 2,
-                "AlignHCenter": 4,
-                "AlignJustify": 8
-            }
-        }
-        Enum {
-            name: "VAlignment"
-            values: {
-                "AlignTop": 32,
-                "AlignBottom": 64,
-                "AlignVCenter": 128
-            }
-        }
-        Enum {
-            name: "TextFormat"
-            values: {
-                "PlainText": 0,
-                "RichText": 1,
-                "AutoText": 2
-            }
-        }
-        Enum {
-            name: "WrapMode"
-            values: {
-                "NoWrap": 0,
-                "WordWrap": 1,
-                "WrapAnywhere": 3,
-                "WrapAtWordBoundaryOrAnywhere": 4,
-                "Wrap": 4
-            }
-        }
-        Enum {
-            name: "SelectionMode"
-            values: {
-                "SelectCharacters": 0,
-                "SelectWords": 1
-            }
-        }
-        Property { name: "text"; type: "string" }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "selectionColor"; type: "QColor" }
-        Property { name: "selectedTextColor"; type: "QColor" }
-        Property { name: "font"; type: "QFont" }
-        Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
-        Property { name: "verticalAlignment"; type: "VAlignment" }
-        Property { name: "wrapMode"; type: "WrapMode" }
-        Property { name: "lineCount"; type: "int"; isReadonly: true }
-        Property { name: "length"; type: "int"; isReadonly: true }
-        Property { name: "paintedWidth"; type: "qreal"; isReadonly: true }
-        Property { name: "paintedHeight"; type: "qreal"; isReadonly: true }
-        Property { name: "textFormat"; type: "TextFormat" }
-        Property { name: "readOnly"; type: "bool" }
-        Property { name: "cursorVisible"; type: "bool" }
-        Property { name: "cursorPosition"; type: "int" }
-        Property { name: "cursorRectangle"; type: "QRect"; isReadonly: true }
-        Property { name: "cursorDelegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "selectionStart"; type: "int"; isReadonly: true }
-        Property { name: "selectionEnd"; type: "int"; isReadonly: true }
-        Property { name: "selectedText"; type: "string"; isReadonly: true }
-        Property { name: "activeFocusOnPress"; type: "bool" }
-        Property { name: "persistentSelection"; type: "bool" }
-        Property { name: "textMargin"; type: "qreal" }
-        Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
-        Property { name: "selectByMouse"; type: "bool" }
-        Property { name: "mouseSelectionMode"; type: "SelectionMode" }
-        Property { name: "canPaste"; type: "bool"; isReadonly: true }
-        Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
-        Signal {
-            name: "textChanged"
-            Parameter { type: "string" }
-        }
-        Signal { name: "paintedSizeChanged" }
-        Signal { name: "selectionChanged" }
-        Signal {
-            name: "colorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "selectionColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "selectedTextColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "fontChanged"
-            Parameter { name: "font"; type: "QFont" }
-        }
-        Signal {
-            name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
-        }
-        Signal {
-            name: "verticalAlignmentChanged"
-            Parameter { name: "alignment"; type: "VAlignment" }
-        }
-        Signal {
-            name: "textFormatChanged"
-            Parameter { name: "textFormat"; type: "TextFormat" }
-        }
-        Signal {
-            name: "readOnlyChanged"
-            Parameter { name: "isReadOnly"; type: "bool" }
-        }
-        Signal {
-            name: "cursorVisibleChanged"
-            Parameter { name: "isCursorVisible"; type: "bool" }
-        }
-        Signal {
-            name: "activeFocusOnPressChanged"
-            Parameter { name: "activeFocusOnPressed"; type: "bool" }
-        }
-        Signal {
-            name: "persistentSelectionChanged"
-            Parameter { name: "isPersistentSelection"; type: "bool" }
-        }
-        Signal {
-            name: "textMarginChanged"
-            Parameter { name: "textMargin"; type: "qreal" }
-        }
-        Signal {
-            name: "selectByMouseChanged"
-            Parameter { name: "selectByMouse"; type: "bool" }
-        }
-        Signal {
-            name: "mouseSelectionModeChanged"
-            Parameter { name: "mode"; type: "SelectionMode" }
-        }
-        Signal {
-            name: "linkActivated"
-            Parameter { name: "link"; type: "string" }
-        }
-        Method { name: "selectAll" }
-        Method { name: "selectWord" }
-        Method {
-            name: "select"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "deselect" }
-        Method {
-            name: "isRightToLeft"
-            type: "bool"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "cut" }
-        Method { name: "copy" }
-        Method { name: "paste" }
-        Method {
-            name: "insert"
-            Parameter { name: "position"; type: "int" }
-            Parameter { name: "text"; type: "string" }
-        }
-        Method {
-            name: "remove"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "openSoftwareInputPanel" }
-        Method { name: "closeSoftwareInputPanel" }
-        Method {
-            name: "positionToRectangle"
-            type: "QRectF"
-            Parameter { type: "int" }
-        }
-        Method {
-            name: "positionAt"
-            type: "int"
-            Parameter { name: "x"; type: "int" }
-            Parameter { name: "y"; type: "int" }
-        }
-        Method {
-            name: "moveCursorSelection"
-            Parameter { name: "pos"; type: "int" }
-        }
-        Method {
-            name: "moveCursorSelection"
-            Parameter { name: "pos"; type: "int" }
-            Parameter { name: "mode"; type: "SelectionMode" }
-        }
-        Method {
-            name: "getText"
-            type: "string"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method {
-            name: "getFormattedText"
-            type: "string"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickTextInput"
-        defaultProperty: "data"
-        prototype: "QQuickImplicitSizeItem"
-        exports: ["QtQuick/TextInput 2.0"]
-        Enum {
-            name: "EchoMode"
-            values: {
-                "Normal": 0,
-                "NoEcho": 1,
-                "Password": 2,
-                "PasswordEchoOnEdit": 3
-            }
-        }
-        Enum {
-            name: "HAlignment"
-            values: {
-                "AlignLeft": 1,
-                "AlignRight": 2,
-                "AlignHCenter": 4
-            }
-        }
-        Enum {
-            name: "SelectionMode"
-            values: {
-                "SelectCharacters": 0,
-                "SelectWords": 1
-            }
-        }
-        Property { name: "text"; type: "string" }
-        Property { name: "color"; type: "QColor" }
-        Property { name: "selectionColor"; type: "QColor" }
-        Property { name: "selectedTextColor"; type: "QColor" }
-        Property { name: "font"; type: "QFont" }
-        Property { name: "horizontalAlignment"; type: "HAlignment" }
-        Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
-        Property { name: "readOnly"; type: "bool" }
-        Property { name: "cursorVisible"; type: "bool" }
-        Property { name: "cursorPosition"; type: "int" }
-        Property { name: "cursorRectangle"; type: "QRect"; isReadonly: true }
-        Property { name: "cursorDelegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "selectionStart"; type: "int"; isReadonly: true }
-        Property { name: "selectionEnd"; type: "int"; isReadonly: true }
-        Property { name: "selectedText"; type: "string"; isReadonly: true }
-        Property { name: "maximumLength"; type: "int" }
-        Property { name: "validator"; type: "QValidator"; isPointer: true }
-        Property { name: "inputMask"; type: "string" }
-        Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
-        Property { name: "acceptableInput"; type: "bool"; isReadonly: true }
-        Property { name: "echoMode"; type: "EchoMode" }
-        Property { name: "activeFocusOnPress"; type: "bool" }
-        Property { name: "passwordCharacter"; type: "string" }
-        Property { name: "displayText"; type: "string"; isReadonly: true }
-        Property { name: "autoScroll"; type: "bool" }
-        Property { name: "selectByMouse"; type: "bool" }
-        Property { name: "mouseSelectionMode"; type: "SelectionMode" }
-        Property { name: "canPaste"; type: "bool"; isReadonly: true }
-        Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
-        Signal { name: "accepted" }
-        Signal {
-            name: "colorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "selectionColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "selectedTextColorChanged"
-            Parameter { name: "color"; type: "QColor" }
-        }
-        Signal {
-            name: "fontChanged"
-            Parameter { name: "font"; type: "QFont" }
-        }
-        Signal {
-            name: "horizontalAlignmentChanged"
-            Parameter { name: "alignment"; type: "HAlignment" }
-        }
-        Signal {
-            name: "readOnlyChanged"
-            Parameter { name: "isReadOnly"; type: "bool" }
-        }
-        Signal {
-            name: "cursorVisibleChanged"
-            Parameter { name: "isCursorVisible"; type: "bool" }
-        }
-        Signal {
-            name: "maximumLengthChanged"
-            Parameter { name: "maximumLength"; type: "int" }
-        }
-        Signal {
-            name: "inputMaskChanged"
-            Parameter { name: "inputMask"; type: "string" }
-        }
-        Signal {
-            name: "echoModeChanged"
-            Parameter { name: "echoMode"; type: "EchoMode" }
-        }
-        Signal {
-            name: "activeFocusOnPressChanged"
-            Parameter { name: "activeFocusOnPress"; type: "bool" }
-        }
-        Signal {
-            name: "autoScrollChanged"
-            Parameter { name: "autoScroll"; type: "bool" }
-        }
-        Signal {
-            name: "selectByMouseChanged"
-            Parameter { name: "selectByMouse"; type: "bool" }
-        }
-        Signal {
-            name: "mouseSelectionModeChanged"
-            Parameter { name: "mode"; type: "SelectionMode" }
-        }
-        Method { name: "selectAll" }
-        Method { name: "selectWord" }
-        Method {
-            name: "select"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "deselect" }
-        Method {
-            name: "isRightToLeft"
-            type: "bool"
-            Parameter { name: "start"; type: "int" }
-            Parameter { name: "end"; type: "int" }
-        }
-        Method { name: "cut" }
-        Method { name: "copy" }
-        Method { name: "paste" }
-        Method {
-            name: "positionAt"
-            type: "int"
-            Parameter { name: "x"; type: "int" }
-        }
-        Method {
-            name: "positionAt"
-            type: "int"
-            Parameter { name: "x"; type: "int" }
-            Parameter { name: "position"; type: "CursorPosition" }
-        }
-        Method {
-            name: "positionToRectangle"
-            type: "QRectF"
-            Parameter { name: "pos"; type: "int" }
-        }
-        Method {
-            name: "moveCursorSelection"
-            Parameter { name: "pos"; type: "int" }
-        }
-        Method {
-            name: "moveCursorSelection"
-            Parameter { name: "pos"; type: "int" }
-            Parameter { name: "mode"; type: "SelectionMode" }
-        }
-        Method { name: "openSoftwareInputPanel" }
-        Method { name: "closeSoftwareInputPanel" }
-    }
-    Component {
-        name: "QQuickTouchPoint"
-        prototype: "QObject"
-        exports: ["QtQuick/TouchPoint 2.0"]
-        Property { name: "valid"; type: "bool"; isReadonly: true }
-        Property { name: "pointId"; type: "int"; isReadonly: true }
-        Property { name: "x"; type: "qreal"; isReadonly: true }
-        Property { name: "y"; type: "qreal"; isReadonly: true }
-        Property { name: "pressure"; type: "qreal"; isReadonly: true }
-        Property { name: "area"; type: "QRectF"; isReadonly: true }
-        Property { name: "startX"; type: "qreal"; isReadonly: true }
-        Property { name: "startY"; type: "qreal"; isReadonly: true }
-        Property { name: "previousX"; type: "qreal"; isReadonly: true }
-        Property { name: "previousY"; type: "qreal"; isReadonly: true }
-        Property { name: "sceneX"; type: "qreal"; isReadonly: true }
-        Property { name: "sceneY"; type: "qreal"; isReadonly: true }
-        Signal { name: "validityChanged" }
-    }
-    Component {
-        name: "QQuickTrailEmitter"
-        defaultProperty: "data"
-        prototype: "QQuickParticleEmitter"
-        exports: ["QtQuick.Particles/TrailEmitter 2.0"]
-        Enum {
-            name: "EmitSize"
-            values: {
-                "ParticleSize": -2
-            }
-        }
-        Property { name: "follow"; type: "string" }
-        Property { name: "emitRatePerParticle"; type: "int" }
-        Property { name: "emitShape"; type: "QQuickParticleExtruder"; isPointer: true }
-        Property { name: "emitHeight"; type: "qreal" }
-        Property { name: "emitWidth"; type: "qreal" }
-        Signal {
-            name: "emitFollowParticles"
-            Parameter { name: "particles"; type: "QDeclarativeV8Handle" }
-            Parameter { name: "followed"; type: "QDeclarativeV8Handle" }
-        }
-        Signal {
-            name: "particlesPerParticlePerSecondChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "emitterXVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "emitterYVariationChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "followChanged"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Signal {
-            name: "emissionShapeChanged"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-        Method {
-            name: "setParticlesPerParticlePerSecond"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setEmitterXVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setEmitterYVariation"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setFollow"
-            Parameter { name: "arg"; type: "string" }
-        }
-        Method {
-            name: "setEmissionShape"
-            Parameter { name: "arg"; type: "QQuickParticleExtruder"; isPointer: true }
-        }
-    }
-    Component { name: "QQuickTransform"; prototype: "QObject" }
-    Component {
-        name: "QQuickTranslate"
-        prototype: "QQuickTransform"
-        exports: ["QtQuick/Translate 2.0"]
-        Property { name: "x"; type: "qreal" }
-        Property { name: "y"; type: "qreal" }
-    }
-    Component {
-        name: "QQuickTurbulenceAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Turbulence 2.0"]
-        Property { name: "strength"; type: "qreal" }
-        Property { name: "noiseSource"; type: "QUrl" }
-        Signal {
-            name: "strengthChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "noiseSourceChanged"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-        Method {
-            name: "setStrength"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setNoiseSource"
-            Parameter { name: "arg"; type: "QUrl" }
-        }
-    }
-    Component {
-        name: "QQuickViewSection"
-        prototype: "QObject"
-        exports: ["QtQuick/ViewSection 2.0"]
-        Enum {
-            name: "SectionCriteria"
-            values: {
-                "FullString": 0,
-                "FirstCharacter": 1
-            }
-        }
-        Enum {
-            name: "LabelPositioning"
-            values: {
-                "InlineLabels": 1,
-                "CurrentLabelAtStart": 2,
-                "NextLabelAtEnd": 4
-            }
-        }
-        Property { name: "property"; type: "string" }
-        Property { name: "criteria"; type: "SectionCriteria" }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "labelPositioning"; type: "int" }
-    }
-    Component {
-        name: "QQuickVisualDataGroup"
-        prototype: "QObject"
-        exports: ["QtQuick/VisualDataGroup 2.0"]
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Property { name: "name"; type: "string" }
-        Property { name: "includeByDefault"; type: "bool" }
-        Signal { name: "defaultIncludeChanged" }
-        Signal {
-            name: "changed"
-            Parameter { name: "removed"; type: "QDeclarativeV8Handle" }
-            Parameter { name: "inserted"; type: "QDeclarativeV8Handle" }
-        }
-        Method {
-            name: "remove"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "addGroups"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "removeGroups"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "setGroups"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "move"
-            Parameter { type: "QDeclarativeV8Function"; isPointer: true }
-        }
-        Method {
-            name: "get"
-            type: "QDeclarativeV8Handle"
-            Parameter { name: "index"; type: "int" }
-        }
-        Method {
-            name: "create"
-            type: "QObject*"
-            Parameter { name: "index"; type: "int" }
-        }
-    }
-    Component {
-        name: "QQuickVisualDataModel"
-        defaultProperty: "delegate"
-        prototype: "QQuickVisualModel"
-        exports: ["QtQuick/VisualDataModel 2.0"]
-        attachedType: "QQuickVisualDataModelAttached"
-        Property { name: "model"; type: "QVariant" }
-        Property { name: "delegate"; type: "QDeclarativeComponent"; isPointer: true }
-        Property { name: "filterOnGroup"; type: "string" }
-        Property { name: "items"; type: "QQuickVisualDataGroup"; isReadonly: true; isPointer: true }
-        Property {
-            name: "persistedItems"
-            type: "QQuickVisualDataGroup"
-            isReadonly: true
-            isPointer: true
-        }
-        Property { name: "groups"; type: "QQuickVisualDataGroup"; isList: true; isReadonly: true }
-        Property { name: "parts"; type: "QObject"; isReadonly: true; isPointer: true }
-        Property { name: "rootIndex"; type: "QVariant" }
-        Signal { name: "filterGroupChanged" }
-        Signal { name: "defaultGroupsChanged" }
-        Method {
-            name: "modelIndex"
-            type: "QVariant"
-            Parameter { name: "idx"; type: "int" }
-        }
-        Method { name: "parentModelIndex"; type: "QVariant" }
-    }
-    Component {
-        name: "QQuickVisualDataModelAttached"
-        prototype: "QObject"
-        Property { name: "model"; type: "QQuickVisualDataModel"; isReadonly: true; isPointer: true }
-        Property { name: "groups"; type: "QStringList" }
-    }
-    Component { name: "QQuickVisualDataModelParts"; prototype: "QObject" }
-    Component {
-        name: "QQuickVisualItemModel"
-        defaultProperty: "children"
-        prototype: "QQuickVisualModel"
-        exports: ["QtQuick/VisualItemModel 2.0"]
-        attachedType: "QQuickVisualItemModelAttached"
-        Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
-    }
-    Component {
-        name: "QQuickVisualItemModelAttached"
-        prototype: "QObject"
-        Property { name: "index"; type: "int"; isReadonly: true }
-    }
-    Component {
-        name: "QQuickVisualModel"
-        prototype: "QObject"
-        Property { name: "count"; type: "int"; isReadonly: true }
-        Signal {
-            name: "modelUpdated"
-            Parameter { name: "changeSet"; type: "QDeclarativeChangeSet" }
-            Parameter { name: "reset"; type: "bool" }
-        }
-        Signal {
-            name: "createdItem"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "initItem"
-            Parameter { name: "index"; type: "int" }
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-        Signal {
-            name: "destroyingItem"
-            Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
-        }
-    }
-    Component {
-        name: "QQuickWanderAffector"
-        defaultProperty: "data"
-        prototype: "QQuickParticleAffector"
-        exports: ["QtQuick.Particles/Wander 2.0"]
-        Enum {
-            name: "AffectableParameters"
-            values: {
-                "Position": 0,
-                "Velocity": 1,
-                "Acceleration": 2
-            }
-        }
-        Property { name: "pace"; type: "qreal" }
-        Property { name: "xVariance"; type: "qreal" }
-        Property { name: "yVariance"; type: "qreal" }
-        Property { name: "affectedParameter"; type: "AffectableParameters" }
-        Signal {
-            name: "xVarianceChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "yVarianceChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "paceChanged"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Signal {
-            name: "affectedParameterChanged"
-            Parameter { name: "arg"; type: "AffectableParameters" }
-        }
-        Method {
-            name: "setXVariance"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setYVariance"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setPace"
-            Parameter { name: "arg"; type: "qreal" }
-        }
-        Method {
-            name: "setAffectedParameter"
-            Parameter { name: "arg"; type: "AffectableParameters" }
+            name: "destroyed"
+            Parameter { type: "QObject"; isPointer: true }
         }
+        Signal { name: "destroyed" }
+        Method { name: "deleteLater" }
     }
     Component {
         name: "QRegExpValidator"
         prototype: "QValidator"
         exports: [
-            "QtQuick/RegExpValidator 1.0",
-            "QtQuick/RegExpValidator 2.0"
+            "QtQuick/RegExpValidator 1.0"
+        ]
+        exportMetaObjectRevisions: [
+            0
         ]
         Property { name: "regExp"; type: "QRegExp" }
-        Signal {
-            name: "regExpChanged"
-            Parameter { name: "regExp"; type: "QRegExp" }
-        }
     }
     Component { name: "QValidator"; prototype: "QObject" }
     Component {
-        name: "QWindow"
-        prototype: "QObject"
-        Property { name: "windowTitle"; type: "string" }
-        Property { name: "x"; type: "int" }
-        Property { name: "y"; type: "int" }
-        Property { name: "width"; type: "int" }
-        Property { name: "height"; type: "int" }
-        Property { name: "visible"; type: "bool" }
-        Property { name: "orientation"; type: "Qt::ScreenOrientation" }
-        Signal { name: "backBufferReady" }
-        Signal {
-            name: "xChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "yChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "widthChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "heightChanged"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Signal {
-            name: "visibleChanged"
-            Parameter { name: "arg"; type: "bool" }
-        }
-        Signal {
-            name: "orientationChanged"
-            Parameter { name: "arg"; type: "Qt::ScreenOrientation" }
-        }
-        Method {
-            name: "setVisible"
-            Parameter { name: "visible"; type: "bool" }
-        }
-        Method { name: "show" }
-        Method { name: "hide" }
-        Method { name: "showMinimized" }
-        Method { name: "showMaximized" }
-        Method { name: "showFullScreen" }
-        Method { name: "showNormal" }
-        Method { name: "close"; type: "bool" }
-        Method { name: "raise" }
-        Method { name: "lower" }
-        Method {
-            name: "setWindowTitle"
-            Parameter { type: "string" }
-        }
-        Method {
-            name: "setX"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setY"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setWidth"
-            Parameter { name: "arg"; type: "int" }
-        }
-        Method {
-            name: "setHeight"
-            Parameter { name: "arg"; type: "int" }
-        }
-    }
-    Component {
         name: "Qt"
         Enum {
             name: "GlobalColor"
@@ -6674,36 +3280,8 @@ Module {
                 "MidButton": 4,
                 "MiddleButton": 4,
                 "XButton1": 8,
-                "BackButton": 8,
-                "ExtraButton1": 8,
                 "XButton2": 16,
-                "ForwardButton": 16,
-                "ExtraButton2": 16,
-                "TaskButton": 32,
-                "ExtraButton3": 32,
-                "ExtraButton4": 64,
-                "ExtraButton5": 128,
-                "ExtraButton6": 256,
-                "ExtraButton7": 512,
-                "ExtraButton8": 1024,
-                "ExtraButton9": 2048,
-                "ExtraButton10": 4096,
-                "ExtraButton11": 8192,
-                "ExtraButton12": 16384,
-                "ExtraButton13": 32768,
-                "ExtraButton14": 65536,
-                "ExtraButton15": 131072,
-                "ExtraButton16": 262144,
-                "ExtraButton17": 524288,
-                "ExtraButton18": 1048576,
-                "ExtraButton19": 2097152,
-                "ExtraButton20": 4194304,
-                "ExtraButton21": 8388608,
-                "ExtraButton22": 16777216,
-                "ExtraButton23": 33554432,
-                "ExtraButton24": 67108864,
-                "MaxMouseButton": 67108864,
-                "MouseButtonMask": -1
+                "MouseButtonMask": 255
             }
         }
         Enum {
@@ -6791,7 +3369,6 @@ Module {
                 "WindowContextHelpButtonHint": 65536,
                 "WindowShadeButtonHint": 131072,
                 "WindowStaysOnTopHint": 262144,
-                "WindowTransparentForInput": 524288,
                 "CustomizeWindowHint": 33554432,
                 "WindowStaysOnBottomHint": 67108864,
                 "WindowCloseButtonHint": 134217728,
@@ -6830,7 +3407,6 @@ Module {
                 "WindowContextHelpButtonHint": 65536,
                 "WindowShadeButtonHint": 131072,
                 "WindowStaysOnTopHint": 262144,
-                "WindowTransparentForInput": 524288,
                 "CustomizeWindowHint": 33554432,
                 "WindowStaysOnBottomHint": 67108864,
                 "WindowCloseButtonHint": 134217728,
@@ -6863,26 +3439,6 @@ Module {
             }
         }
         Enum {
-            name: "ScreenOrientation"
-            values: {
-                "UnknownOrientation": 0,
-                "PortraitOrientation": 1,
-                "LandscapeOrientation": 2,
-                "InvertedPortraitOrientation": 4,
-                "InvertedLandscapeOrientation": 8
-            }
-        }
-        Enum {
-            name: "ScreenOrientations"
-            values: {
-                "UnknownOrientation": 0,
-                "PortraitOrientation": 1,
-                "LandscapeOrientation": 2,
-                "InvertedPortraitOrientation": 4,
-                "InvertedLandscapeOrientation": 8
-            }
-        }
-        Enum {
             name: "WidgetAttribute"
             values: {
                 "WA_Disabled": 0,
@@ -7019,7 +3575,8 @@ Module {
                 "AA_S60DontConstructApplicationPanes": 8,
                 "AA_S60DisablePartialScreenInputMode": 9,
                 "AA_X11InitThreads": 10,
-                "AA_AttributeCount": 11
+                "AA_CaptureMultimediaKeys": 11,
+                "AA_AttributeCount": 12
             }
         }
         Enum {
@@ -7740,7 +4297,8 @@ Module {
             values: {
                 "NoClip": 0,
                 "ReplaceClip": 1,
-                "IntersectClip": 2
+                "IntersectClip": 2,
+                "UniteClip": 3
             }
         }
         Enum {
@@ -7778,57 +4336,15 @@ Module {
             }
         }
         Enum {
-            name: "InputMethodQuery"
-            values: {
-                "ImEnabled": 1,
-                "ImCursorRectangle": 2,
-                "ImMicroFocus": 2,
-                "ImFont": 4,
-                "ImCursorPosition": 8,
-                "ImSurroundingText": 16,
-                "ImCurrentSelection": 32,
-                "ImMaximumTextLength": 64,
-                "ImAnchorPosition": 128,
-                "ImHints": 256,
-                "ImPreferredLanguage": 512,
-                "ImPlatformData": -2147483648,
-                "ImQueryInput": 186,
-                "ImQueryAll": -1
-            }
-        }
-        Enum {
-            name: "InputMethodQueries"
-            values: {
-                "ImEnabled": 1,
-                "ImCursorRectangle": 2,
-                "ImMicroFocus": 2,
-                "ImFont": 4,
-                "ImCursorPosition": 8,
-                "ImSurroundingText": 16,
-                "ImCurrentSelection": 32,
-                "ImMaximumTextLength": 64,
-                "ImAnchorPosition": 128,
-                "ImHints": 256,
-                "ImPreferredLanguage": 512,
-                "ImPlatformData": -2147483648,
-                "ImQueryInput": 186,
-                "ImQueryAll": -1
-            }
-        }
-        Enum {
             name: "InputMethodHint"
             values: {
                 "ImhNone": 0,
                 "ImhHiddenText": 1,
-                "ImhSensitiveData": 2,
-                "ImhNoAutoUppercase": 4,
-                "ImhPreferNumbers": 8,
-                "ImhPreferUppercase": 16,
-                "ImhPreferLowercase": 32,
-                "ImhNoPredictiveText": 64,
-                "ImhDate": 128,
-                "ImhTime": 256,
-                "ImhMultiLine": 512,
+                "ImhNoAutoUppercase": 2,
+                "ImhPreferNumbers": 4,
+                "ImhPreferUppercase": 8,
+                "ImhPreferLowercase": 16,
+                "ImhNoPredictiveText": 32,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
@@ -7844,15 +4360,11 @@ Module {
             values: {
                 "ImhNone": 0,
                 "ImhHiddenText": 1,
-                "ImhSensitiveData": 2,
-                "ImhNoAutoUppercase": 4,
-                "ImhPreferNumbers": 8,
-                "ImhPreferUppercase": 16,
-                "ImhPreferLowercase": 32,
-                "ImhNoPredictiveText": 64,
-                "ImhDate": 128,
-                "ImhTime": 256,
-                "ImhMultiLine": 512,
+                "ImhNoAutoUppercase": 2,
+                "ImhPreferNumbers": 4,
+                "ImhPreferUppercase": 8,
+                "ImhPreferLowercase": 16,
+                "ImhNoPredictiveText": 32,
                 "ImhDigitsOnly": 65536,
                 "ImhFormattedNumbersOnly": 131072,
                 "ImhUppercaseOnly": 262144,
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a2..bc7d69c995 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,27 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
     return instance;
 }
 
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 }
 
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
 {
 }
 
-
-void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
-                                         const QString &/*oldParentProperty*/,
-                                         const ServerNodeInstance &/*newParentInstance*/,
-                                         const QString &/*newParentProperty*/)
+void AnchorChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &/*oldParentInstance*/,
+                                         const PropertyName &/*oldParentProperty*/,
+                                         const ObjectNodeInstance::Pointer &/*newParentInstance*/,
+                                         const PropertyName &/*newParentProperty*/)
 {
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
index a2e3f600b8..d320a5f8de 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/anchorchangesnodeinstance.h
@@ -52,16 +52,15 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    virtual void setPropertyVariant(const QString &name, const QVariant &value);
-    virtual void setPropertyBinding(const QString &name, const QString &expression);
-    virtual QVariant property(const QString &name) const;
-    virtual void resetProperty(const QString &name);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
+    QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
+    void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
 
-    using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
-    void reparent(const ServerNodeInstance &oldParentInstance,
-                  const QString &oldParentProperty,
-                  const ServerNodeInstance &newParentInstance,
-                  const QString &newParentProperty);
+    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
+                  const PropertyName &oldParentProperty,
+                  const ObjectNodeInstance::Pointer &newParentInstance,
+                  const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
 
 protected:
     AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
index 0cc6d68891..5f3745c0d6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/behaviornodeinstance.h
@@ -45,12 +45,12 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    void setPropertyVariant(const PropertyName &name, const QVariant &value);
-    void setPropertyBinding(const PropertyName &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
 
 
-    QVariant property(const PropertyName &name) const;
-    void resetProperty(const PropertyName &name);
+    QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
+    void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
 
 private:
     bool m_isEnabled;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
index b78b89134a..bc0f1dc182 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
@@ -47,9 +47,9 @@ public:
     ComponentNodeInstance(QQmlComponent *component);
     static Pointer create(QObject *objectToBeWrapped);
 
-    bool hasContent() const;
+    bool hasContent() const Q_DECL_OVERRIDE;
 
-    void setNodeSource(const QString &source);
+    void setNodeSource(const QString &source) Q_DECL_OVERRIDE;
 
 private: //function
     QQmlComponent *component() const;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
index 3ee9ae4eff..af5b7ff3ef 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.cpp
@@ -42,10 +42,6 @@ DummyNodeInstance::Pointer DummyNodeInstance::create()
     return Pointer(new DummyNodeInstance);
 }
 
-void DummyNodeInstance::paint(QPainter * /*painter*/)
-{
-}
-
 QRectF DummyNodeInstance::boundingRect() const
 {
     return QRectF();
@@ -71,11 +67,11 @@ double DummyNodeInstance::opacity() const
     return 0.0;
 }
 
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 
 }
@@ -85,21 +81,11 @@ void DummyNodeInstance::setId(const QString &/*id*/)
 
 }
 
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-QStringList DummyNodeInstance::properties()
-{
-    return QStringList();
-}
-
-QStringList DummyNodeInstance::localProperties()
-{
-    return QStringList();
-}
-
 void DummyNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Pointer &/*objectNodeInstance*/)
 {
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
index 357dcb4263..d67653a298 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/dummynodeinstance.h
@@ -45,20 +45,16 @@ public:
 
     static Pointer create();
 
-    void paint(QPainter *painter);
+    QRectF boundingRect() const Q_DECL_OVERRIDE;
+    QPointF position() const Q_DECL_OVERRIDE;
+    QSizeF size() const Q_DECL_OVERRIDE;
+    QTransform transform() const Q_DECL_OVERRIDE;
+    double opacity() const Q_DECL_OVERRIDE;
 
-    QRectF boundingRect() const;
-    QPointF position() const;
-    QSizeF size() const;
-    QTransform transform() const;
-    double opacity() const;
-
-    void setPropertyVariant(const QString &name, const QVariant &value);
-    void setPropertyBinding(const QString &name, const QString &expression);
-    void setId(const QString &id);
-    QVariant property(const QString &name) const;
-    QStringList properties();
-    QStringList localProperties();
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
+    void setId(const QString &id) Q_DECL_OVERRIDE;
+    QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
 
     void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
index 9b47f2da44..477f53911a 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
@@ -431,6 +431,10 @@ QVariant ObjectNodeInstance::fixResourcePaths(const QVariant &value)
     return value;
 }
 
+void ObjectNodeInstance::updateDirtyNodeRecursive()
+{
+}
+
 void ObjectNodeInstance::setPropertyVariant(const PropertyName &name, const QVariant &value)
 {
     QQmlProperty property(object(), name, context());
@@ -1097,11 +1101,12 @@ void ObjectNodeInstance::setResetValue(const PropertyName &propertyName, const Q
     m_resetValueHash.insert(propertyName, value);
 }
 
-void ObjectNodeInstance::paint(QPainter * /*painter*/)
+QImage ObjectNodeInstance::renderImage() const
 {
+    return QImage();
 }
 
-QImage ObjectNodeInstance::renderImage() const
+QImage ObjectNodeInstance::renderPreviewImage(const QSize & /*previewImageSize*/) const
 {
     return QImage();
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
index e4aa1d99c0..567fca9fcb 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
@@ -82,8 +82,8 @@ public:
     void setNodeInstanceServer(NodeInstanceServer *server);
     virtual void initializePropertyWatcher(const Pointer &objectNodeInstance);
     virtual void initialize(const Pointer &objectNodeInstance);
-    virtual void paint(QPainter *painter);
     virtual QImage renderImage() const;
+    virtual QImage renderPreviewImage(const QSize &previewImageSize) const;
 
     virtual QObject *parent() const;
 
@@ -178,6 +178,8 @@ public:
 
     static QVariant fixResourcePaths(const QVariant &value);
 
+    virtual void updateDirtyNodeRecursive();
+
 protected:
     void doResetProperty(const PropertyName &propertyName);
     void removeFromOldProperty(QObject *object, QObject *oldParent, const PropertyName &oldParentProperty);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
index 1028af42d4..f81e22e717 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/positionernodeinstance.h
@@ -47,14 +47,14 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    void setPropertyVariant(const PropertyName &name, const QVariant &value);
-    void setPropertyBinding(const PropertyName &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
 
-    bool isPositioner() const;
+    bool isPositioner() const Q_DECL_OVERRIDE;
 
-    bool isResizable() const;
+    bool isResizable() const Q_DECL_OVERRIDE;
 
-    void refreshPositioner();
+    void refreshPositioner() Q_DECL_OVERRIDE;
 
 protected:
     PositionerNodeInstance(QQuickBasePositioner *item);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
index e9a3557848..1a2330b84e 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.cpp
@@ -99,11 +99,11 @@ void QmlPropertyChangesNodeInstance::resetProperty(const PropertyName &name)
 }
 
 
-void QmlPropertyChangesNodeInstance::reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty)
+void QmlPropertyChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty)
 {
     changesObject()->detachFromState();
 
-    ObjectNodeInstance::reparent(oldParentInstance.internalInstance(), oldParentProperty, newParentInstance.internalInstance(), newParentProperty);
+    ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty);
 
     changesObject()->attachToState();
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
index 30e2986827..23e09028a9 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlpropertychangesnodeinstance.h
@@ -54,13 +54,12 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
-    virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
-    virtual QVariant property(const PropertyName &name) const;
-    virtual void resetProperty(const PropertyName &name);
+    virtual void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    virtual void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
+    virtual QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
+    virtual void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
 
-    using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
-    void reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty);
+    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
 
 protected:
     QmlPropertyChangesNodeInstance(QQuickPropertyChanges *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
index 78a759f1df..ad33649157 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmlstatenodeinstance.h
@@ -48,15 +48,15 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    void setPropertyVariant(const PropertyName &name, const QVariant &value);
-    void setPropertyBinding(const PropertyName &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
 
-    void activateState();
-    void deactivateState();
+    void activateState() Q_DECL_OVERRIDE;
+    void deactivateState() Q_DECL_OVERRIDE;
 
-    bool updateStateVariant(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &value);
-    bool updateStateBinding(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QString &expression);
-    bool resetStateProperty(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &resetValue);
+    bool updateStateVariant(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &value) Q_DECL_OVERRIDE;
+    bool updateStateBinding(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QString &expression) Q_DECL_OVERRIDE;
+    bool resetStateProperty(const ObjectNodeInstance::Pointer &target, const PropertyName &propertyName, const QVariant &resetValue) Q_DECL_OVERRIDE;
 
 
 protected:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
index d12e367abd..7aa99fa301 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qmltransitionnodeinstance.h
@@ -47,9 +47,9 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
 
-    bool isTransition() const;
+    bool isTransition() const Q_DECL_OVERRIDE;
 
 protected:
     QQuickTransition *qmlTransition() const;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
index a6b9408946..ee6d32e00b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5informationnodeinstanceserver.h
@@ -41,15 +41,15 @@ class Qt5InformationNodeInstanceServer : public Qt5NodeInstanceServer
 public:
     explicit Qt5InformationNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
 
-    void reparentInstances(const ReparentInstancesCommand &command);
-    void clearScene(const ClearSceneCommand &command);
-    void createScene(const CreateSceneCommand &command);
-    void completeComponent(const CompleteComponentCommand &command);
-    void token(const TokenCommand &command);
-    void removeSharedMemory(const RemoveSharedMemoryCommand &command);
+    void reparentInstances(const ReparentInstancesCommand &command) Q_DECL_OVERRIDE;
+    void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
+    void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
+    void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE;
+    void token(const TokenCommand &command) Q_DECL_OVERRIDE;
+    void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
 
 protected:
-    void collectItemChangesAndSendChangeCommands();
+    void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
     void sendChildrenChangedCommand(const QList<ServerNodeInstance> childList);
     void sendTokenBack();
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
index a0f354fedf..bbf5aee7e3 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5nodeinstanceserver.h
@@ -48,21 +48,21 @@ public:
     Qt5NodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
     ~Qt5NodeInstanceServer();
 
-    QQuickView *quickView() const;
-    QQmlView *declarativeView() const;
-    QQmlEngine *engine() const;
-    void refreshBindings();
+    QQuickView *quickView() const Q_DECL_OVERRIDE;
+    QQmlView *declarativeView() const Q_DECL_OVERRIDE;
+    QQmlEngine *engine() const Q_DECL_OVERRIDE;
+    void refreshBindings() Q_DECL_OVERRIDE;
 
     DesignerSupport *designerSupport() const;
 
-    void createScene(const CreateSceneCommand &command);
-    void clearScene(const ClearSceneCommand &command);
+    void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
+    void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
 
 protected:
-    void initializeView(const QVector<AddImportContainer> &importVector);
-    void resizeCanvasSizeToRootItemSize();
+    void initializeView(const QVector<AddImportContainer> &importVector) Q_DECL_OVERRIDE;
+    void resizeCanvasSizeToRootItemSize() Q_DECL_OVERRIDE;
     void resetAllItems();
-    QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command);
+    QList<ServerNodeInstance> setupScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
     QList<QQuickItem*> allItems() const;
 
 private:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
index 8e3a5c767b..63451eb01b 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.cpp
@@ -65,7 +65,7 @@ void Qt5PreviewNodeInstanceServer::collectItemChangesAndSendChangeCommands()
 {
     static bool inFunction = false;
 
-    if (rootNodeInstance().internalSGItem() == 0)
+    if (!rootNodeInstance().holdsQuickItem())
         return;
 
     if (!inFunction && nodeInstanceClient()->bytesToWrite() < 10000) {
@@ -106,17 +106,14 @@ static void updateDirtyNodeRecursive(QQuickItem *parentItem)
 
 QImage Qt5PreviewNodeInstanceServer::renderPreviewImage()
 {
-    updateDirtyNodeRecursive(rootNodeInstance().internalSGItem());
+    rootNodeInstance().updateDirtyNodeRecursive();
 
     QRectF boundingRect = rootNodeInstance().boundingRect();
 
     QSize previewImageSize = boundingRect.size().toSize();
     previewImageSize.scale(QSize(100, 100), Qt::KeepAspectRatio);
 
-    QImage previewImage;
-
-    if (boundingRect.isValid() && rootNodeInstance().internalSGItem())
-        previewImage = designerSupport()->renderImageForItem(rootNodeInstance().internalSGItem(), boundingRect, previewImageSize);
+    QImage previewImage = rootNodeInstance().renderPreviewImage(previewImageSize);
 
     previewImage = previewImage.convertToFormat(QImage::Format_ARGB32_Premultiplied);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
index 55f10bdfcc..5064812770 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5previewnodeinstanceserver.h
@@ -40,15 +40,15 @@ class Qt5PreviewNodeInstanceServer : public Qt5NodeInstanceServer
 public:
     explicit Qt5PreviewNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
 
-    void createScene(const CreateSceneCommand &command);
-    void changeState(const ChangeStateCommand &command);
-    void removeSharedMemory(const RemoveSharedMemoryCommand &command);
+    void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
+    void changeState(const ChangeStateCommand &command) Q_DECL_OVERRIDE;
+    void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
 
     QImage renderPreviewImage();
 
 protected:
-    void collectItemChangesAndSendChangeCommands();
-    void startRenderTimer();
+    void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
+    void startRenderTimer() Q_DECL_OVERRIDE;
 
 private:
     ServerNodeInstance m_actualState;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
index 7a622f9348..3e2e4ac3e6 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/qt5rendernodeinstanceserver.h
@@ -40,13 +40,13 @@ class Qt5RenderNodeInstanceServer : public Qt5NodeInstanceServer
 public:
     explicit Qt5RenderNodeInstanceServer(NodeInstanceClientInterface *nodeInstanceClient);
 
-    void createScene(const CreateSceneCommand &command);
-    void clearScene(const ClearSceneCommand &command);
-    void completeComponent(const CompleteComponentCommand &command);
-    void removeSharedMemory(const RemoveSharedMemoryCommand &command);
+    void createScene(const CreateSceneCommand &command) Q_DECL_OVERRIDE;
+    void clearScene(const ClearSceneCommand &command) Q_DECL_OVERRIDE;
+    void completeComponent(const CompleteComponentCommand &command) Q_DECL_OVERRIDE;
+    void removeSharedMemory(const RemoveSharedMemoryCommand &command) Q_DECL_OVERRIDE;
 
 protected:
-    void collectItemChangesAndSendChangeCommands();
+    void collectItemChangesAndSendChangeCommands() Q_DECL_OVERRIDE;
     ServerNodeInstance findNodeInstanceForItem(QQuickItem *item) const;
 
 private:
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
index 94f8622491..39281d1ac2 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.cpp
@@ -218,6 +218,14 @@ void QuickItemNodeInstance::updateDirtyNodeRecursive(QQuickItem *parentItem) con
     DesignerSupport::updateDirtyNode(parentItem);
 }
 
+void QuickItemNodeInstance::updateAllDirtyNodeRecursive(QQuickItem *parentItem) const
+{
+    foreach (QQuickItem *childItem, parentItem->childItems())
+            updateDirtyNodeRecursive(childItem);
+
+    DesignerSupport::updateDirtyNode(parentItem);
+}
+
 QImage QuickItemNodeInstance::renderImage() const
 {
     updateDirtyNodeRecursive(quickItem());
@@ -231,6 +239,16 @@ QImage QuickItemNodeInstance::renderImage() const
     return renderImage;
 }
 
+QImage QuickItemNodeInstance::renderPreviewImage(const QSize &previewImageSize) const
+{
+    QRectF previewItemBoundingRect = boundingRect();
+
+    if (previewItemBoundingRect.isValid() && quickItem())
+        return designerSupport()->renderImageForItem(quickItem(), previewItemBoundingRect, previewImageSize);
+
+    return QImage();
+}
+
 bool QuickItemNodeInstance::isMovable() const
 {
     if (isRootNodeInstance())
@@ -661,6 +679,11 @@ void QuickItemNodeInstance::createEffectItem(bool createEffectItem)
     s_createEffectItem = createEffectItem;
 }
 
+void QuickItemNodeInstance::updateDirtyNodeRecursive()
+{
+    updateAllDirtyNodeRecursive(quickItem());
+}
+
 } // namespace Internal
 } // namespace QmlDesigner
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
index 7ac8a9f4ae..4015308f8f 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickitemnodeinstance.h
@@ -49,65 +49,68 @@ public:
     ~QuickItemNodeInstance();
 
     static Pointer create(QObject *objectToBeWrapped);
-    void initialize(const ObjectNodeInstance::Pointer &objectNodeInstance);
+    void initialize(const ObjectNodeInstance::Pointer &objectNodeInstance) Q_DECL_OVERRIDE;
 
-    bool isQuickItem() const;
+    bool isQuickItem() const Q_DECL_OVERRIDE;
 
-    QRectF boundingRect() const;
-    QPointF position() const;
-    QSizeF size() const;
-    QTransform transform() const;
-    QTransform customTransform() const;
-    QTransform sceneTransform() const;
-    double opacity() const;
+    QRectF boundingRect() const Q_DECL_OVERRIDE;
+    QPointF position() const Q_DECL_OVERRIDE;
+    QSizeF size() const Q_DECL_OVERRIDE;
+    QTransform transform() const Q_DECL_OVERRIDE;
+    QTransform customTransform() const Q_DECL_OVERRIDE;
+    QTransform sceneTransform() const Q_DECL_OVERRIDE;
+    double opacity() const Q_DECL_OVERRIDE;
 
-    QObject *parent() const;
+    QObject *parent() const Q_DECL_OVERRIDE;
 
-    double rotation() const;
-    double scale() const;
-    QPointF transformOriginPoint() const;
-    double zValue() const;
+    double rotation() const Q_DECL_OVERRIDE;
+    double scale() const Q_DECL_OVERRIDE;
+    QPointF transformOriginPoint() const Q_DECL_OVERRIDE;
+    double zValue() const Q_DECL_OVERRIDE;
 
     bool equalQuickItem(QQuickItem *item) const;
 
-    bool hasContent() const;
+    bool hasContent() const Q_DECL_OVERRIDE;
 
-    QList<ServerNodeInstance> childItems() const;
+    QList<ServerNodeInstance> childItems() const Q_DECL_OVERRIDE;
     QList<ServerNodeInstance> childItemsForChild(QQuickItem *childItem) const;
 
-    bool isMovable() const;
+    bool isMovable() const Q_DECL_OVERRIDE;
     void setMovable(bool movable);
 
-    void setPropertyVariant(const PropertyName &name, const QVariant &value);
-    void setPropertyBinding(const PropertyName &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value) Q_DECL_OVERRIDE;
+    void setPropertyBinding(const PropertyName &name, const QString &expression) Q_DECL_OVERRIDE;
 
-    QVariant property(const PropertyName &name) const;
-    void resetProperty(const PropertyName &name);
+    QVariant property(const PropertyName &name) const Q_DECL_OVERRIDE;
+    void resetProperty(const PropertyName &name) Q_DECL_OVERRIDE;
 
-    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty);
+    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty) Q_DECL_OVERRIDE;
 
-    int penWidth() const;
+    int penWidth() const Q_DECL_OVERRIDE;
 
-    bool hasAnchor(const PropertyName &name) const;
-    QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const;
-    bool isAnchoredBySibling() const;
-    bool isAnchoredByChildren() const;
-    void doComponentComplete();
+    bool hasAnchor(const PropertyName &name) const Q_DECL_OVERRIDE;
+    QPair<PropertyName, ServerNodeInstance> anchor(const PropertyName &name) const Q_DECL_OVERRIDE;
+    bool isAnchoredBySibling() const Q_DECL_OVERRIDE;
+    bool isAnchoredByChildren() const Q_DECL_OVERRIDE;
+    void doComponentComplete() Q_DECL_OVERRIDE;
 
-    bool isResizable() const;
+    bool isResizable() const Q_DECL_OVERRIDE;
     void setResizable(bool resizeable);
 
     void setHasContent(bool hasContent);
 
-    QList<ServerNodeInstance> stateInstances() const;
+    QList<ServerNodeInstance> stateInstances() const Q_DECL_OVERRIDE;
 
-    QImage renderImage() const;
+    QImage renderImage() const Q_DECL_OVERRIDE;
+    QImage renderPreviewImage(const QSize &previewImageSize) const Q_DECL_OVERRIDE;
 
     DesignerSupport *designerSupport() const;
     Qt5NodeInstanceServer *qt5NodeInstanceServer() const;
 
     static void createEffectItem(bool createEffectItem);
 
+    void updateDirtyNodeRecursive() Q_DECL_OVERRIDE;
+
 protected:
     QuickItemNodeInstance(QQuickItem*);
     QQuickItem *quickItem() const;
@@ -116,6 +119,7 @@ protected:
     void refresh();
     QRectF boundingRectWithStepChilds(QQuickItem *parentItem) const;
     void updateDirtyNodeRecursive(QQuickItem *parentItem) const;
+    void updateAllDirtyNodeRecursive(QQuickItem *parentItem) const;
     static bool anyItemHasContent(QQuickItem *graphicsItem);
     static bool childItemsHaveContent(QQuickItem *graphicsItem);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
index 0250e77b14..b4bbf5cfc2 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.cpp
@@ -108,18 +108,14 @@ ServerNodeInstance &ServerNodeInstance::operator=(const ServerNodeInstance &othe
     return *this;
 }
 
-/*!
-\brief Paints the NodeInstance with this painter.
-\param painter used QPainter
-*/
-void ServerNodeInstance::paint(QPainter *painter)
+QImage ServerNodeInstance::renderImage() const
 {
-    m_nodeInstance->paint(painter);
+    return m_nodeInstance->renderImage();
 }
 
-QImage ServerNodeInstance::renderImage() const
+QImage ServerNodeInstance::renderPreviewImage(const QSize &previewImageSize) const
 {
-    return m_nodeInstance->renderImage();
+    return m_nodeInstance->renderPreviewImage(previewImageSize);
 }
 
 bool ServerNodeInstance::isRootNodeInstance() const
@@ -153,6 +149,16 @@ void ServerNodeInstance::setNodeSource(const QString &source)
     m_nodeInstance->setNodeSource(source);
 }
 
+bool ServerNodeInstance::holdsQuickItem() const
+{
+    return m_nodeInstance->isQuickItem();
+}
+
+void ServerNodeInstance::updateDirtyNodeRecursive()
+{
+    m_nodeInstance->updateDirtyNodeRecursive();
+}
+
 bool ServerNodeInstance::isSubclassOf(const QString &superTypeName) const
 {
     return isSubclassOf(internalObject(), superTypeName.toUtf8());
@@ -552,13 +558,6 @@ QObject *ServerNodeInstance::internalObject() const
     return m_nodeInstance->object();
 }
 
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-QQuickItem *ServerNodeInstance::internalSGItem() const
-{
-    return qobject_cast<QQuickItem*>(internalObject());
-}
-#endif
-
 void ServerNodeInstance::activateState()
 {
     m_nodeInstance->activateState();
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
index a230e6f1d9..a7cdff1c36 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/servernodeinstance.h
@@ -96,8 +96,8 @@ public:
     ServerNodeInstance(const ServerNodeInstance &other);
     ServerNodeInstance& operator=(const ServerNodeInstance &other);
 
-    void paint(QPainter *painter);
     QImage renderImage() const;
+    QImage renderPreviewImage(const QSize &previewImageSize) const;
 
     ServerNodeInstance parent() const;
     bool hasParent() const;
@@ -196,11 +196,11 @@ private: // functions
 
     void setNodeSource(const QString &source);
 
+    bool holdsQuickItem() const;
+
+    void updateDirtyNodeRecursive();
 
     QObject *internalObject() const; // should be not used outside of the nodeinstances!!!!
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0))
-    QQuickItem *internalSGItem() const;
-#endif
 
 private: // variables
     QSharedPointer<Internal::ObjectNodeInstance> m_nodeInstance;
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
index 894234d9ee..13ab169f72 100644
--- a/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
+++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pri
@@ -6,6 +6,10 @@ QT += core gui widgets qml quick network v8
 
 QT += core-private qml-private quick-private gui-private script-private v8-private
 
+!macx {
+    CONFIG += c++11
+}
+
 DEFINES += QWEAKPOINTER_ENABLE_ARROW
 
 include (../instances/instances.pri)
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
index 41a34cc7a2..8beab695d5 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.cpp
@@ -49,28 +49,28 @@ AnchorChangesNodeInstance::Pointer AnchorChangesNodeInstance::create(QObject *ob
     return instance;
 }
 
-void AnchorChangesNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void AnchorChangesNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void AnchorChangesNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void AnchorChangesNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
 }
 
-QVariant AnchorChangesNodeInstance::property(const QString &/*name*/) const
+QVariant AnchorChangesNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-void AnchorChangesNodeInstance::resetProperty(const QString &/*name*/)
+void AnchorChangesNodeInstance::resetProperty(const PropertyName &/*name*/)
 {
 }
 
 
-void AnchorChangesNodeInstance::reparent(const ServerNodeInstance &/*oldParentInstance*/,
-                                         const QString &/*oldParentProperty*/,
-                                         const ServerNodeInstance &/*newParentInstance*/,
-                                         const QString &/*newParentProperty*/)
+void AnchorChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &/*oldParentInstance*/,
+                                         const PropertyName &/*oldParentProperty*/,
+                                         const ObjectNodeInstance::Pointer &/*newParentInstance*/,
+                                         const PropertyName &/*newParentProperty*/)
 {
 }
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
index 595f813cc4..4fc823afcf 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/anchorchangesnodeinstance.h
@@ -53,16 +53,15 @@ public:
 
     static Pointer create(QObject *objectToBeWrapped);
 
-    virtual void setPropertyVariant(const QString &name, const QVariant &value);
-    virtual void setPropertyBinding(const QString &name, const QString &expression);
-    virtual QVariant property(const QString &name) const;
-    virtual void resetProperty(const QString &name);
+    virtual void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    virtual void setPropertyBinding(const PropertyName &name, const QString &expression);
+    virtual QVariant property(const PropertyName &name) const;
+    virtual void resetProperty(const PropertyName &name);
 
-    using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
-    void reparent(const ServerNodeInstance &oldParentInstance,
-                  const QString &oldParentProperty,
-                  const ServerNodeInstance &newParentInstance,
-                  const QString &newParentProperty);
+    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance,
+                  const PropertyName &oldParentProperty,
+                  const ObjectNodeInstance::Pointer &newParentInstance,
+                  const PropertyName &newParentProperty);
 
 protected:
     AnchorChangesNodeInstance(QObject *object);
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
index 5c8173c2dd..0f9a391b4b 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.cpp
@@ -70,38 +70,25 @@ double DummyNodeInstance::opacity() const
     return 0.0;
 }
 
-void DummyNodeInstance::setPropertyVariant(const QString &/*name*/, const QVariant &/*value*/)
+void DummyNodeInstance::setPropertyVariant(const PropertyName &/*name*/, const QVariant &/*value*/)
 {
 }
 
-void DummyNodeInstance::setPropertyBinding(const QString &/*name*/, const QString &/*expression*/)
+void DummyNodeInstance::setPropertyBinding(const PropertyName &/*name*/, const QString &/*expression*/)
 {
-
 }
 
 void DummyNodeInstance::setId(const QString &/*id*/)
 {
-
 }
 
-QVariant DummyNodeInstance::property(const QString &/*name*/) const
+QVariant DummyNodeInstance::property(const PropertyName &/*name*/) const
 {
     return QVariant();
 }
 
-QStringList DummyNodeInstance::properties()
-{
-    return QStringList();
-}
-
-QStringList DummyNodeInstance::localProperties()
-{
-    return QStringList();
-}
-
 void DummyNodeInstance::initializePropertyWatcher(const ObjectNodeInstance::Pointer &/*objectNodeInstance*/)
 {
-
 }
 
 } // namespace Internal
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
index 357dcb4263..8c047f88b1 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/dummynodeinstance.h
@@ -53,12 +53,11 @@ public:
     QTransform transform() const;
     double opacity() const;
 
-    void setPropertyVariant(const QString &name, const QVariant &value);
-    void setPropertyBinding(const QString &name, const QString &expression);
+    void setPropertyVariant(const PropertyName &name, const QVariant &value);
+    void setPropertyBinding(const PropertyName &name, const QString &expression);
     void setId(const QString &id);
-    QVariant property(const QString &name) const;
-    QStringList properties();
-    QStringList localProperties();
+    QVariant property(const PropertyName &name) const;
+
 
     void initializePropertyWatcher(const ObjectNodeInstance::Pointer &objectNodeInstance);
 
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
index 41c11b92c1..d262b404ce 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.cpp
@@ -99,11 +99,11 @@ void QmlPropertyChangesNodeInstance::resetProperty(const PropertyName &name)
 }
 
 
-void QmlPropertyChangesNodeInstance::reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty)
+void QmlPropertyChangesNodeInstance::reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty)
 {
     changesObject()->detachFromState();
 
-    ObjectNodeInstance::reparent(oldParentInstance.internalInstance(), oldParentProperty, newParentInstance.internalInstance(), newParentProperty);
+    ObjectNodeInstance::reparent(oldParentInstance, oldParentProperty, newParentInstance, newParentProperty);
 
     changesObject()->attachToState();
 }
diff --git a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
index f0229f008f..7ca7855e18 100644
--- a/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
+++ b/share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/qmlpropertychangesnodeinstance.h
@@ -60,8 +60,7 @@ public:
     virtual QVariant property(const PropertyName &name) const;
     virtual void resetProperty(const PropertyName &name);
 
-    using ObjectNodeInstance::reparent; // keep the virtual reparent(...) method around
-    void reparent(const ServerNodeInstance &oldParentInstance, const PropertyName &oldParentProperty, const ServerNodeInstance &newParentInstance, const PropertyName &newParentProperty);
+    void reparent(const ObjectNodeInstance::Pointer &oldParentInstance, const PropertyName &oldParentProperty, const ObjectNodeInstance::Pointer &newParentInstance, const PropertyName &newParentProperty);
 
 protected:
     QmlPropertyChangesNodeInstance(QDeclarativePropertyChanges *object);
diff --git a/src/plugins/android/androidmanager.cpp b/src/plugins/android/androidmanager.cpp
index cbb54c8b41..4247652392 100644
--- a/src/plugins/android/androidmanager.cpp
+++ b/src/plugins/android/androidmanager.cpp
@@ -36,6 +36,7 @@
 #include "androidpackagecreationstep.h"
 #include "androidtoolchain.h"
 
+#include <coreplugin/documentmanager.h>
 #include <projectexplorer/projectexplorer.h>
 #include <projectexplorer/session.h>
 #include <projectexplorer/target.h>
@@ -235,17 +236,22 @@ bool AndroidManager::ensureIconAttribute(ProjectExplorer::Target *target)
 
 QString AndroidManager::targetSDK(ProjectExplorer::Target *target)
 {
+    QString fallback = QLatin1String("android-8");
+    if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target->kit()))
+        if (qt->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0))
+            fallback = QLatin1String("android-9");
+
     if (!createAndroidTemplatesIfNecessary(target))
-        return AndroidConfigurations::instance().bestMatch(QLatin1String("android-8"));
+        return AndroidConfigurations::instance().bestMatch(fallback);
     QFile file(defaultPropertiesPath(target).toString());
     if (!file.open(QIODevice::ReadOnly))
-        return AndroidConfigurations::instance().bestMatch(QLatin1String("android-8"));
+        return AndroidConfigurations::instance().bestMatch(fallback);
     while (!file.atEnd()) {
         QByteArray line = file.readLine();
         if (line.startsWith("target="))
             return QString::fromLatin1(line.trimmed().mid(7));
     }
-    return AndroidConfigurations::instance().bestMatch(QLatin1String("android-8"));
+    return AndroidConfigurations::instance().bestMatch(fallback);
 }
 
 bool AndroidManager::setTargetSDK(ProjectExplorer::Target *target, const QString &sdk)
@@ -534,12 +540,18 @@ bool AndroidManager::createAndroidTemplatesIfNecessary(ProjectExplorer::Target *
     if (!androidFiles.isEmpty())
         qt4Project->rootProjectNode()->addFiles(ProjectExplorer::UnknownFileType, androidFiles);
 
-    QStringList sdks = AndroidConfigurations::instance().sdkTargets();
+    int minApiLevel = 4;
+    if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target->kit()))
+        if (qt->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0))
+            minApiLevel = 9;
+
+    QStringList sdks = AndroidConfigurations::instance().sdkTargets(minApiLevel);
     if (sdks.isEmpty()) {
         raiseError(tr("No Qt for Android SDKs were found.\nPlease install at least one SDK."));
         return false;
     }
-    updateTarget(target, AndroidConfigurations::instance().sdkTargets().at(0));
+
+    updateTarget(target, AndroidConfigurations::instance().sdkTargets(minApiLevel).at(0));
     QStringList apps = availableTargetApplications(target);
     if (!apps.isEmpty())
         setTargetApplication(target, apps.at(0));
@@ -899,6 +911,7 @@ bool AndroidManager::openManifest(ProjectExplorer::Target *target, QDomDocument
 
 bool AndroidManager::saveManifest(ProjectExplorer::Target *target, QDomDocument &doc)
 {
+    Core::FileChangeBlocker blocker(manifestPath(target).toString());
     return saveXmlFile(target, doc, manifestPath(target));
 }
 
diff --git a/src/plugins/android/androidpackagecreationwidget.cpp b/src/plugins/android/androidpackagecreationwidget.cpp
index f3ff583616..799201af83 100644
--- a/src/plugins/android/androidpackagecreationwidget.cpp
+++ b/src/plugins/android/androidpackagecreationwidget.cpp
@@ -49,6 +49,8 @@
 #include <QFileDialog>
 #include <QFileSystemWatcher>
 #include <QMessageBox>
+#include <qtsupport/baseqtversion.h>
+#include <qtsupport/qtkitinformation.h>
 
 namespace Android {
 namespace Internal {
@@ -277,7 +279,13 @@ void AndroidPackageCreationWidget::updateAndroidProjectInfo()
     ProjectExplorer::Target *target = m_step->target();
     const QString packageName = AndroidManager::packageName(target);
     m_ui->targetSDKComboBox->clear();
-    QStringList targets = AndroidConfigurations::instance().sdkTargets();
+
+    int minApiLevel = 4;
+    if (QtSupport::BaseQtVersion *qt = QtSupport::QtKitInformation::qtVersion(target->kit()))
+        if (qt->qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0))
+            minApiLevel = 9;
+
+    QStringList targets = AndroidConfigurations::instance().sdkTargets(minApiLevel);
     m_ui->targetSDKComboBox->addItems(targets);
     m_ui->targetSDKComboBox->setCurrentIndex(targets.indexOf(AndroidManager::targetSDK(target)));
     m_ui->packageNameLineEdit->setText(packageName);
diff --git a/src/plugins/bookmarks/bookmarkmanager.cpp b/src/plugins/bookmarks/bookmarkmanager.cpp
index fe2f37ce22..642da49846 100644
--- a/src/plugins/bookmarks/bookmarkmanager.cpp
+++ b/src/plugins/bookmarks/bookmarkmanager.cpp
@@ -432,7 +432,10 @@ void BookmarkManager::toggleBookmark(const QString &fileName, int lineNumber)
 
 void BookmarkManager::updateBookmark(Bookmark *bookmark)
 {
-    int idx = m_bookmarksList.indexOf(bookmark);
+    const int idx = m_bookmarksList.indexOf(bookmark);
+    if (idx == -1)
+        return;
+
     emit dataChanged(index(idx, 0, QModelIndex()), index(idx, 2, QModelIndex()));
     saveBookmarks();
 }
diff --git a/src/plugins/debugger/debuggerplugin.cpp b/src/plugins/debugger/debuggerplugin.cpp
index 88e4fd0328..df526ab135 100644
--- a/src/plugins/debugger/debuggerplugin.cpp
+++ b/src/plugins/debugger/debuggerplugin.cpp
@@ -2283,7 +2283,7 @@ void DebuggerPluginPrivate::updateState(DebuggerEngine *engine)
     m_attachToRemoteServerAction->setEnabled(true);
     m_attachToRunningApplication->setEnabled(true);
 
-    m_threadBox->setEnabled(state == InferiorStopOk);
+    m_threadBox->setEnabled(state == InferiorStopOk || state == InferiorUnrunnable);
 
     const bool isCore = engine->startParameters().startMode == AttachCore;
     const bool stopped = state == InferiorStopOk;
diff --git a/src/plugins/find/treeviewfind.cpp b/src/plugins/find/treeviewfind.cpp
index fe803f07a8..414be05fe7 100644
--- a/src/plugins/find/treeviewfind.cpp
+++ b/src/plugins/find/treeviewfind.cpp
@@ -167,7 +167,7 @@ IFindSupport::Result TreeViewFind::find(const QString &searchTxt,
                                                           Qt::CaseInsensitive));
                 if (searchExpr.indexIn(text) != -1
                         && d->m_view->model()->flags(index) & Qt::ItemIsSelectable
-                        && currentRow != index.row())
+                        && (index.row() != currentRow || index.parent() != currentIndex.parent()))
                     resultIndex = index;
             } else {
                 QTextDocument doc(text);
@@ -175,7 +175,7 @@ IFindSupport::Result TreeViewFind::find(const QString &searchTxt,
                               flags & (Find::FindCaseSensitively |
                                        Find::FindWholeWords)).isNull()
                         && d->m_view->model()->flags(index) & Qt::ItemIsSelectable
-                        && currentRow != index.row())
+                        && (index.row() != currentRow || index.parent() != currentIndex.parent()))
                     resultIndex = index;
             }
         }
@@ -203,33 +203,35 @@ QModelIndex TreeViewFind::nextIndex(const QModelIndex &idx, bool *wrapped) const
     if (!idx.isValid())
         return model->index(0, 0);
 
+    // same parent has more columns, go to next column
+    if (idx.column() + 1 < model->columnCount(idx.parent()))
+        return model->index(idx.row(), idx.column() + 1, idx.parent());
 
-    if (model->rowCount(idx) > 0) {
-        // node with children
-        return idx.child(0, 0);
+    // tree views have their children attached to first column
+    // make sure we are at first column
+    QModelIndex current = model->index(idx.row(), 0, idx.parent());
+
+    // check for children
+    if (model->rowCount(current) > 0) {
+        return current.child(0, 0);
     }
-    // leaf node
+
+    // no more children, go up and look for parent with more children
     QModelIndex nextIndex;
-    QModelIndex current = idx;
     while (!nextIndex.isValid()) {
         int row = current.row();
-        int column = current.column();
         current = current.parent();
 
-        if (column + 1 < model->columnCount(current)) {
-            nextIndex = model->index(row, column + 1, current);
+        if (row + 1 < model->rowCount(current)) {
+            // Same parent has another child
+            nextIndex = model->index(row + 1, 0, current);
         } else {
-            if (row + 1 < model->rowCount(current)) {
-                // Same parent has another child
-                nextIndex = model->index(row + 1, 0, current);
-            } else {
-                // go up one parent
-                if (!current.isValid()) {
-                    // we start from the beginning
-                    if (wrapped)
-                        *wrapped = true;
-                    nextIndex = model->index(0, 0);
-                }
+            // go up one parent
+            if (!current.isValid()) {
+                // we start from the beginning
+                if (wrapped)
+                    *wrapped = true;
+                nextIndex = model->index(0, 0);
             }
         }
     }
@@ -240,34 +242,34 @@ QModelIndex TreeViewFind::prevIndex(const QModelIndex &idx, bool *wrapped) const
 {
     if (wrapped)
         *wrapped = false;
+    QAbstractItemModel *model = d->m_view->model();
+    // if same parent has earlier columns, just move there
+    if (idx.column() > 0)
+        return model->index(idx.row(), idx.column() - 1, idx.parent());
+
     QModelIndex current = idx;
     bool checkForChildren = true;
-    QAbstractItemModel *model = d->m_view->model();
     if (current.isValid()) {
         int row = current.row();
-        int column = current.column();
-        if (column > 0) {
-            current = model->index(row, column - 1, current.parent());
+        if (row > 0) {
+            current = model->index(row - 1, 0, current.parent());
         } else {
-            if (row > 0) {
-                current = model->index(row - 1, model->columnCount(current.parent()) - 1,
-                                       current.parent());
-            } else {
-                current = current.parent();
-                checkForChildren = !current.isValid();
-                if (checkForChildren && wrapped) {
-                    // we start from the end
-                    *wrapped = true;
-                }
+            current = current.parent();
+            checkForChildren = !current.isValid();
+            if (checkForChildren && wrapped) {
+                // we start from the end
+                *wrapped = true;
             }
         }
     }
     if (checkForChildren) {
         // traverse down the hierarchy
         while (int rc = model->rowCount(current)) {
-            current = model->index(rc - 1, model->columnCount(current) - 1, current);
+            current = model->index(rc - 1, 0, current);
         }
     }
+    // set to last column
+    current = model->index(current.row(), model->columnCount(current.parent()) - 1, current.parent());
     return current;
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
index 7bb9da3a0e..53cfd46ae4 100644
--- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp
@@ -75,8 +75,10 @@ QbsBuildStep::QbsBuildStep(ProjectExplorer::BuildStepList *bsl, const QbsBuildSt
 QbsBuildStep::~QbsBuildStep()
 {
     cancel();
-    m_job->deleteLater();
-    m_job = 0;
+    if (m_job) {
+        m_job->deleteLater();
+        m_job = 0;
+    }
     delete m_parser;
 }
 
diff --git a/src/plugins/qbsprojectmanager/qbscleanstep.cpp b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
index 54560bf36e..338bd265e8 100644
--- a/src/plugins/qbsprojectmanager/qbscleanstep.cpp
+++ b/src/plugins/qbsprojectmanager/qbscleanstep.cpp
@@ -72,8 +72,10 @@ QbsCleanStep::QbsCleanStep(ProjectExplorer::BuildStepList *bsl, const QbsCleanSt
 QbsCleanStep::~QbsCleanStep()
 {
     cancel();
-    m_job->deleteLater();
-    m_job = 0;
+    if (m_job) {
+        m_job->deleteLater();
+        m_job = 0;
+    }
 }
 
 bool QbsCleanStep::init()
diff --git a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
index 6e33a76b08..a3c1675766 100644
--- a/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
+++ b/src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
@@ -53,13 +53,13 @@ const char PROFILE_LIST[] = "preferences.qtcreator.kit.";
 const char PROFILES_PREFIX[] = "profiles.";
 
 // Qt related settings:
-const char QTCORE_BINPATH[] = ".qt.core.binPath";
-const char QTCORE_INCPATH[] = ".qt.core.incPath";
-const char QTCORE_LIBPATH[] = ".qt.core.libPath";
-const char QTCORE_VERSION[] = ".qt.core.version";
-const char QTCORE_NAMESPACE[] = ".qt.core.namespace";
-const char QTCORE_LIBINFIX[] = ".qt.core.libInfix";
-const char QTCORE_MKSPEC[] = ".qt.core.mkspecPath";
+const char QTCORE_BINPATH[] = ".Qt.core.binPath";
+const char QTCORE_INCPATH[] = ".Qt.core.incPath";
+const char QTCORE_LIBPATH[] = ".Qt.core.libPath";
+const char QTCORE_VERSION[] = ".Qt.core.version";
+const char QTCORE_NAMESPACE[] = ".Qt.core.namespace";
+const char QTCORE_LIBINFIX[] = ".Qt.core.libInfix";
+const char QTCORE_MKSPEC[] = ".Qt.core.mkspecPath";
 
 
 // Toolchain related settings:
diff --git a/src/plugins/qmljstools/qmljsmodelmanager.cpp b/src/plugins/qmljstools/qmljsmodelmanager.cpp
index 36b2c7fb47..7f4e72962c 100644
--- a/src/plugins/qmljstools/qmljsmodelmanager.cpp
+++ b/src/plugins/qmljstools/qmljsmodelmanager.cpp
@@ -462,7 +462,7 @@ void ModelManager::updateProjectInfo(const ProjectInfo &pinfo)
 
     // dump builtin types if the shipped definitions are probably outdated and the
     // Qt version ships qmlplugindump
-    if (QtSupport::QtVersionNumber(pinfo.qtVersionString) >= QtSupport::QtVersionNumber(4, 8, 0))
+    if (QtSupport::QtVersionNumber(pinfo.qtVersionString) > QtSupport::QtVersionNumber(4, 8, 5))
         m_pluginDumper->loadBuiltinTypes(pinfo);
 
     emit projectInfoUpdated(pinfo);
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp
index 531389dba9..579507fea7 100644
--- a/src/plugins/qtsupport/baseqtversion.cpp
+++ b/src/plugins/qtsupport/baseqtversion.cpp
@@ -266,6 +266,8 @@ Core::FeatureSet BaseQtVersion::availableFeatures() const
          features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_1_1);
      if (qtVersion() >= QtSupport::QtVersionNumber(5, 0, 0))
          features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_2);
+     if (qtVersion() >= QtSupport::QtVersionNumber(5, 1, 0))
+         features |= Core::FeatureSet(QtSupport::Constants::FEATURE_QT_QUICK_CONTROLS);
 
      return features;
 }
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index ff4479d395..e3bc352ea3 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -51,6 +51,7 @@ const char FEATURE_QMLPROJECT[] = "QtSupport.Wizards.FeatureQtQuickProject";
 const char FEATURE_QT_QUICK_1[] = "QtSupport.Wizards.FeatureQtQuick.1";
 const char FEATURE_QT_QUICK_1_1[] = "QtSupport.Wizards.FeatureQtQuick.1.1";
 const char FEATURE_QT_QUICK_2[] = "QtSupport.Wizards.FeatureQtQuick.2";
+const char FEATURE_QT_QUICK_CONTROLS[] = "QtSupport.Wizards.FeatureQtQuick.Controls";
 const char FEATURE_QT_WEBKIT[] = "QtSupport.Wizards.FeatureQtWebkit";
 const char FEATURE_QT_CONSOLE[] = "QtSupport.Wizards.FeatureQtConsole";
 const char FEATURE_QTQUICK_COMPONENTS_MEEGO[] = "QtSupport.Wizards.FeatureQtQuickComponentsMeego";
diff --git a/src/plugins/todo/todo.qbs b/src/plugins/todo/todo.qbs
index db719dcea3..ee29a49462 100644
--- a/src/plugins/todo/todo.qbs
+++ b/src/plugins/todo/todo.qbs
@@ -11,7 +11,7 @@ QtcPlugin {
     Depends { name: "ProjectExplorer" }
     Depends { name: "CPlusPlus" }
     Depends { name: "CppTools" }
-    Depends { name: "QmlJs" }
+    Depends { name: "QmlJS" }
 
     files: [
         "constants.h",
diff --git a/src/shared/qbs b/src/shared/qbs
-Subproject 0c3b88d4468892504a5918252846f8ef4f4422a
+Subproject 091dc267d3526e7b3d8e05b32a2506aea114f77
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index ff5dead3f1..942c4a3515 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -10,6 +10,7 @@ SUBDIRS += \
     environment \
     generichighlighter \
     profilewriter \
+    treeviewfind \
     ioutils \
     qtcprocess \
     utils \
diff --git a/tests/auto/filesearch/tst_filesearch.cpp b/tests/auto/filesearch/tst_filesearch.cpp
index 0b01a194b0..c5324294f0 100644
--- a/tests/auto/filesearch/tst_filesearch.cpp
+++ b/tests/auto/filesearch/tst_filesearch.cpp
@@ -31,7 +31,7 @@
 
 #include <QtTest>
 
-QT_BEGIN_NAMESPACE
+namespace Utils {
 bool operator==(const Utils::FileSearchResult &r1, const Utils::FileSearchResult &r2)
 {
     return r1.fileName == r2.fileName
@@ -41,7 +41,7 @@ bool operator==(const Utils::FileSearchResult &r1, const Utils::FileSearchResult
             && r1.matchLength == r2.matchLength
             && r1.regexpCapturedTexts == r2.regexpCapturedTexts;
 }
-QT_END_NAMESPACE
+} // Utils
 
 class tst_FileSearch : public QObject
 {
diff --git a/tests/auto/treeviewfind/treeviewfind.pro b/tests/auto/treeviewfind/treeviewfind.pro
new file mode 100644
index 0000000000..00aa98ae5d
--- /dev/null
+++ b/tests/auto/treeviewfind/treeviewfind.pro
@@ -0,0 +1,8 @@
+include(../qttest.pri)
+
+include($$IDE_SOURCE_TREE/src/plugins/find/find.pri)
+
+LIBS *= -L$$IDE_LIBRARY_PATH/QtProject
+
+SOURCES += \
+    tst_treeviewfind.cpp
diff --git a/tests/auto/treeviewfind/tst_treeviewfind.cpp b/tests/auto/treeviewfind/tst_treeviewfind.cpp
new file mode 100644
index 0000000000..0e288ca0b0
--- /dev/null
+++ b/tests/auto/treeviewfind/tst_treeviewfind.cpp
@@ -0,0 +1,156 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include <find/treeviewfind.h>
+
+#include <QtTest>
+
+#include <QTreeWidget>
+
+class tst_treeviewfind : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void wrapping();
+    void columns();
+};
+
+
+void tst_treeviewfind::wrapping()
+{
+    // set up tree
+    //   search for FOO in
+    //   * HEADER1
+    //     * FOO1
+    //   * HEADER2
+    //     * A
+    //   * HEADER3
+    //     * FOO2
+    QTreeWidget *tree = new QTreeWidget;
+    tree->setColumnCount(1);
+    QList<QTreeWidgetItem *> toplevelitems;
+    QTreeWidgetItem *item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER1"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("FOO1")));
+    toplevelitems << item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER2"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("A")));
+    toplevelitems << item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER3"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("FOO2")));
+    toplevelitems << item;
+    tree->addTopLevelItems(toplevelitems);
+
+    // set up
+    Find::TreeViewFind *findSupport = new Find::TreeViewFind(tree);
+    tree->setCurrentItem(toplevelitems.at(2)->child(0));
+    QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO2"));
+
+    // forward
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
+
+    // backward
+    tree->setCurrentItem(toplevelitems.at(0)->child(0));
+    QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("FOO1"));
+    findSupport->findStep(QLatin1String("FOO"), Find::FindBackward);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0));
+
+    // clean up
+    delete findSupport;
+    delete tree;
+}
+
+void tst_treeviewfind::columns()
+{
+    // set up tree
+    //   search for FOO in
+    //   * HEADER1 | HEADER1
+    //     * FOO1  | A
+    //   * HEADER2 | FOOHEADER2
+    //     * FOO2  | FOO3
+    //   * HEADER3 | HEADER2
+    //     * A     | FOO4
+    QTreeWidget *tree = new QTreeWidget;
+    tree->setColumnCount(2);
+    QList<QTreeWidgetItem *> toplevelitems;
+    QTreeWidgetItem *item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER1") << QLatin1String("HEADER1"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("FOO1") << QLatin1String("A")));
+    toplevelitems << item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER2") << QLatin1String("FOOHEADER2"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("FOO2") << QLatin1String("FOO3")));
+    toplevelitems << item;
+    item = new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("HEADER3") << QLatin1String("HEADER3"));
+    item->addChild(new QTreeWidgetItem((QTreeWidget *)0, QStringList() << QLatin1String("A") << QLatin1String("FOO4")));
+    toplevelitems << item;
+    tree->addTopLevelItems(toplevelitems);
+
+    // set up
+    Find::TreeViewFind *findSupport = new Find::TreeViewFind(tree);
+    tree->setCurrentItem(toplevelitems.at(0));
+    QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("HEADER1"));
+
+    // find in first column
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
+    // find in second column of node with children
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(1));
+    // again find in first column
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(1)->child(0));
+    // don't stay in item if multiple columns match, and find in second column
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0));
+    // wrap
+    findSupport->findStep(QLatin1String("FOO"), 0);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
+
+    // backwards
+    tree->setCurrentItem(toplevelitems.at(2)->child(0));
+    QCOMPARE(tree->currentItem()->text(0), QString::fromLatin1("A"));
+    findSupport->findStep(QLatin1String("FOO"), Find::FindBackward);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(1)->child(0));
+    findSupport->findStep(QLatin1String("FOO"), Find::FindBackward);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(1));
+    findSupport->findStep(QLatin1String("FOO"), Find::FindBackward);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(0)->child(0));
+    findSupport->findStep(QLatin1String("FOO"), Find::FindBackward);
+    QCOMPARE(tree->currentItem(), toplevelitems.at(2)->child(0));
+
+    // clean up
+    delete findSupport;
+    delete tree;
+}
+
+QTEST_MAIN(tst_treeviewfind)
+
+#include "tst_treeviewfind.moc"
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index a11571da51..f47920ec1e 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -284,7 +284,7 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None,
                 test.fail("Failed to check target '%s'." % Targets.getStringForTarget(current))
             else:
                 # Simulator has been added without knowing whether configured or not - so skip warning here?
-                if current != Targets.Targets.SIMULATOR:
+                if current != Targets.SIMULATOR:
                     test.warning("Target '%s' is not set up correctly." % Targets.getStringForTarget(current))
     return checkedTargets