diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentHorizontalButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AlignmentVerticalButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/AnchorButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/BorderImageSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/CheckBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorLabel.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorLabel.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorScheme.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorScheme.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorTypeButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColorTypeButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColumnSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ColumnSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ComboBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBoxAlternate.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/DoubleSpinBoxAlternate.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExpressionEditor.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Extended.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Extended.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedFunctionButton.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedSwitches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ExtendedSwitches.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlagedButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlagedButton.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlickableSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlipableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FlipableSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontComboBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/FontStyleButtons.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Geometry.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GridSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBoxOption.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/GroupBoxOption.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalLayout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalWhiteLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/HorizontalWhiteLine.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ImageSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/IntEditor.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ItemPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Label.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Label.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Layout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/LayoutPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/LineEdit.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ListViewSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Modifiers.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/PlaceHolder.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/PlaceHolder.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/PropertyFrame.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/PropertyFrame.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RectangleSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/RowSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/ScrollArea.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/ScrollArea.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/SliderWidget.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/SpinBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextColorGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/StandardTextGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Switches.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextEditSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputGroupBox.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextInputSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/TextSpecifics.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Transformation.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Type.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/VerticalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/VerticalLayout.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/Visibility.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/Visibility.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbottom.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbottom.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbox.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorbox.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorfill.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorfill.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorhorizontal.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorhorizontal.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorleft.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorleft.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorright.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorright.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorspacer.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorspacer.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchortop.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchortop.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorvertical.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/anchorvertical.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/applybutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/applybutton.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/aspectlock.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/aspectlock.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/cancelbutton.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/cancelbutton.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/emptyPane.qml
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentbottom-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentcenterh-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentleft-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentmiddle-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmentright-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/alignmenttop-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/apply.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/apply.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/behaivour.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/behaivour.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/blended-image-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/blended-image-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/bold-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/button.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/button.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/cancel.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/cancel.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/default-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/default-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/downArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/downArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/expression.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/expression.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/extended.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/extended.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/grid-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/grid-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_gradient.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_gradient.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_none.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_none.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_solid.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/icon_color_solid.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/image-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/image-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/italic-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/item-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/item-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/layout.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/layout.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/leftArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/leftArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/list-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/list-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/mouse-area-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/mouse-area-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/placeholder.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/placeholder.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rect-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rect-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/reset-button.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/reset-button.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rightArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/rightArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/standard.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/standard.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/strikeout-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/submenu.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/submenu.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-edit-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-edit-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/text-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-h-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-h-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-icon.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/underline-icon.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/upArrow.png b/share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/images/upArrow.png
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/layoutWidget.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/layoutWidget.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/propertyEditor.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/propertyEditor.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/specialCheckBox.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/specialCheckBox.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonleft.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonleft.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonmiddle.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonmiddle.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonright.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/styledbuttonright.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/switch.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/switch.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtQuick/typeLabel.css b/share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
similarity index 100%
rename from share/qtcreator/qmldesigner/propertyeditor/QtQuick/typeLabel.css
rename to share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
index 0ff80e33100155e3047db434e3d672201215dc2a..2be51f77b059eb42e057d12c409d701a2aafd941 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml
@@ -1,6 +1,6 @@
import Qt 4.7
import Bauhaus 1.0
-import "../QtQuick/"
+import "../Qt/"
QWidget {
layout: QVBoxLayout {
diff --git a/src/plugins/qmldesigner/bla.txt b/src/plugins/qmldesigner/bla.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8a4e2ba503dc2ef9a8296d42a08a2ac7e69c38b0
--- /dev/null
+++ b/src/plugins/qmldesigner/bla.txt
@@ -0,0 +1,643 @@
+diff --git a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+index ee55ff4..30a3948 100644
+--- a/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
++++ b/src/plugins/qmldesigner/components/formeditor/dragtool.cpp
+@@ -37,10 +37,12 @@
+ #include <metainfo.h>
+
+ #include "resizehandleitem.h"
++#include <rewritingexception.h>
+
+ #include <QApplication>
+ #include <QGraphicsSceneMouseEvent>
+ #include <QtDebug>
++#include <QMessageBox>
+
+ namespace QmlDesigner {
+
+@@ -143,7 +145,7 @@ void DragTool::createQmlItemNode(const ItemLibraryEntry &itemLibraryEntry, QmlIt
+ m_dragNode = view()->createQmlItemNode(itemLibraryEntry, pos, parentNode);
+
+ Q_ASSERT(m_dragNode.modelNode().isValid());
+- Q_ASSERT(m_dragNode.isValid());
++ //Q_ASSERT(m_dragNode.isValid());
+
+ QList<QmlItemNode> nodeList;
+ nodeList.append(m_dragNode);
+@@ -205,7 +207,11 @@ void DragTool::dropEvent(QGraphicsSceneDragDropEvent * event)
+ event->accept();
+ end(event->scenePos());
+ //Q_ASSERT(m_token.isValid());
+- m_rewriterTransaction.commit();
++ try {
++ m_rewriterTransaction.commit();
++ } catch (RewritingException &e) {
++ QMessageBox::warning(0, "Error", e.description());
++ }
+ m_dragNode = ModelNode();
+ view()->changeToSelectionTool();
+ }
+@@ -230,7 +236,11 @@ void DragTool::dragLeaveEvent(QGraphicsSceneDragDropEvent * event)
+ if (m_dragNode.isValid())
+ m_dragNode.destroy();
+ end(event->scenePos());
+- m_rewriterTransaction.commit();
++ try {
++ m_rewriterTransaction.commit();
++ } catch (RewritingException &e) {
++ QMessageBox::warning(0, "Error", e.description());
++ }
+ QmlDesignerItemLibraryDragAndDrop::CustomDragAndDrop::show();
+ QList<QmlItemNode> nodeList;
+ view()->setSelectedQmlItemNodes(nodeList);
+diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+index 3488be9..f8a18ea 100644
+--- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
++++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp
+@@ -116,8 +116,9 @@ void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode)
+ {
+ m_scene->addFormEditorItem(qmlItemNode);
+
+- foreach (const QmlItemNode &nextNode, qmlItemNode.children()) //TODO instance children
+- setupFormEditorItemTree(nextNode);
++ foreach (const QmlObjectNode &nextNode, qmlItemNode.allDirectSubNodes()) //TODO instance children
++ if (QmlItemNode(nextNode).isValid())
++ setupFormEditorItemTree(nextNode.toQmlItemNode());
+ }
+
+ void FormEditorView::nodeCreated(const ModelNode &createdNode)
+diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+index f68dfa0..71f8124 100644
+--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
++++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+@@ -47,6 +47,7 @@
+ #include <componentaction.h>
+ #include <qmlobjectnode.h>
+ #include <rewriterview.h>
++#include <rewritingexception.h>
+ #include <nodelistproperty.h>
+ #include <toolbox.h>
+
+@@ -462,6 +463,8 @@ void DesignDocumentController::copySelected()
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
+ model->setMetaInfo(m_d->model->metaInfo());
+ model->setFileUrl(m_d->model->fileUrl());
++ foreach (const Import &import, m_d->model->imports())
++ model->addImport(import);
+
+ Q_ASSERT(model);
+
+@@ -557,6 +560,8 @@ void DesignDocumentController::paste()
+ QScopedPointer<Model> model(Model::create("empty"));
+ model->setMetaInfo(m_d->model->metaInfo());
+ model->setFileUrl(m_d->model->fileUrl());
++ foreach (const Import &import, m_d->model->imports())
++ model->addImport(import);
+ Q_ASSERT(model);
+
+ if (!m_d->model)
+@@ -601,48 +606,56 @@ void DesignDocumentController::paste()
+
+ QList<ModelNode> pastedNodeList;
+
+- RewriterTransaction transaction(m_d->formEditorView.data());
++ try {
++ RewriterTransaction transaction(m_d->formEditorView.data());
+
+- int offset = double(qrand()) / RAND_MAX * 20 - 10;
++ int offset = double(qrand()) / RAND_MAX * 20 - 10;
+
+- foreach (const ModelNode &node, selectedNodes) {
+- QString defaultProperty(targetNode.metaInfo().defaultProperty());
+- ModelNode pastedNode(view.insertModel(node));
+- pastedNodeList.append(pastedNode);
+- scatterItem(pastedNode, targetNode, offset);
+- targetNode.nodeListProperty(defaultProperty).reparentHere(pastedNode);
+- }
++ foreach (const ModelNode &node, selectedNodes) {
++ QString defaultProperty(targetNode.metaInfo().defaultProperty());
++ ModelNode pastedNode(view.insertModel(node));
++ pastedNodeList.append(pastedNode);
++ scatterItem(pastedNode, targetNode, offset);
++ targetNode.nodeListProperty(defaultProperty).reparentHere(pastedNode);
++ }
+
+- view.setSelectedModelNodes(pastedNodeList);
++ view.setSelectedModelNodes(pastedNodeList);
++ } catch (RewritingException &e) {
++ qWarning() << e.description(); //silent error
++ }
+ } else {
+- RewriterTransaction transaction(m_d->formEditorView.data());
++ try {
++ RewriterTransaction transaction(m_d->formEditorView.data());
+
+- model->detachView(&view);
+- m_d->model->attachView(&view);
+- ModelNode pastedNode(view.insertModel(rootNode));
+- ModelNode targetNode;
++ model->detachView(&view);
++ m_d->model->attachView(&view);
++ ModelNode pastedNode(view.insertModel(rootNode));
++ ModelNode targetNode;
+
+- if (!view.selectedModelNodes().isEmpty())
+- targetNode = view.selectedModelNodes().first();
++ if (!view.selectedModelNodes().isEmpty())
++ targetNode = view.selectedModelNodes().first();
+
+- if (!targetNode.isValid())
+- targetNode = view.rootModelNode();
++ if (!targetNode.isValid())
++ targetNode = view.rootModelNode();
+
+- if (targetNode.parentProperty().isValid() &&
+- (pastedNode.simplifiedTypeName() == targetNode.simplifiedTypeName()) &&
+- (pastedNode.variantProperty("width").value() == targetNode.variantProperty("width").value()) &&
+- (pastedNode.variantProperty("height").value() == targetNode.variantProperty("height").value()))
++ if (targetNode.parentProperty().isValid() &&
++ (pastedNode.simplifiedTypeName() == targetNode.simplifiedTypeName()) &&
++ (pastedNode.variantProperty("width").value() == targetNode.variantProperty("width").value()) &&
++ (pastedNode.variantProperty("height").value() == targetNode.variantProperty("height").value()))
+
+- targetNode = targetNode.parentProperty().parentModelNode();
++ targetNode = targetNode.parentProperty().parentModelNode();
+
+- QString defaultProperty(targetNode.metaInfo().defaultProperty());
++ QString defaultProperty(targetNode.metaInfo().defaultProperty());
+
+- scatterItem(pastedNode, targetNode);
+- if (targetNode.nodeListProperty(defaultProperty).isValid()) {
+- targetNode.nodeListProperty(defaultProperty).reparentHere(pastedNode);
+- }
++ scatterItem(pastedNode, targetNode);
++ if (targetNode.nodeListProperty(defaultProperty).isValid()) {
++ targetNode.nodeListProperty(defaultProperty).reparentHere(pastedNode);
++ }
+
+- view.setSelectedModelNodes(QList<ModelNode>() << pastedNode);
++ view.setSelectedModelNodes(QList<ModelNode>() << pastedNode);
++ } catch (RewritingException &e) {
++ qWarning() << e.description(); //silent error
++ }
+ }
+ }
+
+diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+index dc5244f..5d5890d 100644
+--- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
++++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+@@ -130,7 +130,12 @@ void DesignDocumentControllerView::fromText(QString text)
+ inputModel->setMetaInfo(model()->metaInfo());
+ inputModel->setFileUrl(model()->fileUrl());
+ QPlainTextEdit textEdit;
+- QString imports("import Qt 4.7;\n");
++ QString imports;//("import Qt 4.7;\n");
++ qDebug() << imports;
++ qDebug() << model()->metaInfo().hasNodeMetaInfo("Button");
++ foreach (Import import, model()->imports())
++ imports += import.toString() + ";\n";
++ qDebug() << imports;
+ textEdit.setPlainText(imports + text);
+ NotIndentingTextEditModifier modifier(&textEdit);
+
+diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+index ec66ff7..df08b21 100644
+--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
++++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+@@ -37,6 +37,7 @@
+ #include <qgraphicswidget.h>
+ #include <abstractview.h>
+ #include <invalididexception.h>
++#include <rewritingexception.h>
+
+ #include <QMimeData>
+ #include <QMessageBox>
+@@ -470,49 +471,55 @@ void NavigatorTreeModel::removeSubTree(const ModelNode &node)
+
+ void NavigatorTreeModel::moveNodesInteractive(NodeAbstractProperty parentProperty, const QList<ModelNode> &modelNodes, int targetIndex)
+ {
+- QString propertyQmlType = qmlTypeInQtContainer(parentProperty.metaInfo().type());
+-
+- RewriterTransaction transaction = m_view->beginRewriterTransaction();
+- foreach (const ModelNode &node, modelNodes) {
+- if (!node.isValid())
+- continue;
+-
+- if (node != parentProperty.parentModelNode() &&
+- !node.isAncestorOf(parentProperty.parentModelNode()) &&
+- node.metaInfo().isSubclassOf(propertyQmlType, -1, -1)) {
+-
+- if (node.parentProperty() != parentProperty) {
++ try {
++ QString propertyQmlType = qmlTypeInQtContainer(parentProperty.metaInfo().type());
++
++ RewriterTransaction transaction = m_view->beginRewriterTransaction();
++ foreach (const ModelNode &node, modelNodes) {
++ if (!node.isValid())
++ continue;
++
++ if (node != parentProperty.parentModelNode() &&
++ !node.isAncestorOf(parentProperty.parentModelNode()) &&
++ (node.metaInfo().isSubclassOf(propertyQmlType, -1, -1) || propertyQmlType == "alias")) {
++ //### todo: allowing alias is just a heuristic
++ //once the MetaInfo is part of instances we can do this right
++
++ if (node.parentProperty() != parentProperty) {
++
++ if (parentProperty.isNodeProperty()) {
++ ModelNode propertyNode = parentProperty.toNodeProperty().modelNode();
++ // Destruction of ancestors is not allowed
++ if (propertyNode.isAncestorOf(node)) {
++ continue;
++ }
++ if (propertyNode.isValid()) {
++ QApplication::setOverrideCursor(Qt::ArrowCursor);
++ if (QMessageBox::warning(0, tr("Warning"), tr("Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?").arg(node.id(), propertyNode.id()), QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
++ QApplication::restoreOverrideCursor();
++ continue;
++ }
++ QApplication::restoreOverrideCursor();
++ propertyNode.destroy();
++ }
++ }
+
+- if (parentProperty.isNodeProperty()) {
+- ModelNode propertyNode = parentProperty.toNodeProperty().modelNode();
+- // Destruction of ancestors is not allowed
+- if (propertyNode.isAncestorOf(node)) {
+- continue;
++ parentProperty.reparentHere(node);
+ }
+- if (propertyNode.isValid()) {
+- QApplication::setOverrideCursor(Qt::ArrowCursor);
+- if (QMessageBox::warning(0, tr("Warning"), tr("Reparenting the component %1 here will cause the component %2 to be deleted. Do you want to proceed?").arg(node.id(), propertyNode.id()), QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Cancel) {
+- QApplication::restoreOverrideCursor();
+- continue;
++
++ if (parentProperty.isNodeListProperty()) {
++ int index = parentProperty.toNodeListProperty().toModelNodeList().indexOf(node);
++ if (index < targetIndex) { // item is first removed from oldIndex, then inserted at new index
++ --targetIndex;
++ }
++ if (index != targetIndex) {
++ parentProperty.toNodeListProperty().slide(index, targetIndex);
+ }
+- QApplication::restoreOverrideCursor();
+- propertyNode.destroy();
+ }
+- }
+-
+- parentProperty.reparentHere(node);
+- }
+-
+- if (parentProperty.isNodeListProperty()) {
+- int index = parentProperty.toNodeListProperty().toModelNodeList().indexOf(node);
+- if (index < targetIndex) { // item is first removed from oldIndex, then inserted at new index
+- --targetIndex;
+- }
+- if (index != targetIndex) {
+- parentProperty.toNodeListProperty().slide(index, targetIndex);
+- }
+ }
+ }
++ } catch (RewritingException &e) { //better safe than sorry! There always might be cases where we fail
++ QMessageBox::warning(0, "Error", e.description());
+ }
+ }
+
+diff --git a/src/plugins/qmldesigner/designercore/include/metainfo.h b/src/plugins/qmldesigner/designercore/include/metainfo.h
+index 2d4af4d..b09d569 100644
+--- a/src/plugins/qmldesigner/designercore/include/metainfo.h
++++ b/src/plugins/qmldesigner/designercore/include/metainfo.h
+@@ -84,6 +84,7 @@ public:
+
+ QString fromQtTypes(const QString &type) const;
+
++ void inheritFrom(MetaInfo &other);
+
+ public:
+ static MetaInfo global();
+diff --git a/src/plugins/qmldesigner/designercore/include/nodeinstance.h b/src/plugins/qmldesigner/designercore/include/nodeinstance.h
+index c2fce99..12aa17e 100644
+--- a/src/plugins/qmldesigner/designercore/include/nodeinstance.h
++++ b/src/plugins/qmldesigner/designercore/include/nodeinstance.h
+@@ -59,6 +59,7 @@ namespace Internal {
+ class ObjectNodeInstance;
+ class QmlGraphicsItemNodeInstance;
+ class QmlPropertyChangesNodeInstance;
++ class GraphicsObjectNodeInstance;
+ class QmlStateNodeInstance;
+ }
+
+@@ -72,6 +73,7 @@ class CORESHARED_EXPORT NodeInstance
+ friend CORESHARED_EXPORT bool operator==(const NodeInstance &first, const NodeInstance &second);
+ friend CORESHARED_EXPORT class NodeMetaInfo;
+ friend class QmlDesigner::Internal::QmlGraphicsItemNodeInstance;
++ friend class QmlDesigner::Internal::GraphicsObjectNodeInstance;
+ friend class QmlDesigner::Internal::ObjectNodeInstance;
+ friend class QmlDesigner::Internal::QmlPropertyChangesNodeInstance;
+ friend class QmlDesigner::Internal::QmlStateNodeInstance;
+diff --git a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
+index 926d446..d658415 100644
+--- a/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
++++ b/src/plugins/qmldesigner/designercore/instances/graphicsobjectnodeinstance.cpp
+@@ -70,8 +70,10 @@ QSizeF GraphicsObjectNodeInstance::size() const
+
+ QTransform GraphicsObjectNodeInstance::transform() const
+ {
+- if (graphicsObject()->parentItem())
+- return graphicsObject()->itemTransform(graphicsObject()->parentItem());
++ NodeInstance nodeInstanceParent = nodeInstanceView()->instanceForNode(modelNode()).parent();
++ QGraphicsObject *graphicsObjectParent = qobject_cast<QGraphicsObject*>(nodeInstanceParent.internalObject());
++ if (graphicsObjectParent)
++ return graphicsObject()->itemTransform(graphicsObjectParent);
+ else
+ return sceneTransform();
+ }
+@@ -163,6 +165,11 @@ void initOption(QGraphicsItem *item, QStyleOptionGraphicsItem *option, const QTr
+
+ void GraphicsObjectNodeInstance::paintRecursively(QGraphicsItem *graphicsItem, QPainter *painter) const
+ {
++ if (QGraphicsObject *graphicsObject = graphicsItem->toGraphicsObject()) {
++ if (nodeInstanceView()->hasInstanceForObject(graphicsObject))
++ return; //we already keep track of this object elsewhere
++ }
++
+ if (graphicsItem->isVisible()) {
+ painter->save();
+ painter->setTransform(graphicsItem->itemTransform(graphicsItem->parentItem()), true);
+diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+index d331d9c..28acccf 100644
+--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
++++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+@@ -261,7 +261,21 @@ void NodeInstance::reparent(const NodeInstance &oldParentInstance, const QString
+ */
+ NodeInstance NodeInstance::parent() const
+ {
+- return m_nodeInstance->nodeInstanceView()->instanceForObject(m_nodeInstance->parent());
++ QObject *parent = m_nodeInstance->parent();
++ //Maybe the object has been reparented inside a component and we
++ //do not keep track of the parent?
++ //In this case we iterate until we find a parent we keep track of,
++ //parent() gets 0
++ while (!m_nodeInstance->nodeInstanceView()->hasInstanceForObject(parent)) {
++ if (!parent) //this should not happen! warning?
++ return m_nodeInstance->nodeInstanceView()->instanceForObject(parent);
++ if (QGraphicsObject *graphicsObject = qobject_cast<QGraphicsObject*>(parent))
++ parent = graphicsObject->parentItem()->toGraphicsObject();
++ else
++ parent = parent->parent();
++ }
++ m_nodeInstance->nodeInstanceView()->instanceForObject(m_nodeInstance->parent());
++ return m_nodeInstance->nodeInstanceView()->instanceForObject(parent);
+ }
+
+ bool NodeInstance::hasParent() const
+diff --git a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
+index 121b6e0..707592b 100644
+--- a/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
++++ b/src/plugins/qmldesigner/designercore/instances/qmlgraphicsitemnodeinstance.cpp
+@@ -121,13 +121,15 @@ QSizeF QmlGraphicsItemNodeInstance::size() const
+ if (modelNode().isRootNode()) {
+ if (!m_hasWidth) {
+ qmlGraphicsItem()->blockSignals(true);
+- qmlGraphicsItem()->setWidth(100.);
++ if (qmlGraphicsItem()->width() < 10.)
++ qmlGraphicsItem()->setWidth(100.);
+ qmlGraphicsItem()->blockSignals(false);
+ }
+
+ if (!m_hasHeight) {
+ qmlGraphicsItem()->blockSignals(true);
+- qmlGraphicsItem()->setHeight(100.);
++ if (qmlGraphicsItem()->height() < 10.)
++ qmlGraphicsItem()->setHeight(100.);
+ qmlGraphicsItem()->blockSignals(false);
+ }
+ }
+@@ -163,13 +165,15 @@ QRectF QmlGraphicsItemNodeInstance::boundingRect() const
+ if (modelNode().isRootNode()) {
+ if (!m_hasWidth) {
+ qmlGraphicsItem()->blockSignals(true);
+- qmlGraphicsItem()->setWidth(100.);
++ if (qmlGraphicsItem()->width() < 10.)
++ qmlGraphicsItem()->setWidth(100.);
+ qmlGraphicsItem()->blockSignals(false);
+ }
+
+ if (!m_hasHeight) {
+ qmlGraphicsItem()->blockSignals(true);
+- qmlGraphicsItem()->setHeight(100.);
++ if (qmlGraphicsItem()->height() < 10.)
++ qmlGraphicsItem()->setHeight(100.);
+ qmlGraphicsItem()->blockSignals(false);
+ }
+ }
+diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+index f350af0..5d89ba9 100644
+--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
++++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+@@ -526,6 +526,13 @@ QString MetaInfo::fromQtTypes(const QString &type) const
+ return type;
+ }
+
++void MetaInfo::inheritFrom(MetaInfo &other)
++{
++ if (other.m_p.isNull())
++ return;
++ m_p = other.m_p;
++}
++
+ /*!
+ \brief Returns whether an enumerator is registered in the meta type system.
+ */
+diff --git a/src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
+index 9e84ae0..f7c3b1e 100644
+--- a/src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
++++ b/src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
+@@ -270,7 +270,8 @@ bool PropertyMetaInfo::isListProperty() const
+ throw InvalidMetaInfoException(__LINE__, Q_FUNC_INFO, __FILE__);
+ }
+
+- return type().contains("QDeclarativeList");
++ return type().contains("QDeclarativeList") ||
++ type().contains("alias"); //### this is a nasty hack - we have to get instances in to resolve this properly
+ }
+
+ /*!
+diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+index 03bbde7..635f954 100644
+--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
++++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+@@ -114,7 +114,7 @@ SubComponentManagerPrivate::SubComponentManagerPrivate(MetaInfo metaInfo, SubCom
+ m_metaInfo(metaInfo)
+ {
+ connect(&m_watcher, SIGNAL(directoryChanged(QString)), this, SLOT(parseDirectory(QString)));
+- connect(&m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(parseFile(QString)));
++ connect(&m_watcher, SIGNAL(fileChanged(QString)), this, SLOT(parseFile(QString, QString)));
+ }
+
+ void SubComponentManagerPrivate::addImport(int pos, const QDeclarativeDomImport &import)
+diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+index 7e9290c..0184d64 100644
+--- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
++++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp
+@@ -38,6 +38,7 @@
+ #include "bindingproperty.h"
+ #include "variantproperty.h"
+ #include "rewritertransaction.h"
++#include <rewritingexception.h>
+
+ #include <QSet>
+ #include <QStringList>
+@@ -61,6 +62,8 @@ static QString fixExpression(const QString &expression, const QHash<QString, QSt
+ static void syncVariantProperties(ModelNode &outputNode, const ModelNode &inputNode)
+ {
+ foreach (const VariantProperty &variantProperty, inputNode.variantProperties()) {
++ qDebug() << variantProperty.name();
++ qDebug() << variantProperty.value();
+ outputNode.variantProperty(variantProperty.name()) = variantProperty.value();
+ }
+ }
+@@ -168,26 +171,30 @@ ModelNode ModelMerger::insertModel(const ModelNode &modelNode)
+
+ void ModelMerger::replaceModel(const ModelNode &modelNode)
+ {
+- RewriterTransaction transaction(view()->beginRewriterTransaction());
++ try {
++ RewriterTransaction transaction(view()->beginRewriterTransaction());
+
+- foreach (const Import &import, modelNode.model()->imports())
+- view()->model()->addImport(import);
+- view()->model()->setFileUrl(modelNode.model()->fileUrl());
++ foreach (const Import &import, modelNode.model()->imports())
++ view()->model()->addImport(import);
++ view()->model()->setFileUrl(modelNode.model()->fileUrl());
+
+- ModelNode rootNode(view()->rootModelNode());
++ ModelNode rootNode(view()->rootModelNode());
+
+- foreach (const QString &propertyName, rootNode.propertyNames())
+- rootNode.removeProperty(propertyName);
++ foreach (const QString &propertyName, rootNode.propertyNames())
++ rootNode.removeProperty(propertyName);
+
+- QHash<QString, QString> idRenamingHash;
+- setupIdRenamingHash(modelNode, idRenamingHash, view());
++ QHash<QString, QString> idRenamingHash;
++ setupIdRenamingHash(modelNode, idRenamingHash, view());
+
+- syncVariantProperties(rootNode, modelNode);
+- syncBindingProperties(rootNode, modelNode, idRenamingHash);
+- syncId(rootNode, modelNode, idRenamingHash);
+- syncNodeProperties(rootNode, modelNode, idRenamingHash, view());
+- syncNodeListProperties(rootNode, modelNode, idRenamingHash, view());
+- m_view->changeRootNodeType(modelNode.type(), modelNode.majorVersion(), modelNode.minorVersion());
++ syncVariantProperties(rootNode, modelNode);
++ syncBindingProperties(rootNode, modelNode, idRenamingHash);
++ syncId(rootNode, modelNode, idRenamingHash);
++ syncNodeProperties(rootNode, modelNode, idRenamingHash, view());
++ syncNodeListProperties(rootNode, modelNode, idRenamingHash, view());
++ m_view->changeRootNodeType(modelNode.type(), modelNode.majorVersion(), modelNode.minorVersion());
++ } catch (RewritingException &e) {
++ qWarning() << e.description(); //silent error
++ }
+ }
+
+ } //namespace QmlDesigner
+diff --git a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+index 002550c..da19e7b 100644
+--- a/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
++++ b/src/plugins/qmldesigner/designercore/model/modeltotextmerger.cpp
+@@ -1,7 +1,4 @@
+-/**************************************************************************
+-**
+-** This file is part of Qt Creator
+-**
++/**
+ ** Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+ **
+ ** Contact: Nokia Corporation (qt-info@nokia.com)
+diff --git a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
+index 1df6106..6704469 100644
+--- a/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
++++ b/src/plugins/qmldesigner/designercore/model/qmlanchors.cpp
+@@ -326,7 +326,7 @@ AnchorLine QmlAnchors::instanceAnchor(AnchorLine::Type sourceAnchorLine) const
+ if (targetAnchorLine == AnchorLine::Invalid )
+ return AnchorLine();
+
+- Q_ASSERT(targetAnchorLinePair.second.isValid());
++ //Q_ASSERT(targetAnchorLinePair.second.isValid()); //### todo proper fix
+ return AnchorLine(QmlItemNode(qmlItemNode().nodeForInstance(targetAnchorLinePair.second)), targetAnchorLine);
+ }
+
+diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+index 13d6e94..2d60b2a 100644
+--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
++++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+@@ -155,7 +155,6 @@ QList<QmlObjectNode> QmlItemNode::allDirectSubNodes() const
+ QList<ModelNode> modelNodeList = modelNode().allDirectSubModelNodes();
+
+ foreach (const ModelNode &node, modelNodeList) {
+- if (!QmlItemNode(node).isValid()) //if ModelNode is no FxItem
+ returnList.append(node);
+ }
+ }
+diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+index d0885e7..784e0dd 100644
+--- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
++++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+@@ -200,7 +200,7 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryE
+ parentNode.nodeAbstractProperty(parentNode.defaultProperty()).reparentHere(newNode);
+ }
+
+- Q_ASSERT(newNode.isValid());
++ //Q_ASSERT(newNode.isValid());
+
+ QString id;
+ int i = 1;
+@@ -224,10 +224,10 @@ QmlItemNode QmlModelView::createQmlItemNode(const ItemLibraryEntry &itemLibraryE
+ newNode.setVariantProperty("opacity", 1);
+ }
+
+- Q_ASSERT(newNode.isValid());
++ //Q_ASSERT(newNode.isValid());
+ }
+
+- Q_ASSERT(newNode.isValid());
++ //Q_ASSERT(newNode.isValid());
+
+ return newNode;
+ }
+diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+index 59b1522..4f9946e 100644
+--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
++++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+@@ -216,7 +216,7 @@ public:
+ typeName = qmlValue->packageName() + QLatin1String("/") + qmlValue->className();
+ majorVersion = qmlValue->version().major();
+ minorVersion = qmlValue->version().minor();
+- } else if (value) {
++ } else {
+ for (UiQualifiedId *iter = astTypeNode; iter; iter = iter->next)
+ if (!iter->next && iter->name)
+ typeName = iter->name->asString();
+@@ -711,6 +711,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
+ const QString astType = property->memberType->asString();
+ AbstractProperty modelProperty = modelNode.property(astName);
+ if (!property->expression || isLiteralValue(property->expression)) {
++ qDebug() << astName;
++ qDebug() << astType;
+ const QVariant variantValue = convertDynamicPropertyValueToVariant(astValue, astType);
+ syncVariantProperty(modelProperty, variantValue, astType, differenceHandler);
+ } else {
+diff --git a/src/plugins/qmldesigner/qmldesigner.pro b/src/plugins/qmldesigner/qmldesigner.pro
+index 28abb28..baede56 100644
+--- a/src/plugins/qmldesigner/qmldesigner.pro
++++ b/src/plugins/qmldesigner/qmldesigner.pro
+@@ -1,3 +1,3 @@
+ TEMPLATE = subdirs
+
+-SUBDIRS = qmldesignerplugin.pro fxplugin
++SUBDIRS = qmldesignerplugin.pro fxplugin mxplugin
diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp
index f3e99da2da25752ce5c9d3a9751f0a469c7bb0a8..4967fe8b3d4d5b8ffeb5fb41c6b1f1fb8952a4a9 100644
--- a/src/plugins/qmldesigner/components/integration/componentview.cpp
+++ b/src/plugins/qmldesigner/components/integration/componentview.cpp
@@ -109,7 +109,7 @@ void ComponentView::searchForComponentAndAddToList(const ModelNode &node)
foreach (const ModelNode &childNode, nodeList) {
- if (childNode.type() == "QtQuick/Component") {
+ if (childNode.type() == "Qt/Component") {
if (!childNode.id().isEmpty()) {
QStandardItem *item = new QStandardItem(childNode.id());
item->setData(QVariant::fromValue(childNode), ModelNodeRole);
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
index facc5814839503671456deaa8eaa6c144e952faf..67daf39827ee6725cb465be6e2bc3c36b60c13d0 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
@@ -269,7 +269,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
//m_d->masterModel = Model::create(m_d->textModifier, m_d->searchPath, errors);
- m_d->masterModel = Model::create("QtQick/Rectangle", 4, 7);
+ m_d->masterModel = Model::create("Qt/Rectangle", 4, 7);
#if defined(VIEWLOGGER)
m_d->viewLogger = new Internal::ViewLogger(m_d->model.data());
@@ -278,7 +278,7 @@ QList<RewriterView::Error> DesignDocumentController::loadMaster(QPlainTextEdit *
m_d->masterModel->setFileUrl(m_d->searchPath);
- m_d->subComponentModel = Model::create("QtQuick/Rectangle", 4, 7);
+ m_d->subComponentModel = Model::create("Qt/Rectangle", 4, 7);
m_d->subComponentModel->setFileUrl(m_d->searchPath);
m_d->subComponentManager = new SubComponentManager(m_d->masterModel->metaInfo(), this);
@@ -468,7 +468,7 @@ void DesignDocumentController::deleteSelected()
void DesignDocumentController::copySelected()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
model->setMetaInfo(m_d->model->metaInfo());
model->setFileUrl(m_d->model->fileUrl());
foreach (const Import &import, m_d->model->imports())
@@ -514,7 +514,7 @@ void DesignDocumentController::copySelected()
foreach (ModelNode node, view.rootModelNode().allDirectSubModelNodes()) {
node.destroy();
}
- view.changeRootNodeType("QtQuick/Rectangle", 4, 7);
+ view.changeRootNodeType("Qt/Rectangle", 4, 7);
view.rootModelNode().setId("designer__Selection");
foreach (const ModelNode &selectedNode, selectedNodes) {
@@ -766,7 +766,7 @@ QString DesignDocumentController::contextHelpId() const
QString helpId;
if (!nodes.isEmpty()) {
helpId = nodes.first().type();
- helpId.replace("QtQuick/", "QML.");
+ helpId.replace("Qt/", "QML.");
}
return helpId;
diff --git a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
index c9d91523169d0f42f89f740bd326d2ef9497ec28..6e63157a2b75bf0f43cc2f725b2b213a9f402a18 100644
--- a/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
+++ b/src/plugins/qmldesigner/components/integration/designdocumentcontrollerview.cpp
@@ -107,7 +107,7 @@ void DesignDocumentControllerView::fromClipboard()
QString DesignDocumentControllerView::toText() const
{
- QScopedPointer<Model> outputModel(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> outputModel(Model::create("Qt/Rectangle"));
outputModel->setMetaInfo(model()->metaInfo());
QPlainTextEdit textEdit;
textEdit.setPlainText("import Qt 4.7; Item {}");
@@ -129,7 +129,7 @@ QString DesignDocumentControllerView::toText() const
void DesignDocumentControllerView::fromText(QString text)
{
- QScopedPointer<Model> inputModel(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> inputModel(Model::create("Qt/Rectangle"));
inputModel->setMetaInfo(model()->metaInfo());
inputModel->setFileUrl(model()->fileUrl());
QPlainTextEdit textEdit;
diff --git a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
index 5e46785fd9f5efbd844f66374cc421a8603189cc..3533a95349e2879dd00ba462b78dc7963e3d275e 100644
--- a/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
+++ b/src/plugins/qmldesigner/components/navigator/navigatortreemodel.cpp
@@ -351,7 +351,7 @@ void NavigatorTreeModel::setView(AbstractView *view)
m_view = view;
m_hiddenProperties.clear();
if (view) {
- ModelNode sampleItemNode(m_view->createModelNode("QtQuick/Item", 4, 7));
+ ModelNode sampleItemNode(m_view->createModelNode("Qt/Item", 4, 7));
m_hiddenProperties << visibleProperties(sampleItemNode);
addSubTree(view->rootModelNode());
}
diff --git a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
index 64e03b0dc2bcbde02d6b2c69aa6e019dbe46ea50..3bd5ca8023c6f2d804c910d63d2c4ead5fd567db 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
@@ -806,13 +806,13 @@ void GradientLine::updateGradient()
modelNode.removeProperty(m_gradientName);
}
- ModelNode gradientNode = modelNode.view()->createModelNode("QtQuick/Gradient", 4, 7);
+ ModelNode gradientNode = modelNode.view()->createModelNode("Qt/Gradient", 4, 7);
if (!oldId.isNull())
gradientNode.setId(oldId);
for (int i = 0;i < m_stops.size(); i++) {
- ModelNode gradientStopNode = modelNode.view()->createModelNode("QtQuick/GradientStop", 4, 7);
+ ModelNode gradientStopNode = modelNode.view()->createModelNode("Qt/GradientStop", 4, 7);
gradientStopNode.variantProperty("position") = roundReal(m_stops.at(i));
gradientStopNode.variantProperty("color") = normalizeColor(m_colorList.at(i));
gradientNode.nodeListProperty("stops").reparentHere(gradientStopNode);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 17ad35291201d062af4545d42b02a08cea826c72..51ce941ef32bcbabe73daea9f58eca769fd4ad1c 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -310,7 +310,7 @@ PropertyEditor::~PropertyEditor()
void PropertyEditor::setupPane(const QString &typeName)
{
- QUrl qmlFile = fileToUrl(locateQmlFile(QLatin1String("QtQuick/ItemPane.qml")));
+ QUrl qmlFile = fileToUrl(locateQmlFile(QLatin1String("Qt/ItemPane.qml")));
QUrl qmlSpecificsFile;
qmlSpecificsFile = fileToUrl(locateQmlFile(typeName + "Specifics.qml"));
@@ -577,7 +577,7 @@ QString templateGeneration(NodeMetaInfo type, NodeMetaInfo superType, const QmlO
"DoubleSpinBoxAlternate {\ntext: \"%1\"\nbackendValue: backendValues.%2\nbaseStateFlag: isBaseState\n}\n"
)).arg(name).arg(properName);
}
- if (typeName == "string" || typeName == "QString" || typeName =="url" || typeName =="QUrl") {
+ if (typeName == "string" || typeName == "QString" || typeName == "QUrl" || typeName == "url") {
qmlTemplate += QString(QLatin1String(
"QWidget {\nlayout: HorizontalLayout {\nLabel {\ntext: \"%1\"\ntoolTip: \"%1\"\n}\nLineEdit {\nbackendValue: backendValues.%2\nbaseStateFlag: isBaseState\n}\n}\n}\n"
)).arg(name).arg(properName);
@@ -716,10 +716,10 @@ void PropertyEditor::modelAttached(Model *model)
m_locked = true;
- setupPane("QtQuick/Rectangle");
- setupPane("QtQuick/Text");
- setupPane("QtQuick/TextInput");
- setupPane("QtQuick/TextEdit");
+ setupPane("Qt/Rectangle");
+ setupPane("Qt/Text");
+ setupPane("Qt/TextInput");
+ setupPane("Qt/TextEdit");
resetView();
m_locked = false;
@@ -895,7 +895,7 @@ QUrl PropertyEditor::qmlForNode(const ModelNode &modelNode, QString &className)
}
}
}
- return fileToUrl(QDir(m_qmlDir).filePath("QtQuick/emptyPane.qml"));
+ return fileToUrl(QDir(m_qmlDir).filePath("Qt/emptyPane.qml"));
}
QString PropertyEditor::locateQmlFile(const QString &relativePath) const
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 8c20d615734a5b034c8ff73963d7a728290a1dce..acda0ca8c565566c4610c3bd4f58e8324b90f29c 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -117,7 +117,7 @@ void StatesEditorView::createState(const QString &name)
qDebug() << __FUNCTION__ << name;
try {
- model()->addImport(Import::createLibraryImport("QtQuick", "1.0"));
+ model()->addImport(Import::createLibraryImport("Qt", "4.7"));
stateRootNode().states().addState(name);
} catch (RewritingException &e) {
QMessageBox::warning(0, "Error", e.description());
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index 2cc7c2fc4d5ddedd4509a4c33f341ebe2fe6a503..39da34d8ae817df3ffa9070d9edc85ff6f9eb4d8 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -137,31 +137,31 @@ Internal::ObjectNodeInstance::Pointer NodeInstance::createInstance(const NodeMet
instance = Internal::DummyNodeInstance::create();
else if (metaInfo.isSubclassOf("QtWebKit/WebView", 1, 0))
instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("QtQuick/QWidget", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QWidget", 4, 7))
instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsView", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsView", 4, 7))
instance = Internal::GraphicsViewNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QDeclarativeView", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QDeclarativeView", 4, 7))
instance = Internal::QDeclarativeViewNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsWidget", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsWidget", 4, 7))
instance = Internal::GraphicsWidgetNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QDeclarativeBasePositioner", 1, 0))
+ else if (metaInfo.isSubclassOf("QDeclarativeBasePositioner", 4, 7))
instance = Internal::PositionerNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Item", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Item", 4, 7))
instance = Internal::QmlGraphicsItemNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QGraphicsScene", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QGraphicsScene", 4, 7))
instance = Internal::GraphicsSceneNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Component", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Component", 4, 7))
instance = Internal::ComponentNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/PropertyChanges", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/PropertyChanges", 4, 7))
instance = Internal::QmlPropertyChangesNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/State", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/State", 4, 7))
instance = Internal::QmlStateNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Transition", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Transition", 4, 7))
instance = Internal::QmlTransitionNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/Behavior", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/Behavior", 4, 7))
instance = Internal::BehaviorNodeInstance::create(metaInfo, context, objectToBeWrapped);
- else if (metaInfo.isSubclassOf("QtQuick/QtObject", 1, 0))
+ else if (metaInfo.isSubclassOf("Qt/QtObject", 4, 7))
instance = Internal::ObjectNodeInstance::create(metaInfo, context, objectToBeWrapped);
else
instance = Internal::DummyNodeInstance::create();
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
index 6f98f505363a3cd9af5b6520316168268a8d6ca3..30b5d43acd566d90a9dccb7201b75ac0cf2bfed5 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceview.cpp
@@ -189,7 +189,7 @@ void NodeInstanceView::resetInstanceProperty(const AbstractProperty &property)
NodeInstance instance = instanceForNode(property.parentModelNode());
Q_ASSERT(instance.isValid());
const QString name = property.name();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool statePropertyWasReseted = activeStateInstance().resetStateProperty(instance, name, instance.resetVariant(name));
if (!statePropertyWasReseted)
instance.resetProperty(name);
@@ -207,7 +207,7 @@ void NodeInstanceView::setInstancePropertyBinding(const BindingProperty &propert
const QString expression = property.expression();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool stateBindingWasUpdated = activeStateInstance().updateStateBinding(instance, name, expression);
if (!stateBindingWasUpdated) {
if (property.isDynamic())
@@ -243,7 +243,7 @@ void NodeInstanceView::setInstancePropertyVariant(const VariantProperty &propert
const QVariant value = property.value();
- if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 1, 0)) {
+ if (activeStateInstance().isValid() && !property.parentModelNode().metaInfo().isSubclassOf("PropertyChange", 4, 7)) {
bool stateValueWasUpdated = activeStateInstance().updateStateVariant(instance, name, value);
if (!stateValueWasUpdated) {
if (property.isDynamic())
diff --git a/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
index 732502e7a995e6db1db4f23cbe398f5676d1adac..ecb5ec5ae122637448e824aa3b98037ad4da375f 100644
--- a/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/proxywidgetnodeinstance.cpp
@@ -44,7 +44,7 @@ ProxyWidgetNodeInstance::ProxyWidgetNodeInstance(QGraphicsProxyWidget *widget)
ProxyWidgetNodeInstance::Pointer ProxyWidgetNodeInstance::create(const QString &typeName)
{
- QObject *object = QDeclarativeMetaType::qmlType(typeName.toLatin1(), 1, 0)->create();
+ QObject *object = QDeclarativeMetaType::qmlType(typeName.toLatin1(), 4, 7)->create();
Q_ASSERT(object);
if (object == 0)
return Pointer();
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 61f8bf7b27b592d28229810d648b324143262f6a..b096f12a6e00c19cfec6fd543e06a85c1df102c6 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -279,10 +279,10 @@ QList<QDeclarativeType*> MetaInfoPrivate::qmlTypes()
static inline bool isDepricatedQtType(const QString &typeName)
{
- if (typeName.length() < 3)
+ if (typeName.length() < 8)
return false;
- return (typeName.at(0) == 'Q' && typeName.at(1) == 't' && typeName.at(2) == '/');
+ return typeName.contains("QtQuick/");
}
void MetaInfoPrivate::typeInfo(const QMetaObject *qMetaObject, QString *typeName, int *majorVersion, int *minorVersion) const
@@ -304,7 +304,7 @@ void MetaInfoPrivate::typeInfo(const QMetaObject *qMetaObject, QString *typeName
}
if (isDepricatedQtType(qmlType->qmlTypeName())) { //### todo there has to be an alternative
QString properTypeName = qmlType->qmlTypeName();
- properTypeName.replace("Qt/", "QtQuick/");
+ properTypeName.replace("QtQuick/", "Qt/");
*typeName = properTypeName;
majVersion = 1;
minVersion = 0;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index dbd6c973d13dec8242a695e3382f41619cd3e16a..81fb3552bf147a65e29d1584c916acff17db253b 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -328,10 +328,10 @@ void SubComponentManagerPrivate::unregisterQmlFile(const QFileInfo &fileInfo, co
static inline bool isDepricatedQtType(const QString &typeName)
{
- if (typeName.length() < 3)
+ if (typeName.length() < 8)
return false;
- return (typeName.at(0) == 'Q' && typeName.at(1) == 't' && typeName.at(2) == '/');
+ return typeName.contains("QtQuick/");
}
@@ -366,7 +366,7 @@ void SubComponentManagerPrivate::registerQmlFile(const QFileInfo &fileInfo, cons
rootObject.objectTypeMinorVersion());
} else {
QString properClassName = rootObject.objectType();
- properClassName.replace("Qt/", "QtQuick/");
+ properClassName.replace("QtQuick/", "Qt/");
nodeInfo.setSuperClass(properClassName,
1,
0);
diff --git a/src/plugins/qmldesigner/designercore/model/model.cpp b/src/plugins/qmldesigner/designercore/model/model.cpp
index 56035fb53ff25dcf8a318d81d322bfa089dff432..8a714b1bf99cdb46cdb40cdfc4894e65adbd6343 100644
--- a/src/plugins/qmldesigner/designercore/model/model.cpp
+++ b/src/plugins/qmldesigner/designercore/model/model.cpp
@@ -90,7 +90,7 @@ ModelPrivate::ModelPrivate(Model *model) :
m_q(model),
m_writeLock(false)
{
- m_rootInternalNode = createNode("QtQuick/Item", 1, 0, PropertyListType());
+ m_rootInternalNode = createNode("Qt/Item", 4, 7, PropertyListType());
}
ModelPrivate::~ModelPrivate()
diff --git a/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp b/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
index ad5b5ab829478159350c740d5b71195ab98576af..111d98091ceabfbe1f9803bebf03a86c4e73b8c4 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlchangeset.cpp
@@ -51,12 +51,12 @@ void QmlModelStateOperation::setTarget(const ModelNode &target)
bool QmlPropertyChanges::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QtQuick/PropertyChanges", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("Qt/PropertyChanges", 4, 7);
}
bool QmlModelStateOperation::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QDeclarativeStateOperation", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isSubclassOf("QDeclarativeStateOperation", 4, 7);
}
void QmlPropertyChanges::removeProperty(const QString &name)
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index dd3426c53a91487341977a52f4efce007e3f8f55..8a6369475ac1cdcc70c74228a0a65cf715220a77 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -46,7 +46,7 @@ namespace QmlDesigner {
bool QmlItemNode::isValid() const
{
- return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().isSubclassOf("QtQuick/Item", 1, 0);
+ return QmlModelNodeFacade::isValid() && modelNode().metaInfo().isValid() && modelNode().metaInfo().isSubclassOf("Qt/Item", 4, 7);
}
bool QmlItemNode::isRootNode() const
@@ -302,7 +302,7 @@ QmlModelState QmlModelStateGroup::addState(const QString &name)
PropertyListType propertyList;
propertyList.append(qMakePair(QString("name"), QVariant(name)));
- ModelNode newState = modelNode().view()->createModelNode("QtQuick/State", 1, 0, propertyList);
+ ModelNode newState = modelNode().view()->createModelNode("Qt/State", 4, 7, propertyList);
modelNode().nodeListProperty("states").reparentHere(newState);
return newState;
diff --git a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
index e9dfbad5399969588f65d128499fcdd78282c557..191114bf1b7fcdf2aed65099d05fe70e7f3d63a1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlmodelview.cpp
@@ -98,8 +98,8 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
QmlItemNode newNode;
RewriterTransaction transaction = beginRewriterTransaction();
{
- const QString newImportUrl = QLatin1String("QtQuick");
- const QString newImportVersion = QLatin1String("1.0");
+ const QString newImportUrl = QLatin1String("Qt");
+ const QString newImportVersion = QLatin1String("4.7");
Import newImport = Import::createLibraryImport(newImportUrl, newImportVersion);
foreach (const Import &import, model()->imports()) {
@@ -129,7 +129,7 @@ QmlItemNode QmlModelView::createQmlItemNodeFromImage(const QString &imageName, c
}
propertyPairList.append(qMakePair(QString("source"), QVariant(relativeImageName)));
- newNode = createQmlItemNode("QtQuick/Image", 1, 0, propertyPairList);
+ newNode = createQmlItemNode("Qt/Image", 4, 7, propertyPairList);
parentNode.nodeAbstractProperty("data").reparentHere(newNode);
Q_ASSERT(newNode.isValid());
diff --git a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
index 934f32d528f1ff220c737149b17095180f67e05d..bd17f083f17c5861ceced091925fe7ad30d91cc1 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlstate.cpp
@@ -179,7 +179,7 @@ void QmlModelState::addChangeSetIfNotExists(const ModelNode &node)
return; //changeSet already there
}
- ModelNode newChangeSet = modelNode().view()->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode newChangeSet = modelNode().view()->createModelNode("Qt/PropertyChanges", 4, 7);
modelNode().nodeListProperty("changes").reparentHere(newChangeSet);
QmlPropertyChanges(newChangeSet).setTarget(node);
@@ -246,7 +246,7 @@ bool QmlModelState::isValid() const
{
return QmlModelNodeFacade::isValid() &&
modelNode().metaInfo().isValid() &&
- (modelNode().metaInfo().isSubclassOf("QtQuick/State", 1, 0) || isBaseState());
+ (modelNode().metaInfo().isSubclassOf("Qt/State", 4, 7) || isBaseState());
}
/**
@@ -280,7 +280,7 @@ QmlModelState QmlModelState::duplicate(const QString &name) const
// QmlModelState newState(stateGroup().addState(name));
PropertyListType propertyList;
propertyList.append(qMakePair(QString("name"), QVariant(name)));
- QmlModelState newState ( qmlModelView()->createModelNode("QtQuick/State", 1, 0, propertyList) );
+ QmlModelState newState ( qmlModelView()->createModelNode("Qt/State", 4, 7, propertyList) );
foreach (const ModelNode &childNode, modelNode().nodeListProperty("changes").toModelNodeList()) {
ModelNode newModelNode(qmlModelView()->createModelNode(childNode.type(), childNode.majorVersion(), childNode.minorVersion()));
diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index e02cbaa99ebfc3d5dee680619ae6ddd166b2ae89..5b6765228958226f21de3d7ed9202a6d7e0fffcc 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -591,37 +591,15 @@ bool TextToModelMerger::load(const QString &data, DifferenceHandler &differenceH
setupImports(doc, differenceHandler);
foreach (const Import &import, m_rewriterView->model()->imports()) {
- if (import.url() == "Qt") {
- if (QMessageBox::question (0, QCoreApplication::translate("QmlDesigner::TextToModelMerger", "Deprecated import: import Qt 4.7"),
- QCoreApplication::translate("QmlDesigner::TextToModelMerger", "Deprecated import: import Qt 4.7\nuse import QtQuick 1.0 instead.\n\nDo you want to automatically fix the import?"),
- QMessageBox::Ok | QMessageBox::Cancel, QMessageBox::Ok) == QMessageBox::Ok) {
- QmlDesigner::QmlRefactoring refactoring(doc, *m_rewriterView->textModifier(), QStringList());
- RemoveImportRewriteAction removeImportRewriteAction(import);
-
- m_rewriterView->textModifier()->startGroup();
-
- Import qtQuickImport = Import::createLibraryImport("QtQuick", "1.0");
- AddImportRewriteAction addImportRewriteAction(qtQuickImport);
- bool success = addImportRewriteAction.execute(refactoring, *m_rewriterView->positionStorage());
-
- if (success) {
- success = refactoring.reparseDocument();
- }
- success = removeImportRewriteAction.execute(refactoring, *m_rewriterView->positionStorage());
-
- m_rewriterView->textModifier()->commitGroup();
-
- return false;
- } else {
+ if (import.url() == "QtQuick") {
QList<RewriterView::Error> errors;
RewriterView::Error error(QCoreApplication::translate("QmlDesigner::TextToModelMerger",
- "Deprecated import: import Qt 4.7 use import QtQuick 1.0 instead"));
+ "Unsupported import:\nimport QtQuick 1.0 use import Qt 4.7 instead"));
errors.append(error);
m_rewriterView->setErrors(errors);
return false;
}
}
- }
UiObjectMember *astRootNode = 0;
if (UiProgram *program = doc->qmlProgram())
@@ -703,7 +681,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (UiArrayBinding *array = cast<UiArrayBinding *>(member)) {
const QString astPropertyName = flatten(array->qualifiedId);
- if (typeName == QLatin1String("QtQuick/PropertyChanges") || context->lookupProperty(QString(), array->qualifiedId)) {
+ if (typeName == QLatin1String("Qt/PropertyChanges") || context->lookupProperty(QString(), array->qualifiedId)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
QList<UiObjectMember *> arrayMembers;
for (UiArrayMemberList *iter = array->members; iter; iter = iter->next)
@@ -737,7 +715,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
const Interpreter::Value *propertyType = 0;
const Interpreter::ObjectValue *containingObject = 0;
QString name;
- if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || typeName == QLatin1String("QtQuick/PropertyChanges")) {
+ if (context->lookupProperty(QString(), binding->qualifiedId, &propertyType, &containingObject, &name) || typeName == QLatin1String("Qt/PropertyChanges")) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
if (context->isArrayProperty(propertyType, containingObject, name)) {
syncArrayProperty(modelProperty, QList<QmlJS::AST::UiObjectMember*>() << member, context, differenceHandler);
@@ -781,7 +759,7 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
if (!defaultPropertyItems.isEmpty()) {
if (defaultPropertyName.isEmpty()) {
- if (modelNode.type() != QLatin1String("QtQuick/Component"))
+ if (modelNode.type() != QLatin1String("Qt/Component"))
qWarning() << "No default property for node type" << modelNode.type() << ", ignoring child items.";
} else {
AbstractProperty modelProperty = modelNode.property(defaultPropertyName);
@@ -841,7 +819,7 @@ QString TextToModelMerger::syncScriptBinding(ModelNode &modelNode,
return QString();
if (isLiteralValue(script)) {
- if (modelNode.type() == QLatin1String("QtQuick/PropertyChanges")) {
+ if (modelNode.type() == QLatin1String("Qt/PropertyChanges")) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
const QVariant variantValue(deEscape(stripQuotes(astValue)));
syncVariantProperty(modelProperty, variantValue, QString(), differenceHandler);
@@ -866,7 +844,7 @@ QString TextToModelMerger::syncScriptBinding(ModelNode &modelNode,
syncVariantProperty(modelProperty, enumValue, QString(), differenceHandler);
return astPropertyName;
} else { // Not an enum, so:
- if (modelNode.type() == QLatin1String("QtQuick/PropertyChanges") || context->lookupProperty(prefix, script->qualifiedId)) {
+ if (modelNode.type() == QLatin1String("Qt/PropertyChanges") || context->lookupProperty(prefix, script->qualifiedId)) {
AbstractProperty modelProperty = modelNode.property(astPropertyName);
syncExpressionProperty(modelProperty, astValue, differenceHandler);
return astPropertyName;
@@ -995,7 +973,7 @@ void TextToModelMerger::syncNodeListProperty(NodeListProperty &modelListProperty
QString name;
if (UiObjectDefinition *definition = cast<UiObjectDefinition *>(arrayMember))
name = flatten(definition->qualifiedTypeNameId);
- if (name == QLatin1String("QtQuick/Component"))
+ if (name == QLatin1String("Qt/Component"))
setupComponent(newNode);
}
@@ -1309,7 +1287,7 @@ void ModelAmender::idsDiffer(ModelNode &modelNode, const QString &qmlId)
void TextToModelMerger::setupComponent(const ModelNode &node)
{
- Q_ASSERT(node.type() == QLatin1String("QtQuick/Component"));
+ Q_ASSERT(node.type() == QLatin1String("Qt/Component"));
QString componentText = m_rewriterView->extractText(QList<ModelNode>() << node).value(node);
diff --git a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
index 1480471785db97b5cc149c97ca416080e195f480..f4e419ad09e1920963f6f9fa8b1297c776db4728 100644
--- a/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
+++ b/src/plugins/qmldesigner/qtquickplugin/qtquickplugin.cpp
@@ -38,8 +38,8 @@ namespace QmlDesigner {
QtQuickPlugin::QtQuickPlugin()
{
- qmlRegisterType<QDeclarativePen>("QtQuick", 1, 0, "Pen");
- qmlRegisterType<QDeclarativeScaleGrid>("QtQuick", 1, 0, "ScaleGrid");
+ qmlRegisterType<QDeclarativePen>("Qt", 4, 7, "Pen");
+ qmlRegisterType<QDeclarativeScaleGrid>("Qt", 4, 7, "ScaleGrid");
}
QString QtQuickPlugin::pluginName()
diff --git a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
index 4c828305a62fc57eaaa35fe853f20bff47594ea5..139a82bc056dbb7f80ebb1400392938b8c93f2ae 100644
--- a/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
+++ b/src/plugins/qmldesigner/qtquickplugin/quick.metainfo
@@ -1,5 +1,5 @@
<metainfo>
- <node name="QtQuick/Item" isContainer="true" icon=":/qtquickplugin/images/item-icon16.png">
+ <node name="Qt/Item" isContainer="true" icon=":/qtquickplugin/images/item-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="600"/>
<propertyDefaultValue name="height" type="int" defaultValue="400"/>
<itemlibraryentry name="Item" category="Qt - Basic" icon=":/qtquickplugin/images/item-icon.png">
@@ -7,14 +7,14 @@
<property name="height" type="int" value="200"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Rectangle" category="Qt - Basic" isContainer="true" icon=":/qtquickplugin/images/rect-icon16.png">
+ <node name="Qt/Rectangle" category="Qt - Basic" isContainer="true" icon=":/qtquickplugin/images/rect-icon16.png">
<itemlibraryentry name="Rectangle" category="Qt - Basic" icon=":/qtquickplugin/images/rect-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
<property name="color" type="QColor" value="#ffffff"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Text" icon=":/qtquickplugin/images/text-icon16.png">
+ <node name="Qt/Text" icon=":/qtquickplugin/images/text-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text" category="Qt - Basic" icon=":/qtquickplugin/images/text-icon.png">
@@ -23,7 +23,7 @@
<property name="text" type="QString" value="text"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/TextEdit" isContainer="false" icon=":/qtquickplugin/images/text-edit-icon16.png">
+ <node name="Qt/TextEdit" isContainer="false" icon=":/qtquickplugin/images/text-edit-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text Edit" category="Qt - Basic" icon=":/qtquickplugin/images/text-edit-icon.png">
@@ -32,7 +32,7 @@
<property name="text" type="QString" value="textEdit"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/TextInput" isContainer="false" icon=":/qtquickplugin/images/text-input-icon16.png">
+ <node name="Qt/TextInput" isContainer="false" icon=":/qtquickplugin/images/text-input-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="80"/>
<propertyDefaultValue name="height" type="int" defaultValue="20"/>
<itemlibraryentry name="Text Input" category="Qt - Basic" icon=":/qtquickplugin/images/text-input-icon.png">
@@ -41,13 +41,13 @@
<property name="text" type="QString" value="textInput"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/MouseArea" icon=":/qtquickplugin/images/mouse-area-icon16.png">
+ <node name="Qt/MouseArea" icon=":/qtquickplugin/images/mouse-area-icon16.png">
<itemlibraryentry name="Mouse Area" category="Qt - Interaction" icon=":/qtquickplugin/images/mouse-area-icon.png">
<property name="width" type="int" value="100"/>
<property name="height" type="int" value="100"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Image" isContainer="true" icon=":/qtquickplugin/images/image-icon16.png">
+ <node name="Qt/Image" isContainer="true" icon=":/qtquickplugin/images/image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
<itemlibraryentry name="Image" category="Qt - Basic" icon=":/qtquickplugin/images/image-icon.png">
@@ -56,7 +56,7 @@
<property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/BorderImage" icon=":/qtquickplugin/images/border-image-icon16.png">
+ <node name="Qt/BorderImage" icon=":/qtquickplugin/images/border-image-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="200"/>
<propertyDefaultValue name="height" type="int" defaultValue="200"/>
<itemlibraryentry name="Border Image" category="Qt - Basic" icon=":/qtquickplugin/images/border-image-icon.png">
@@ -65,7 +65,7 @@
<property name="source" type="QUrl" value="qrc:/qtquickplugin/images/template_image.png"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Flickable" icon=":/qtquickplugin/images/flickable-icon16.png">
+ <node name="Qt/Flickable" icon=":/qtquickplugin/images/flickable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Flickable" category="Qt - Widgets" icon=":/qtquickplugin/images/flickable-icon.png">
@@ -73,7 +73,7 @@
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/Flipable" icon=":/qtquickplugin/images/flipable-icon16.png">
+ <node name="Qt/Flipable" icon=":/qtquickplugin/images/flipable-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Flipable" category="Qt - Widgets" icon=":/qtquickplugin/images/flipable-icon.png">
@@ -81,28 +81,28 @@
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
+ <node name="Qt/GridView" icon=":/qtquickplugin/images/gridview-icon16.png">
<itemlibraryentry name="Grid View" category="Qt - Views" icon=":/qtquickplugin/images/gridview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/ListView" icon=":/qtquickplugin/images/listview-icon16.png">
+ <node name="Qt/ListView" icon=":/qtquickplugin/images/listview-icon16.png">
<itemlibraryentry name="List View" category="Qt - Views" icon=":/qtquickplugin/images/listview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
+ <node name="Qt/PathView" icon=":/qtquickplugin/images/pathview-icon16.png">
<itemlibraryentry name="Path View" category="Qt - Views" icon=":/qtquickplugin/images/pathview-icon.png">
<property name="width" type="int" value="300"/>
<property name="height" type="int" value="300"/>
</itemlibraryentry>
</node>
- <node name="QtQuick/FocusScope" icon=":/qtquickplugin/images/focusscope-icon16.png">
+ <node name="Qt/FocusScope" icon=":/qtquickplugin/images/focusscope-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="100"/>
<propertyDefaultValue name="height" type="int" defaultValue="100"/>
<itemlibraryentry name="Focus Scope" category="Qt - Interaction" icon=":/qtquickplugin/images/focusscope-icon.png">
diff --git a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
index cec7f02433bd337a7c135610fed7a0c5581eefd7..7ffb98ff6d31858c1e054f80c5036bbf8e8a564c 100644
--- a/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/tst_testcore.cpp
@@ -121,7 +121,7 @@ void tst_TestCore::cleanupTestCase()
void tst_TestCore::testModelCreateCoreModel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> testView(new TestView(model.data()));
@@ -140,17 +140,17 @@ void tst_TestCore::loadEmptyCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
model1->attachView(testRewriterView1.data());
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -163,10 +163,10 @@ void tst_TestCore::testRewriterView()
{
try {
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -179,15 +179,15 @@ void tst_TestCore::testRewriterView()
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode.isValid());
childNode.setId("childNode");
- ModelNode childNode2(addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
childNode2.setId("childNode2");
- ModelNode childNode3(addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data"));
childNode3.setId("childNode3");
- ModelNode childNode4(addNodeListChild(childNode3, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode4(addNodeListChild(childNode3, "Qt/Rectangle", 4, 7, "data"));
childNode4.setId("childNode4");
QVERIFY(childNode.isValid());
@@ -213,7 +213,7 @@ void tst_TestCore::testRewriterView()
testRewriterView->modelToTextMerger()->applyChanges();
- childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(testRewriterView->modelToTextMerger()->isNodeScheduledForAddition(childNode));
testRewriterView->modelToTextMerger()->applyChanges();
@@ -233,10 +233,10 @@ void tst_TestCore::testRewriterView()
void tst_TestCore::testRewriterErrors()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -250,10 +250,10 @@ void tst_TestCore::testRewriterErrors()
model->attachView(testRewriterView.data());
QVERIFY(testRewriterView->errors().isEmpty());
- textEdit.setPlainText("import QtQuick 1.0;\n\nError {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nError {\n}\n");
QVERIFY(!testRewriterView->errors().isEmpty());
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
QVERIFY(testRewriterView->errors().isEmpty());
}
@@ -267,7 +267,7 @@ void tst_TestCore::saveEmptyCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -279,10 +279,10 @@ void tst_TestCore::saveEmptyCoreModel()
modifier1.save(&buffer);
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -302,17 +302,17 @@ void tst_TestCore::loadAttributesInCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
model1->attachView(testRewriterView1.data());
QPlainTextEdit textEdit2;
- textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+ textEdit2.setPlainText("import Qt 4.7; Item{}");
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/item"));
+ QScopedPointer<Model> model2(Model::create("Qt/item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -337,7 +337,7 @@ void tst_TestCore::saveAttributesInCoreModel()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -353,7 +353,7 @@ void tst_TestCore::saveAttributesInCoreModel()
textEdit2.setPlainText(buffer.data());
NotIndentingTextEditModifier modifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model2(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
testRewriterView2->setTextModifier(&modifier2);
@@ -368,7 +368,7 @@ void tst_TestCore::testModelCreateRect()
{
try {
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -376,7 +376,7 @@ void tst_TestCore::testModelCreateRect()
model->attachView(view.data());
QVERIFY(view->rootModelNode().isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -404,7 +404,7 @@ void tst_TestCore::testModelCreateRect()
void tst_TestCore::testRewriterDynamicProperties()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" property int i\n"
@@ -431,7 +431,7 @@ void tst_TestCore::testRewriterDynamicProperties()
textEdit1.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -521,10 +521,10 @@ void tst_TestCore::testRewriterDynamicProperties()
// test model2text
// QPlainTextEdit textEdit2;
-// textEdit2.setPlainText("import QtQuick 1.0; Item{}");
+// textEdit2.setPlainText("import Qt 4.7; Item{}");
// NotIndentingTextEditModifier modifier2(&textEdit2);
//
-// QScopedPointer<Model> model2(Model::create("QtQuick/Item"));
+// QScopedPointer<Model> model2(Model::create("Qt/Item"));
//
// QScopedPointer<TestRewriterView> testRewriterView2(new TestRewriterView());
// testRewriterView2->setTextModifier(&modifier2);
@@ -538,7 +538,7 @@ void tst_TestCore::testRewriterDynamicProperties()
void tst_TestCore::testRewriterGroupedProperties()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Text {\n"
" font {\n"
@@ -551,7 +551,7 @@ void tst_TestCore::testRewriterGroupedProperties()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit);
- QScopedPointer<Model> model1(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model1(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -575,7 +575,7 @@ void tst_TestCore::testRewriterGroupedProperties()
rootModelNode.removeProperty(QLatin1String("font.pointSize"));
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Text {\n"
"}\n");
@@ -586,7 +586,7 @@ void tst_TestCore::testRewriterGroupedProperties()
void tst_TestCore::testRewriterPreserveOrder()
{
const QLatin1String qmlString1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"width: 640\n"
@@ -607,7 +607,7 @@ void tst_TestCore::testRewriterPreserveOrder()
"}\n"
"}\n");
const QLatin1String qmlString2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"width: 640\n"
@@ -633,7 +633,7 @@ void tst_TestCore::testRewriterPreserveOrder()
textEdit.setPlainText(qmlString2);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -646,7 +646,7 @@ void tst_TestCore::testRewriterPreserveOrder()
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
- ModelNode newModelNode = testRewriterView->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
@@ -668,7 +668,7 @@ void tst_TestCore::testRewriterPreserveOrder()
textEdit.setPlainText(qmlString1);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -681,7 +681,7 @@ void tst_TestCore::testRewriterPreserveOrder()
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
- ModelNode newModelNode = testRewriterView->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newModelNode = testRewriterView->createModelNode("Qt/Rectangle", 4, 7);
newModelNode.setParentProperty(rootModelNode.nodeAbstractProperty("data"));
@@ -702,7 +702,7 @@ void tst_TestCore::testRewriterPreserveOrder()
void tst_TestCore::testRewriterActionCompression()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -722,7 +722,7 @@ void tst_TestCore::testRewriterActionCompression()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier1(&textEdit);
- QScopedPointer<Model> model1(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model1(Model::create("Qt/Rectangle"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier1);
@@ -748,7 +748,7 @@ void tst_TestCore::testRewriterActionCompression()
transaction.commit();
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -776,7 +776,7 @@ void tst_TestCore::testRewriterImports()
textEdit.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
model->setFileUrl(QUrl::fromLocalFile(fileName));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -787,7 +787,7 @@ void tst_TestCore::testRewriterImports()
QVERIFY(model->imports().size() == 3);
- // import QtQuick 1.0
+ // import Qt 4.7
Import import = model->imports().at(0);
QVERIFY(import.isLibraryImport());
QCOMPARE(import.url(), QString("Qt"));
@@ -815,7 +815,7 @@ void tst_TestCore::testRewriterImports()
void tst_TestCore::testRewriterChangeImports()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {}\n");
@@ -823,7 +823,7 @@ void tst_TestCore::testRewriterChangeImports()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView(0, RewriterView::Amend));
testRewriterView->setTextModifier(&modifier);
@@ -838,7 +838,7 @@ void tst_TestCore::testRewriterChangeImports()
model->addImport(webkitImport);
const QLatin1String qmlWithImport("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"import QtWebKit 1.0\n"
"\n"
"Rectangle {}\n");
@@ -847,7 +847,7 @@ void tst_TestCore::testRewriterChangeImports()
model->removeImport(webkitImport);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(textEdit.toPlainText(), qmlString);
@@ -859,7 +859,7 @@ void tst_TestCore::testRewriterChangeImports()
model->addImport(webkitImport);
const QLatin1String qmlWithAliasImport("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"import QtWebKit 1.0 as Web\n"
"\n"
"Rectangle {}\n");
@@ -868,7 +868,7 @@ void tst_TestCore::testRewriterChangeImports()
model->removeImport(webkitImport);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(textEdit.toPlainText(), qmlString);
@@ -878,23 +878,23 @@ void tst_TestCore::testRewriterChangeImports()
//
textEdit.setPlainText(qmlWithImport);
QCOMPARE(model->imports().size(), 2);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0"));
textEdit.setPlainText(qmlWithAliasImport);
QCOMPARE(model->imports().size(), 2);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0", "Web"));
textEdit.setPlainText(qmlString);
QCOMPARE(model->imports().size(), 1);
- QCOMPARE(model->imports().first(), Import::createLibraryImport("QtQuick", "1.0"));
+ QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
}
void tst_TestCore::testRewriterForGradientMagic()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -932,7 +932,7 @@ void tst_TestCore::testRewriterForGradientMagic()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&modifier);
@@ -948,7 +948,7 @@ void tst_TestCore::testRewriterForGradientMagic()
myRect.variantProperty("rotation") = QVariant(45);
QVERIFY(myRect.isValid());
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -956,7 +956,7 @@ void tst_TestCore::testRewriterForGradientMagic()
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item {}");
+ textEdit1.setPlainText("import Qt 4.7; Item {}");
NotIndentingTextEditModifier modifier1(&textEdit1);
testRewriterView1->setTextModifier(&modifier1);
@@ -982,7 +982,7 @@ void tst_TestCore::loadSubItems()
textEdit1.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -1000,7 +1000,7 @@ void tst_TestCore::createInvalidCoreModel()
void tst_TestCore::testModelCreateSubNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1012,7 +1012,7 @@ void tst_TestCore::testModelCreateSubNode()
QCOMPARE(view->methodCalls(), expectedCalls);
QVERIFY(view->rootModelNode().isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
QVERIFY(childNode.parentProperty().parentModelNode() == view->rootModelNode());
@@ -1046,7 +1046,7 @@ void tst_TestCore::testModelCreateSubNode()
void tst_TestCore::testTypicalRewriterOperations()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1075,7 +1075,7 @@ void tst_TestCore::testTypicalRewriterOperations()
QCOMPARE(rootModelNode.bindingProperty("test").expression(), QString("parent.x"));
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 4 ,6, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4 ,6, "data"));
rootModelNode.nodeListProperty("test").reparentHere(childNode);
QCOMPARE(childNode.parentProperty(), rootModelNode.nodeAbstractProperty("test"));
QVERIFY(rootModelNode.property("test").isNodeAbstractProperty());
@@ -1095,7 +1095,7 @@ void tst_TestCore::testTypicalRewriterOperations()
void tst_TestCore::testBasicStates()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"id: root;\n"
"Rectangle {\n"
@@ -1134,7 +1134,7 @@ void tst_TestCore::testBasicStates()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1143,13 +1143,13 @@ void tst_TestCore::testBasicStates()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootModelNode.hasProperty("data"));
@@ -1246,7 +1246,7 @@ void tst_TestCore::testBasicStates()
void tst_TestCore::testModelBasicOperations()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1267,8 +1267,8 @@ void tst_TestCore::testModelBasicOperations()
QVERIFY(!rootModelNode.hasProperty("width"));
QVERIFY(!rootModelNode.hasProperty("children"));
- ModelNode childNode1(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "children"));
- ModelNode childNode2(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode1(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "children"));
+ ModelNode childNode2(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode1.isValid());
QVERIFY(childNode2.isValid());
@@ -1306,7 +1306,7 @@ void tst_TestCore::testModelBasicOperations()
void tst_TestCore::testModelResolveIds()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1316,9 +1316,9 @@ void tst_TestCore::testModelResolveIds()
ModelNode rootNode = view->rootModelNode();
rootNode.setId("rootNode");
- ModelNode childNode1(addNodeListChild(rootNode, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode1(addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "children"));
- ModelNode childNode2(addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode2(addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "children"));
childNode2.setId("childNode2");
childNode2.bindingProperty("test").setExpression("parent.parent");
@@ -1329,7 +1329,7 @@ void tst_TestCore::testModelResolveIds()
childNode2.bindingProperty("test").setExpression("rootNode");
QCOMPARE(childNode2.bindingProperty("test").resolveToModelNode(), rootNode);
- ModelNode childNode3(addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "children"));
+ ModelNode childNode3(addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "children"));
childNode3.setId("childNode3");
childNode2.nodeProperty("front").setModelNode(childNode3);
childNode2.bindingProperty("test").setExpression("childNode3.parent");
@@ -1364,7 +1364,7 @@ void tst_TestCore::testModelNodeListProperty()
//
// Test NodeListProperty API
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1382,7 +1382,7 @@ void tst_TestCore::testModelNodeListProperty()
QVERIFY(!rootChildren.isNodeListProperty());
QVERIFY(rootChildren.isEmpty());
- ModelNode rectNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode rectNode = view->createModelNode("Qt/Rectangle", 4, 7);
rootChildren.reparentHere(rectNode);
//
@@ -1393,7 +1393,7 @@ void tst_TestCore::testModelNodeListProperty()
QVERIFY(rootChildren.isNodeListProperty());
QVERIFY(!rootChildren.isEmpty());
- ModelNode mouseAreaNode = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode mouseAreaNode = view->createModelNode("Qt/Item", 4, 7);
NodeListProperty rectChildren = rectNode.nodeListProperty("children");
rectChildren.reparentHere(mouseAreaNode);
@@ -1421,7 +1421,7 @@ void tst_TestCore::testModelNodeListProperty()
void tst_TestCore::testBasicOperationsWithView()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1453,8 +1453,8 @@ void tst_TestCore::testBasicOperationsWithView()
QCOMPARE(rootInstance.size().width(), 10.0);
QCOMPARE(rootInstance.size().height(), 10.0);
- ModelNode childNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode childNode2(addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode childNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode childNode2(addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(childNode2.parentProperty().parentModelNode() == childNode);
QVERIFY(childNode.isValid());
@@ -1489,10 +1489,10 @@ void tst_TestCore::testBasicOperationsWithView()
QVERIFY(!childInstance2.isValid());
}
- childNode = addNodeListChild(rootModelNode, "QtQuick/Image", 1, 0, "data");
+ childNode = addNodeListChild(rootModelNode, "Qt/Image", 4, 7, "data");
QVERIFY(childNode.isValid());
- QCOMPARE(childNode.type(), QString("QtQuick/Image"));
- childNode2 = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ QCOMPARE(childNode.type(), QString("Qt/Image"));
+ childNode2 = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setParentProperty(rootModelNode, "data");
QVERIFY(childNode2.isValid());
@@ -1531,7 +1531,7 @@ void tst_TestCore::testBasicOperationsWithView()
void tst_TestCore::testQmlModelView()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QmlModelView *view = new TestView(model.data());
@@ -1549,7 +1549,7 @@ void tst_TestCore::testQmlModelView()
propertyList.append(qMakePair(QString("width"), QVariant(20)));
propertyList.append(qMakePair(QString("height"), QVariant(20)));
- QmlObjectNode node1 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
QVERIFY(node1.isValid());
QVERIFY(!node1.hasNodeParent());
@@ -1565,7 +1565,7 @@ void tst_TestCore::testQmlModelView()
QVERIFY(node1.instanceParent() == view->rootQmlObjectNode());
- QmlObjectNode node2 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node2 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
QVERIFY(node2.isValid());
QVERIFY(!node2.hasNodeParent());
@@ -1593,12 +1593,12 @@ void tst_TestCore::testQmlModelView()
QCOMPARE(node1.instanceValue("x").toInt(), 2);
- QmlObjectNode node3 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node4 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node5 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node6 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node7 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
- QmlObjectNode node8 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ QmlObjectNode node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node4 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node5 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node6 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node7 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
+ QmlObjectNode node8 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node3.setParentProperty(node2.nodeAbstractProperty("children"));
node4.setParentProperty(node3.nodeAbstractProperty("children"));
@@ -1626,12 +1626,12 @@ void tst_TestCore::testQmlModelView()
QCOMPARE(node2.instanceValue("x").toInt(), 10); // is this right? or should it be a invalid qvariant?
- node1 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ node1 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node1.setId("node1");
QCOMPARE(node2.instanceValue("x").toInt(), 20);
- node3 = view->createQmlObjectNode("QtQuick/Rectangle", 1, 0, propertyList);
+ node3 = view->createQmlObjectNode("Qt/Rectangle", 4, 7, propertyList);
node3.setParentProperty(node2.nodeAbstractProperty("children"));
QCOMPARE(node3.instanceValue("width").toInt(), 20);
node3.setVariantProperty("width", 0);
@@ -1653,7 +1653,7 @@ void tst_TestCore::testQmlModelView()
void tst_TestCore::testModelRemoveNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1666,7 +1666,7 @@ void tst_TestCore::testModelRemoveNode()
QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 0);
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QCOMPARE(view->rootModelNode().allDirectSubModelNodes().count(), 1);
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(childNode));
@@ -1678,7 +1678,7 @@ void tst_TestCore::testModelRemoveNode()
QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
}
- ModelNode subChildNode = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(subChildNode.isValid());
QCOMPARE(childNode.allDirectSubModelNodes().count(), 1);
QVERIFY(childNode.allDirectSubModelNodes().contains(subChildNode));
@@ -1709,7 +1709,7 @@ void tst_TestCore::testModelRemoveNode()
QVERIFY(view->rootModelNode().isValid());
// delete node not in hierarchy
- childNode = view->createModelNode("QtQuick/Item", 1, 0);
+ childNode = view->createModelNode("Qt/Item", 4, 7);
childNode.destroy();
model->detachView(nodeInstanceView);
@@ -1717,7 +1717,7 @@ void tst_TestCore::testModelRemoveNode()
void tst_TestCore::reparentingNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
@@ -1734,7 +1734,7 @@ void tst_TestCore::reparentingNode()
NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
model->attachView(nodeInstanceView);
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QCOMPARE(childNode.parentProperty().parentModelNode(), rootModelNode);
QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode));
@@ -1744,7 +1744,7 @@ void tst_TestCore::reparentingNode()
QVERIFY(childInstance.parent() == nodeInstanceView->instanceForNode(view->rootModelNode()));
}
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Item", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Item", 4, 7, "data");
QCOMPARE(childNode2.parentProperty().parentModelNode(), rootModelNode);
QVERIFY(rootModelNode.allDirectSubModelNodes().contains(childNode2));
@@ -1785,10 +1785,10 @@ void tst_TestCore::reparentingNode()
void tst_TestCore::reparentingNodeLikeDragAndDrop()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0;\n\nItem {\n}\n");
+ textEdit.setPlainText("import Qt 4.7;\n\nItem {\n}\n");
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -1804,7 +1804,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
view->rootModelNode().setId("rootModelNode");
QCOMPARE(view->rootModelNode().id(), QString("rootModelNode"));
- ModelNode rectNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode rectNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
rectNode.setId("rect_1");
rectNode.variantProperty("x").setValue(20);
rectNode.variantProperty("y").setValue(30);
@@ -1813,7 +1813,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
RewriterTransaction transaction(view->beginRewriterTransaction());
- ModelNode textNode = addNodeListChild(view->rootModelNode(), "QtQuick/Text", 1, 0, "data");
+ ModelNode textNode = addNodeListChild(view->rootModelNode(), "Qt/Text", 4, 7, "data");
QCOMPARE(textNode.parentProperty().parentModelNode(), view->rootModelNode());
QVERIFY(view->rootModelNode().allDirectSubModelNodes().contains(textNode));
@@ -1901,7 +1901,7 @@ void tst_TestCore::reparentingNodeLikeDragAndDrop()
void tst_TestCore::testModelReorderSiblings()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1914,11 +1914,11 @@ void tst_TestCore::testModelReorderSiblings()
ModelNode rootModelNode = view->rootModelNode();
QVERIFY(rootModelNode.isValid());
- ModelNode a = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode a = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(a.isValid());
- ModelNode b = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode b = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(b.isValid());
- ModelNode c = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode c = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(c.isValid());
{
@@ -1952,7 +1952,7 @@ void tst_TestCore::testModelReorderSiblings()
void tst_TestCore::testModelRootNode()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -1963,10 +1963,10 @@ void tst_TestCore::testModelRootNode()
ModelNode rootModelNode = view->rootModelNode();
QVERIFY(rootModelNode.isValid());
QVERIFY(rootModelNode.isRootNode());
- ModelNode topChildNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode topChildNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(topChildNode.isValid());
QVERIFY(rootModelNode.isRootNode());
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
QVERIFY(rootModelNode.isValid());
QVERIFY(rootModelNode.isRootNode());
@@ -1983,15 +1983,15 @@ void tst_TestCore::testModelRootNode()
void tst_TestCore::reparentingNodeInModificationGroup()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
childNode.variantProperty("x").setValue(10);
childNode.variantProperty("y").setValue(10);
@@ -2033,7 +2033,7 @@ void tst_TestCore::reparentingNodeInModificationGroup()
void tst_TestCore::testModelAddAndRemoveProperty()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2074,7 +2074,7 @@ void tst_TestCore::testModelAddAndRemoveProperty()
void tst_TestCore::testModelViewNotification()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view1(new TestView(model.data()));
@@ -2096,7 +2096,7 @@ void tst_TestCore::testModelViewNotification()
QCOMPARE(view1->methodCalls(), expectedCalls);
QCOMPARE(view2->methodCalls(), expectedCalls);
- ModelNode childNode = addNodeListChild(view2->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view2->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
expectedCalls << TestView::MethodCall("nodeCreated", QStringList() << "");
expectedCalls << TestView::MethodCall("nodeReparented", QStringList() << "" << "data" << "" << "PropertiesAdded");
QCOMPARE(view1->methodCalls(), expectedCalls);
@@ -2146,7 +2146,7 @@ void tst_TestCore::testModelViewNotification()
void tst_TestCore::testRewriterTransaction()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2156,7 +2156,7 @@ void tst_TestCore::testRewriterTransaction()
RewriterTransaction transaction = view->beginRewriterTransaction();
QVERIFY(transaction.isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.destroy();
@@ -2166,7 +2166,7 @@ void tst_TestCore::testRewriterTransaction()
RewriterTransaction transaction2 = view->beginRewriterTransaction();
QVERIFY(transaction2.isValid());
- ModelNode childNode = addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.destroy();
@@ -2193,7 +2193,7 @@ void tst_TestCore::testRewriterTransaction()
void tst_TestCore::testRewriterId()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2201,7 +2201,7 @@ void tst_TestCore::testRewriterId()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2216,16 +2216,16 @@ void tst_TestCore::testRewriterId()
model->attachView(testRewriterView.data());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootModelNode.isValid());
- ModelNode newNode(view->createModelNode("QtQuick/Rectangle", 1, 0));
+ ModelNode newNode(view->createModelNode("Qt/Rectangle", 4, 7));
newNode.setId("testId");
rootModelNode.nodeListProperty("data").reparentHere(newNode);
- const QLatin1String expected("import QtQuick 1.0\n"
+ const QLatin1String expected("import Qt 4.7\n"
"Rectangle {\n"
"Rectangle {\n"
" id: testId\n"
@@ -2237,7 +2237,7 @@ void tst_TestCore::testRewriterId()
void tst_TestCore::testRewriterNodeReparentingTransaction1()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2245,7 +2245,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2254,7 +2254,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2262,12 +2262,12 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
- ModelNode reparentNode = addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode reparentNode = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2282,7 +2282,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction1()
void tst_TestCore::testRewriterNodeReparentingTransaction2()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2290,7 +2290,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2299,7 +2299,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2307,8 +2307,8 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode2.variantProperty("x") = 200;
childNode2.variantProperty("y") = 50;
@@ -2348,7 +2348,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction2()
void tst_TestCore::testRewriterNodeReparentingTransaction3()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2356,7 +2356,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2365,7 +2365,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2373,10 +2373,10 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2398,7 +2398,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction3()
void tst_TestCore::testRewriterNodeReparentingTransaction4()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2406,7 +2406,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2415,7 +2415,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2423,11 +2423,11 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
- ModelNode childNode5 = addNodeListChild(childNode2, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
+ ModelNode childNode5 = addNodeListChild(childNode2, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
@@ -2449,7 +2449,7 @@ void tst_TestCore::testRewriterNodeReparentingTransaction4()
void tst_TestCore::testRewriterAddNodeTransaction()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2457,7 +2457,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2466,7 +2466,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2475,11 +2475,11 @@ void tst_TestCore::testRewriterAddNodeTransaction()
QVERIFY(rootModelNode.isValid());
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
RewriterTransaction rewriterTransaction = view->beginRewriterTransaction();
- ModelNode newNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
newNode.variantProperty("x") = 100;
newNode.variantProperty("y") = 100;
@@ -2491,7 +2491,7 @@ void tst_TestCore::testRewriterAddNodeTransaction()
void tst_TestCore::testRewriterComponentId()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
" Component {\n"
" id: testComponent\n"
@@ -2504,7 +2504,7 @@ void tst_TestCore::testRewriterComponentId()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2517,17 +2517,17 @@ void tst_TestCore::testRewriterComponentId()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
ModelNode component(rootModelNode.allDirectSubModelNodes().first());
QVERIFY(component.isValid());
- QCOMPARE(component.type(), QString("QtQuick/Component"));
+ QCOMPARE(component.type(), QString("Qt/Component"));
QCOMPARE(component.id(), QString("testComponent"));
}
void tst_TestCore::testRewriterTransactionRewriter()
{
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"}\n";
@@ -2535,7 +2535,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2544,7 +2544,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
@@ -2557,7 +2557,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
{
RewriterTransaction transaction = view->beginRewriterTransaction();
- childNode1 = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ childNode1 = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode1.variantProperty("x") = 10;
childNode1.variantProperty("y") = 10;
}
@@ -2569,7 +2569,7 @@ void tst_TestCore::testRewriterTransactionRewriter()
{
RewriterTransaction transaction = view->beginRewriterTransaction();
- childNode2 = addNodeListChild(childNode1, "QtQuick/Rectangle", 1, 0, "data");
+ childNode2 = addNodeListChild(childNode1, "Qt/Rectangle", 4, 7, "data");
childNode2.destroy();
}
@@ -2594,7 +2594,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
// property variant myArray: [ Rectangle {} ]
// property variant someGradient: Gradient {}
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Item {\n"
" property int intProperty\n"
" property bool boolProperty: true\n"
@@ -2607,7 +2607,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2625,7 +2625,7 @@ void tst_TestCore::testRewriterPropertyDeclarations()
//
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QCOMPARE(rootModelNode.properties().size(), 4);
@@ -2658,7 +2658,7 @@ void tst_TestCore::testRewriterPropertyAliases()
// where type is (int | bool | double | real | string | url | color | date | variant)
//
- char qmlString[] = "import QtQuick 1.0\n"
+ char qmlString[] = "import Qt 4.7\n"
"Item {\n"
" property alias theText: t.text\n"
" default alias property yPos: t.y\n"
@@ -2669,7 +2669,7 @@ void tst_TestCore::testRewriterPropertyAliases()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2682,7 +2682,7 @@ void tst_TestCore::testRewriterPropertyAliases()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QList<AbstractProperty> properties = rootModelNode.properties();
QCOMPARE(properties.size(), 0); // TODO: How to represent alias properties? As Bindings?
@@ -2691,7 +2691,7 @@ void tst_TestCore::testRewriterPropertyAliases()
void tst_TestCore::testRewriterPositionAndOffset()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -2729,7 +2729,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2742,7 +2742,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QString string = QString(qmlString).mid(testRewriterView->nodeOffset(rootNode), testRewriterView->nodeLength(rootNode));
const QString qmlExpected0("Rectangle {\n"
@@ -2808,7 +2808,7 @@ void tst_TestCore::testRewriterPositionAndOffset()
void tst_TestCore::testRewriterComponentTextModifier()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -2831,7 +2831,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2844,7 +2844,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode componentNode = rootNode.allDirectSubModelNodes().last();
@@ -2855,7 +2855,7 @@ void tst_TestCore::testRewriterComponentTextModifier()
ComponentTextModifier componentTextModifier(&textModifier, componentStartOffset, componentEndOffset, rootStartOffset);
- const QString qmlExpected("import QtQuick 1.0\n"
+ const QString qmlExpected("import Qt 4.7\n"
" "
" "
" "
@@ -2876,19 +2876,19 @@ void tst_TestCore::testRewriterComponentTextModifier()
QCOMPARE(componentTextModifier.text(), qmlExpected);
- QScopedPointer<Model> componentModel(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> componentModel(Model::create("Qt/Item", 4, 7));
QScopedPointer<TestRewriterView> testRewriterViewComponent(new TestRewriterView());
testRewriterViewComponent->setTextModifier(&componentTextModifier);
componentModel->attachView(testRewriterViewComponent.data());
ModelNode componentrootNode = testRewriterViewComponent->rootModelNode();
QVERIFY(componentrootNode.isValid());
- QCOMPARE(componentrootNode.type(), QLatin1String("QtQuick/Component"));
+ QCOMPARE(componentrootNode.type(), QLatin1String("Qt/Component"));
}
void tst_TestCore::testRewriterPreserveType()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" Text {\n"
@@ -2901,7 +2901,7 @@ void tst_TestCore::testRewriterPreserveType()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2914,7 +2914,7 @@ void tst_TestCore::testRewriterPreserveType()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode textNode = rootNode.allDirectSubModelNodes().first();
QCOMPARE(QVariant::Bool, textNode.variantProperty("font.bold").value().type());
@@ -2923,7 +2923,7 @@ void tst_TestCore::testRewriterPreserveType()
textNode.variantProperty("font.bold") = QVariant(true);
textNode.variantProperty("font.pointSize") = QVariant(13.0);
- ModelNode newTextNode = addNodeListChild(rootNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode newTextNode = addNodeListChild(rootNode, "Qt/Text", 4, 7, "data");
newTextNode.variantProperty("font.bold") = QVariant(true);
newTextNode.variantProperty("font.pointSize") = QVariant(13.0);
@@ -2935,7 +2935,7 @@ void tst_TestCore::testRewriterPreserveType()
void tst_TestCore::testRewriterForArrayMagic()
{
try {
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: State {\n"
@@ -2946,7 +2946,7 @@ void tst_TestCore::testRewriterForArrayMagic()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -2959,16 +2959,16 @@ void tst_TestCore::testRewriterForArrayMagic()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootNode.property(QLatin1String("states")).isNodeListProperty());
QmlItemNode rootItem(rootNode);
QVERIFY(rootItem.isValid());
QmlModelState state1(rootItem.states().addState("s2"));
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
- const QLatin1String expected("import QtQuick 1.0\n"
+ const QLatin1String expected("import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -2989,7 +2989,7 @@ void tst_TestCore::testRewriterForArrayMagic()
void tst_TestCore::testRewriterWithSignals()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"TextEdit {\n"
" onTextChanged: { print(\"foo\"); }\n"
@@ -2998,7 +2998,7 @@ void tst_TestCore::testRewriterWithSignals()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3011,7 +3011,7 @@ void tst_TestCore::testRewriterWithSignals()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/TextEdit"));
+ QCOMPARE(rootNode.type(), QString("Qt/TextEdit"));
QmlItemNode rootItem(rootNode);
QVERIFY(rootItem.isValid());
@@ -3021,7 +3021,7 @@ void tst_TestCore::testRewriterWithSignals()
void tst_TestCore::testRewriterNodeSliding()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" Rectangle {\n"
@@ -3041,7 +3041,7 @@ void tst_TestCore::testRewriterNodeSliding()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3054,7 +3054,7 @@ void tst_TestCore::testRewriterNodeSliding()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootNode.id(), QLatin1String("root"));
QCOMPARE(rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0).id(), QLatin1String("rectangle1"));
@@ -3073,7 +3073,7 @@ void tst_TestCore::testRewriterNodeSliding()
void tst_TestCore::testRewriterExceptionHandling()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"Text {\n"
"}");
@@ -3081,7 +3081,7 @@ void tst_TestCore::testRewriterExceptionHandling()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Text", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Text", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3094,7 +3094,7 @@ void tst_TestCore::testRewriterExceptionHandling()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
try
{
@@ -3105,7 +3105,7 @@ void tst_TestCore::testRewriterExceptionHandling()
QFAIL("RewritingException should be thrown");
} catch (RewritingException &e) {
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Text"));
QVERIFY(!rootNode.hasProperty("bla"));
QVERIFY(!rootNode.hasProperty("text"));
}
@@ -3113,7 +3113,7 @@ void tst_TestCore::testRewriterExceptionHandling()
void tst_TestCore::testRewriterFirstDefinitionInside()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3137,7 +3137,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3150,7 +3150,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode componentNode = rootNode.allDirectSubModelNodes().last();
@@ -3169,7 +3169,7 @@ void tst_TestCore::testRewriterFirstDefinitionInside()
void tst_TestCore::testCopyModelRewriter1()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -3207,7 +3207,7 @@ void tst_TestCore::testCopyModelRewriter1()
textEdit1.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3220,13 +3220,13 @@ void tst_TestCore::testCopyModelRewriter1()
ModelNode rootNode1 = view1->rootModelNode();
QVERIFY(rootNode1.isValid());
- QCOMPARE(rootNode1.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
QPlainTextEdit textEdit2;
textEdit2.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
QVERIFY(model2.data());
QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3239,7 +3239,7 @@ void tst_TestCore::testCopyModelRewriter1()
ModelNode rootNode2 = view2->rootModelNode();
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
//
@@ -3264,7 +3264,7 @@ void tst_TestCore::testCopyModelRewriter1()
const QLatin1String expected(
"\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: root\n"
@@ -3339,7 +3339,7 @@ void tst_TestCore::testCopyModelRewriter1()
void tst_TestCore::testCopyModelRewriter2()
{
const QLatin1String qmlString1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"id: root\n"
@@ -3379,7 +3379,7 @@ void tst_TestCore::testCopyModelRewriter2()
const QLatin1String qmlString2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -3388,7 +3388,7 @@ void tst_TestCore::testCopyModelRewriter2()
textEdit1.setPlainText(qmlString1);
NotIndentingTextEditModifier textModifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model1(Model::create("Qt/Item", 4, 7));
QVERIFY(model1.data());
QScopedPointer<TestView> view1(new TestView(model1.data()));
@@ -3401,7 +3401,7 @@ void tst_TestCore::testCopyModelRewriter2()
ModelNode rootNode1 = view1->rootModelNode();
QVERIFY(rootNode1.isValid());
- QCOMPARE(rootNode1.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode1.type(), QLatin1String("Qt/Rectangle"));
// read in 2
@@ -3410,7 +3410,7 @@ void tst_TestCore::testCopyModelRewriter2()
textEdit2.setPlainText(qmlString2);
NotIndentingTextEditModifier textModifier2(&textEdit2);
- QScopedPointer<Model> model2(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model2(Model::create("Qt/Item", 4, 7));
QVERIFY(model2.data());
QScopedPointer<TestView> view2(new TestView(model2.data()));
@@ -3422,7 +3422,7 @@ void tst_TestCore::testCopyModelRewriter2()
ModelNode rootNode2 = view2->rootModelNode();
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
//
@@ -3431,7 +3431,7 @@ void tst_TestCore::testCopyModelRewriter2()
merger.replaceModel(rootNode1);
QVERIFY(rootNode2.isValid());
- QCOMPARE(rootNode2.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode2.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(textEdit2.toPlainText(), qmlString1);
}
@@ -3446,7 +3446,7 @@ void tst_TestCore::testSubComponentManager()
textEdit.setPlainText(file.readAll());
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
model->setFileUrl(QUrl::fromLocalFile(fileName));
QScopedPointer<SubComponentManager> subComponentManager(new SubComponentManager(model->metaInfo(), 0));
subComponentManager->update(QUrl::fromLocalFile(fileName), modifier.text().toUtf8());
@@ -3460,9 +3460,9 @@ void tst_TestCore::testSubComponentManager()
QVERIFY(testRewriterView->rootModelNode().isValid());
- QVERIFY(model->metaInfo().nodeMetaInfo("QtQuick/Rectangle").properties(true).keys().contains("border.width"));
+ QVERIFY(model->metaInfo().nodeMetaInfo("Qt/Rectangle").properties(true).keys().contains("border.width"));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Pen"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
NodeMetaInfo myButtonMetaInfo = model->metaInfo().nodeMetaInfo("MyButton");
QVERIFY(myButtonMetaInfo.isValid());
QVERIFY(myButtonMetaInfo.properties(true).keys().contains("border.width"));
@@ -3471,7 +3471,7 @@ void tst_TestCore::testSubComponentManager()
void tst_TestCore::testAnchorsAndRewriting()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3494,7 +3494,7 @@ void tst_TestCore::testAnchorsAndRewriting()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3507,7 +3507,7 @@ void tst_TestCore::testAnchorsAndRewriting()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QmlItemNode rootItemNode = view->rootQmlItemNode();
QVERIFY(rootItemNode.isValid());
@@ -3532,7 +3532,7 @@ void tst_TestCore::testAnchorsAndRewriting()
void tst_TestCore::testAnchorsAndRewritingCenter()
{
- const QString qmlString("import QtQuick 1.0\n"
+ const QString qmlString("import Qt 4.7\n"
"Rectangle {\n"
" id: root\n"
" x: 10;\n"
@@ -3555,7 +3555,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3568,7 +3568,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QmlItemNode rootItemNode = view->rootQmlItemNode();
QVERIFY(rootItemNode.isValid());
@@ -3582,7 +3582,7 @@ void tst_TestCore::testAnchorsAndRewritingCenter()
void tst_TestCore::loadQml()
{
-char qmlString[] = "import QtQuick 1.0\n"
+char qmlString[] = "import Qt 4.7\n"
"Rectangle {\n"
"id: root;\n"
"width: 200;\n"
@@ -3623,7 +3623,7 @@ char qmlString[] = "import QtQuick 1.0\n"
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -3632,14 +3632,14 @@ char qmlString[] = "import QtQuick 1.0\n"
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
testRewriterView->setTextModifier(&textModifier);
model->attachView(testRewriterView.data());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootModelNode.id(), QString("root"));
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
@@ -3649,7 +3649,7 @@ char qmlString[] = "import QtQuick 1.0\n"
QCOMPARE(rootModelNode.nodeListProperty("data").toModelNodeList().count(), 3);
ModelNode textNode1 = rootModelNode.nodeListProperty("data").toModelNodeList().first();
QVERIFY(textNode1.isValid());
- QCOMPARE(textNode1.type(), QString("QtQuick/Text"));
+ QCOMPARE(textNode1.type(), QString("Qt/Text"));
QCOMPARE(textNode1.id(), QString("text1"));
QCOMPARE(textNode1.variantProperty("text").value().toString(), QString("Hello World"));
QVERIFY(textNode1.hasProperty("anchors.centerIn"));
@@ -3665,13 +3665,13 @@ char qmlString[] = "import QtQuick 1.0\n"
ModelNode rectNode = rootModelNode.nodeListProperty("data").toModelNodeList().at(1);
QVERIFY(rectNode.isValid());
- QCOMPARE(rectNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rectNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rectNode.id(), QString("rectangle"));
QVERIFY(rectNode.hasProperty("gradient"));
QVERIFY(rectNode.property("gradient").isNodeProperty());
ModelNode gradientNode = rectNode.nodeProperty("gradient").modelNode();
QVERIFY(gradientNode.isValid());
- QCOMPARE(gradientNode.type(), QString("QtQuick/Gradient"));
+ QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
QVERIFY(gradientNode.hasProperty("stops"));
QVERIFY(gradientNode.property("stops").isNodeListProperty());
QCOMPARE(gradientNode.nodeListProperty("stops").toModelNodeList().count(), 2);
@@ -3682,15 +3682,15 @@ char qmlString[] = "import QtQuick 1.0\n"
QVERIFY(stop1.isValid());
QVERIFY(stop2.isValid());
- QCOMPARE(stop1.type(), QString("QtQuick/GradientStop"));
- QCOMPARE(stop2.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(stop1.type(), QString("Qt/GradientStop"));
+ QCOMPARE(stop2.type(), QString("Qt/GradientStop"));
QCOMPARE(stop1.variantProperty("position").value().toInt(), 0);
QCOMPARE(stop2.variantProperty("position").value().toInt(), 1);
ModelNode textNode2 = rootModelNode.nodeListProperty("data").toModelNodeList().last();
QVERIFY(textNode2.isValid());
- QCOMPARE(textNode2.type(), QString("QtQuick/Text"));
+ QCOMPARE(textNode2.type(), QString("Qt/Text"));
QCOMPARE(textNode2.id(), QString("text2"));
QCOMPARE(textNode2.variantProperty("width").value().toInt(), 80);
QCOMPARE(textNode2.variantProperty("height").value().toInt(), 20);
@@ -3701,17 +3701,17 @@ char qmlString[] = "import QtQuick 1.0\n"
void tst_TestCore::testMetaInfo()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
// test whether default type is registered
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
// test whether types from plugins are registered
QVERIFY(model->metaInfo().hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
// test whether non-qml type is registered
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // Qt 4.7 namespace
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 1, 0)); // webkit 1.0 namespace
}
@@ -3723,20 +3723,20 @@ void tst_TestCore::testMetaInfoSimpleType()
// qmlRegisterType<QDeclarativeItem>("Qt",4,7,"Item")
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item", 1, 0));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
- NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("QtQuick/Item", 1, 0);
- NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("QtQuick/Item", 1, 0);
+ NodeMetaInfo itemMetaInfo = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
+ NodeMetaInfo itemMetaInfo2 = model->metaInfo().nodeMetaInfo("Qt/Item", 4, 7);
QCOMPARE(itemMetaInfo, itemMetaInfo2);
QVERIFY(itemMetaInfo.isValid());
- QCOMPARE(itemMetaInfo.typeName(), QLatin1String("QtQuick/Item"));
- QCOMPARE(itemMetaInfo.majorVersion(), 1);
- QCOMPARE(itemMetaInfo.minorVersion(), 0);
+ QCOMPARE(itemMetaInfo.typeName(), QLatin1String("Qt/Item"));
+ QCOMPARE(itemMetaInfo.majorVersion(), 4);
+ QCOMPARE(itemMetaInfo.minorVersion(), 7);
// super classes
NodeMetaInfo graphicsObjectInfo = itemMetaInfo.directSuperClass();
@@ -3745,15 +3745,17 @@ void tst_TestCore::testMetaInfoSimpleType()
QCOMPARE(graphicsObjectInfo.majorVersion(), -1);
QCOMPARE(graphicsObjectInfo.minorVersion(), -1);
- QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, QtQuick/QtObject
- QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 1, 0));
- QVERIFY(itemMetaInfo.isSubclassOf("QtQuick/QtObject", 1, 0));
+ QCOMPARE(itemMetaInfo.superClasses().size(), 2); // QGraphicsObject, Qt/QtObject
+ QVERIFY(itemMetaInfo.isSubclassOf("QGraphicsObject", 4, 7));
+ QVERIFY(itemMetaInfo.isSubclassOf("Qt/QtObject", 4, 7));
// availableInVersion
- QVERIFY(itemMetaInfo.availableInVersion(1, 0));
+ QVERIFY(itemMetaInfo.availableInVersion(4, 7));
+ QVERIFY(itemMetaInfo.availableInVersion(4, 8));
+ QVERIFY(itemMetaInfo.availableInVersion(5, 0));
QVERIFY(itemMetaInfo.availableInVersion(-1, -1));
- QVERIFY(!itemMetaInfo.availableInVersion(0, 8));
- QVERIFY(!itemMetaInfo.availableInVersion(0, 9));
+ QVERIFY(!itemMetaInfo.availableInVersion(4, 6));
+ QVERIFY(!itemMetaInfo.availableInVersion(3, 7));
}
void tst_TestCore::testMetaInfoUncreatableType()
@@ -3763,23 +3765,23 @@ void tst_TestCore::testMetaInfoUncreatableType()
// qmlRegisterUncreatableType<QDeclarativeAbstractAnimation>("Qt",4,7,"Animation",QDeclarativeAbstractAnimation::tr("Animation is an abstract class"));
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Animation"));
- NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("QtQuick/Animation", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Animation"));
+ NodeMetaInfo animationTypeInfo = model->metaInfo().nodeMetaInfo("Qt/Animation", 4, 7);
QVERIFY(animationTypeInfo.isValid());
QVERIFY(animationTypeInfo.isValid());
- QCOMPARE(animationTypeInfo.typeName(), QLatin1String("QtQuick/Animation"));
- QCOMPARE(animationTypeInfo.majorVersion(), 1);
- QCOMPARE(animationTypeInfo.minorVersion(), 0);
+ QCOMPARE(animationTypeInfo.typeName(), QLatin1String("Qt/Animation"));
+ QCOMPARE(animationTypeInfo.majorVersion(), 4);
+ QCOMPARE(animationTypeInfo.minorVersion(), 7);
NodeMetaInfo qObjectTypeInfo = animationTypeInfo.directSuperClass();
QVERIFY(qObjectTypeInfo.isValid());
- QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("QtQuick/QtObject"));
- QCOMPARE(qObjectTypeInfo.majorVersion(), 1);
- QCOMPARE(qObjectTypeInfo.minorVersion(), 0);
+ QCOMPARE(qObjectTypeInfo.typeName(), QLatin1String("Qt/QtObject"));
+ QCOMPARE(qObjectTypeInfo.majorVersion(), 4);
+ QCOMPARE(qObjectTypeInfo.minorVersion(), 7);
QCOMPARE(animationTypeInfo.superClasses().size(), 1);
}
@@ -3790,11 +3792,11 @@ void tst_TestCore::testMetaInfoExtendedType()
// qmlRegisterExtendedType<QGraphicsWidget,QDeclarativeGraphicsWidget>("Qt",4,7,"QGraphicsWidget");
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/QGraphicsWidget"));
- NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("QtQuick/QGraphicsWidget", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/QGraphicsWidget"));
+ NodeMetaInfo graphicsWidgetTypeInfo = model->metaInfo().nodeMetaInfo("Qt/QGraphicsWidget", 4, 7);
QVERIFY(graphicsWidgetTypeInfo.isValid());
QVERIFY(graphicsWidgetTypeInfo.hasProperty("layout")); // from QGraphicsWidgetDeclarativeUI
QVERIFY(graphicsWidgetTypeInfo.hasProperty("font")); // from QGraphicsWidget
@@ -3820,13 +3822,13 @@ void tst_TestCore::testMetaInfoCustomType()
{
// Test type registered with qmlRegisterCustomType:
//
- // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 1, 0, "PropertyChanges", new QDeclarativePropertyChangesParser);
+ // qmlRegisterCustomType<QDeclarativePropertyChanges>("Qt", 4, 7, "PropertyChanges", new QDeclarativePropertyChangesParser);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/PropertyChanges"));
- NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("QtQuick/PropertyChanges", 1, 0);
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/PropertyChanges"));
+ NodeMetaInfo propertyChangesInfo = model->metaInfo().nodeMetaInfo("Qt/PropertyChanges", 4, 7);
QVERIFY(propertyChangesInfo.isValid());
QVERIFY(propertyChangesInfo.hasProperty("target")); // from QDeclarativePropertyChanges
QVERIFY(propertyChangesInfo.hasProperty("restoreEntryValues")); // from QDeclarativePropertyChanges
@@ -3845,14 +3847,14 @@ void tst_TestCore::testMetaInfoCustomType()
void tst_TestCore::testMetaInfoEnums()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Text"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
QVERIFY(view->rootModelNode().metaInfo().hasProperty("transformOrigin"));
@@ -3869,14 +3871,14 @@ void tst_TestCore::testMetaInfoEnums()
void tst_TestCore::testMetaInfoProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
- NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("QtQuick/TextEdit", 1, 0);
+ NodeMetaInfo textNodeMetaInfo = model->metaInfo().nodeMetaInfo("Qt/TextEdit", 4, 7);
QVERIFY(textNodeMetaInfo.hasProperty("text")); // QDeclarativeTextEdit
QVERIFY(textNodeMetaInfo.hasProperty("parent")); // QDeclarativeItem
QVERIFY(textNodeMetaInfo.hasProperty("x")); // QGraphicsObject
- QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // QtQuick/QObject
+ QVERIFY(textNodeMetaInfo.hasProperty("objectName")); // Qt/QObject
QVERIFY(!textNodeMetaInfo.hasProperty("bla"));
QVERIFY(textNodeMetaInfo.property("text").isValid());
@@ -3889,18 +3891,18 @@ void tst_TestCore::testMetaInfoProperties()
void tst_TestCore::testMetaInfoDotProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Text"));
+ QScopedPointer<Model> model(Model::create("Qt/Text"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Text"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Text"));
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Pen"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Pen"));
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Text"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Text"));
QVERIFY(!view->rootModelNode().metaInfo().property("text").isValueType());
QVERIFY(view->rootModelNode().metaInfo().hasProperty("font"));
QVERIFY(view->rootModelNode().metaInfo().property("font").isValueType());
@@ -3912,7 +3914,7 @@ void tst_TestCore::testMetaInfoDotProperties()
QVERIFY(view->rootModelNode().metaInfo().hasProperty("font.pointSize", true));
QVERIFY(view->rootModelNode().metaInfo().property("font.pointSize", true).isValid());
- ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
QVERIFY(rectNode.metaInfo().properties(true).keys().contains("pos.x"));
@@ -3931,15 +3933,15 @@ void tst_TestCore::testMetaInfoDotProperties()
void tst_TestCore::testMetaInfoListProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- QVERIFY(model->metaInfo().hasNodeMetaInfo("QtQuick/Item"));
- QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("QtQuick/Item"));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item"));
+ QCOMPARE(view->rootModelNode().metaInfo().typeName(), QString("Qt/Item"));
QVERIFY(view->rootModelNode().metaInfo().hasProperty("states"));
QVERIFY(view->rootModelNode().metaInfo().property("states").isListProperty());
@@ -3963,10 +3965,10 @@ void tst_TestCore::testMetaInfoListProperties()
void tst_TestCore::testStatesRewriter()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("import QtQuick 1.0; Item {}\n");
+ textEdit.setPlainText("import Qt 4.7; Item {}\n");
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4010,10 +4012,10 @@ void tst_TestCore::testStatesRewriter()
void tst_TestCore::testGradientsRewriter()
{
QPlainTextEdit textEdit;
- textEdit.setPlainText("\nimport QtQuick 1.0\n\nItem {\n}\n");
+ textEdit.setPlainText("\nimport Qt 4.7\n\nItem {\n}\n");
NotIndentingTextEditModifier modifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4029,9 +4031,9 @@ void tst_TestCore::testGradientsRewriter()
QVERIFY(rootModelNode.isValid());
- ModelNode rectNode(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
- const QLatin1String expected1("\nimport QtQuick 1.0\n"
+ const QLatin1String expected1("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4039,11 +4041,11 @@ void tst_TestCore::testGradientsRewriter()
"}\n");
QCOMPARE(textEdit.toPlainText(), expected1);
- ModelNode gradientNode(addNodeChild(rectNode, "QtQuick/Gradient", 1, 0, "gradient"));
+ ModelNode gradientNode(addNodeChild(rectNode, "Qt/Gradient", 4, 7, "gradient"));
QVERIFY(rectNode.hasNodeProperty("gradient"));
- const QLatin1String expected2("\nimport QtQuick 1.0\n"
+ const QLatin1String expected2("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4060,11 +4062,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::red))));
- ModelNode gradientStop1(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop1(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop1.isValid());
stops.reparentHere(gradientStop1);
- const QLatin1String expected3("\nimport QtQuick 1.0\n"
+ const QLatin1String expected3("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4083,11 +4085,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.5)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
- ModelNode gradientStop2(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop2(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop2.isValid());
stops.reparentHere(gradientStop2);
- const QLatin1String expected4("\nimport QtQuick 1.0\n"
+ const QLatin1String expected4("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4111,11 +4113,11 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0.8)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::yellow))));
- ModelNode gradientStop3(gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList));
+ ModelNode gradientStop3(gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList));
QVERIFY(gradientStop3.isValid());
stops.reparentHere(gradientStop3);
- const QLatin1String expected5("\nimport QtQuick 1.0\n"
+ const QLatin1String expected5("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4142,7 +4144,7 @@ void tst_TestCore::testGradientsRewriter()
gradientNode.removeProperty("stops");
- const QLatin1String expected6("\nimport QtQuick 1.0\n"
+ const QLatin1String expected6("\nimport Qt 4.7\n"
"\n"
"Item {\n"
"Rectangle {\n"
@@ -4159,7 +4161,7 @@ void tst_TestCore::testGradientsRewriter()
propertyList.append(qMakePair(QString("position"), QVariant::fromValue(0)));
propertyList.append(qMakePair(QString("color"), QVariant::fromValue(QColor(Qt::blue))));
- gradientStop1 = gradientNode.view()->createModelNode("QtQuick/GradientStop", 1, 0, propertyList);
+ gradientStop1 = gradientNode.view()->createModelNode("Qt/GradientStop", 4, 7, propertyList);
QVERIFY(gradientStop1.isValid());
stops.reparentHere(gradientStop1);
@@ -4167,7 +4169,7 @@ void tst_TestCore::testGradientsRewriter()
void tst_TestCore::testQmlModelStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4200,7 +4202,7 @@ void tst_TestCore::testQmlModelStates()
void tst_TestCore::testInstancesStates()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4228,7 +4230,7 @@ void tst_TestCore::testInstancesStates()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4239,28 +4241,28 @@ void tst_TestCore::testInstancesStates()
//
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
rootNode.nodeListProperty("data").reparentHere(textNode);
- ModelNode propertyChanges1Node = view->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode propertyChanges1Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
propertyChanges1Node.bindingProperty("target").setExpression("targetObject");
propertyChanges1Node.variantProperty("x").setValue(10);
propertyChanges1Node.variantProperty("text").setValue("state1");
- ModelNode state1Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state1Node = view->createModelNode("Qt/State", 4, 7);
state1Node.variantProperty("name").setValue("state1");
state1Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
rootNode.nodeListProperty("states").reparentHere(state1Node);
- ModelNode propertyChanges2Node = view->createModelNode("QtQuick/PropertyChanges", 1, 0);
+ ModelNode propertyChanges2Node = view->createModelNode("Qt/PropertyChanges", 4, 7);
propertyChanges2Node.bindingProperty("target").setExpression("targetObject");
propertyChanges2Node.variantProperty("text").setValue("state2");
- ModelNode state2Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state2Node = view->createModelNode("Qt/State", 4, 7);
state2Node.variantProperty("name").setValue("state2");
state2Node.nodeListProperty("changes").reparentHere(propertyChanges2Node);
@@ -4357,7 +4359,7 @@ void tst_TestCore::testInstancesStates()
//
// move property changes of current state out of state
- ModelNode state3Node = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode state3Node = view->createModelNode("Qt/State", 4, 7);
QDeclarativeListReference changes(state1, "changes");
QCOMPARE(changes.count(), 1);
state3Node.nodeListProperty("changes").reparentHere(propertyChanges1Node);
@@ -4380,7 +4382,7 @@ void tst_TestCore::testInstancesStates()
textNode.variantProperty("text").setValue("base state");
// expressions
- ModelNode textNode2 = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode2 = view->createModelNode("Qt/Text", 4, 7);
textNode2.setId("targetObject2");
textNode2.variantProperty("text").setValue("textNode2");
@@ -4440,7 +4442,7 @@ void tst_TestCore::testInstancesStates()
void tst_TestCore::testStates()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4459,7 +4461,7 @@ void tst_TestCore::testStates()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4468,7 +4470,7 @@ void tst_TestCore::testStates()
// build up model
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
@@ -4484,7 +4486,7 @@ void tst_TestCore::testStates()
QVERIFY(textItem.isValid());
QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
QVERIFY(view->currentState().isBaseState());
@@ -4517,7 +4519,7 @@ void tst_TestCore::testStates()
QCOMPARE(changes.modelNode().variantProperty("text").value(), QVariant("state 1"));
QCOMPARE(changes.modelNode().bindingProperty("target").expression(), QString("targetObject"));
QCOMPARE(changes.target(), textNode);
- QCOMPARE(changes.modelNode().type(), QString("QtQuick/PropertyChanges"));
+ QCOMPARE(changes.modelNode().type(), QString("Qt/PropertyChanges"));
QCOMPARE(changes.modelNode().parentProperty().name(), QString("changes"));
QCOMPARE(changes.modelNode().parentProperty().parentModelNode(), state1.modelNode());
@@ -4536,7 +4538,7 @@ void tst_TestCore::testStates()
void tst_TestCore::testStatesBaseState()
{
//
-// import QtQuick 1.0
+// import Qt 4.7
//
// Rectangle {
// Text {
@@ -4555,7 +4557,7 @@ void tst_TestCore::testStatesBaseState()
// }
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -4564,7 +4566,7 @@ void tst_TestCore::testStatesBaseState()
// build up model
ModelNode rootNode = view->rootModelNode();
- ModelNode textNode = view->createModelNode("QtQuick/Text", 1, 0);
+ ModelNode textNode = view->createModelNode("Qt/Text", 4, 7);
textNode.setId("targetObject");
textNode.variantProperty("text").setValue("base state");
@@ -4580,7 +4582,7 @@ void tst_TestCore::testStatesBaseState()
QVERIFY(textItem.isValid());
QmlModelState state1(rootItem.states().addState("state 1")); //add state "state 1"
- QCOMPARE(state1.modelNode().type(), QString("QtQuick/State"));
+ QCOMPARE(state1.modelNode().type(), QString("Qt/State"));
QVERIFY(view->currentState().isBaseState());
@@ -4590,7 +4592,7 @@ void tst_TestCore::testStatesBaseState()
QVERIFY(textItem.propertyAffectedByCurrentState("text"));
QCOMPARE(textItem.instanceValue("text"), QVariant("state 1"));
- ModelNode newNode = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/Rectangle", 4, 7);
QVERIFY(!QmlObjectNode(newNode).currentState().isBaseState());
view->setCurrentState(view->baseState()); //set currentState base state
@@ -4612,13 +4614,13 @@ void tst_TestCore::testStatesBaseState()
void tst_TestCore::testInstancesIdResolution()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- // import QtQuick 1.0
+ // import Qt 4.7
//
// Rectangle {
// id: root
@@ -4636,7 +4638,7 @@ void tst_TestCore::testInstancesIdResolution()
rootNode.variantProperty("width").setValue(100);
rootNode.variantProperty("height").setValue(100);
- ModelNode item1Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item1Node = view->createModelNode("Qt/Rectangle", 4, 7);
item1Node.setId("item1");
item1Node.bindingProperty("width").setExpression("root.width");
item1Node.bindingProperty("height").setExpression("item2.height");
@@ -4656,7 +4658,7 @@ void tst_TestCore::testInstancesIdResolution()
// height: root.height
// }
- ModelNode item2Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item2Node = view->createModelNode("Qt/Rectangle", 4, 7);
item2Node.setId("item2");
item2Node.bindingProperty("width").setExpression("root.width / 2");
item2Node.bindingProperty("height").setExpression("root.height");
@@ -4681,7 +4683,7 @@ void tst_TestCore::testInstancesIdResolution()
// height: 80
// }
- ModelNode item3Node = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode item3Node = view->createModelNode("Qt/Rectangle", 4, 7);
item3Node.setId("item3");
item3Node.variantProperty("height").setValue(80);
rootNode.nodeListProperty("data").reparentHere(item3Node);
@@ -4699,16 +4701,16 @@ void tst_TestCore::testInstancesNotInScene()
// test whether deleting an instance which is not in the scene crashes
//
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
node2.setId("node2");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4720,21 +4722,21 @@ void tst_TestCore::testInstancesBindingsInStatesStress()
{
//This is a stress test to provoke a crash
for (int j=0;j<20;j++) {
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4825,21 +4827,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
//this tests checks if a change of the target of a CropertyChange
//node is handled correctly
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -4931,21 +4933,21 @@ void tst_TestCore::testInstancesPropertyChangeTargets()
void tst_TestCore::testInstancesDeletePropertyChanges()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
model->attachView(view.data());
- ModelNode node1 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Item", 4, 7);
node1.setId("node1");
view->rootModelNode().nodeListProperty("children").reparentHere(node1);
- ModelNode node2 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Rectangle", 4, 7);
node2.setId("node2");
- ModelNode node3 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node3 = view->createModelNode("Qt/Rectangle", 4, 7);
node3.setId("node3");
node1.nodeListProperty("children").reparentHere(node2);
@@ -5020,7 +5022,7 @@ void tst_TestCore::testInstancesDeletePropertyChanges()
void tst_TestCore::testInstancesChildrenLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5032,11 +5034,11 @@ void tst_TestCore::testInstancesChildrenLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
@@ -5110,7 +5112,7 @@ void tst_TestCore::testInstancesChildrenLowLevel()
void tst_TestCore::testInstancesResourcesLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5122,15 +5124,15 @@ void tst_TestCore::testInstancesResourcesLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
@@ -5169,6 +5171,8 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceResources.at(0), listModelObject);
QCOMPARE(listReferenceData.at(0), listModelObject);
+ QSKIP("This crashes", SkipAll); //### todo might be critical in the future
+
listReferenceResources.clear();
QCOMPARE(listReferenceData.count(), 2);
@@ -5186,8 +5190,6 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceData.at(1), child1Item);
QCOMPARE(listReferenceData.at(2), child2Item);
- QSKIP("This crashes", SkipAll); //### todo might be critical in the future
-
listReferenceChildren.clear();
QCOMPARE(listReferenceData.count(), 1);
@@ -5209,7 +5211,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
QCOMPARE(listReferenceData.at(1), child1Item);
QCOMPARE(listReferenceData.at(2), child2Item);
- ModelNode listModel2 = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel2 = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel2.isValid());
listModel2.setId("listModel2");
@@ -5257,7 +5259,7 @@ void tst_TestCore::testInstancesResourcesLowLevel()
void tst_TestCore::testInstancesFlickableLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Flickable", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Flickable", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5269,15 +5271,15 @@ void tst_TestCore::testInstancesFlickableLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "flickableData");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "flickableData");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "flickableData");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "flickableData");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "flickableData");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "flickableData");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
@@ -5345,7 +5347,7 @@ void tst_TestCore::testInstancesFlickableLowLevel()
void tst_TestCore::testInstancesReorderChildrenLowLevel()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<NodeInstanceView> view(new NodeInstanceView);
@@ -5357,23 +5359,23 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
rootModelNode.setId("rootModelNode");
- ModelNode childNode1 = addNodeListChild(rootModelNode, "QtQuick/Text", 1, 0, "data");
+ ModelNode childNode1 = addNodeListChild(rootModelNode, "Qt/Text", 4, 7, "data");
QVERIFY(childNode1.isValid());
childNode1.setId("childNode1");
- ModelNode childNode2 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode2 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode2.isValid());
childNode2.setId("childNode2");
- ModelNode listModel = addNodeListChild(rootModelNode, "QtQuick/ListModel", 1, 0, "data");
+ ModelNode listModel = addNodeListChild(rootModelNode, "Qt/ListModel", 4, 7, "data");
QVERIFY(listModel.isValid());
listModel.setId("listModel");
- ModelNode childNode3 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode3 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode3.isValid());
childNode3.setId("childNode3");
- ModelNode childNode4 = addNodeListChild(rootModelNode, "QtQuick/TextEdit", 1, 0, "data");
+ ModelNode childNode4 = addNodeListChild(rootModelNode, "Qt/TextEdit", 4, 7, "data");
QVERIFY(childNode4.isValid());
childNode4.setId("childNode4");
@@ -5444,7 +5446,7 @@ void tst_TestCore::testInstancesReorderChildrenLowLevel()
void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5461,11 +5463,11 @@ void tst_TestCore::testQmlModelStatesInvalidForRemovedNodes()
QVERIFY(state1.isValid());
QCOMPARE(state1.name(), QString("state1"));
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(childNode.isValid());
childNode.setId("childNode");
- ModelNode subChildNode = addNodeListChild(childNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode subChildNode = addNodeListChild(childNode, "Qt/Rectangle", 4, 7, "data");
QVERIFY(subChildNode.isValid());
subChildNode.setId("subChildNode");
@@ -5485,7 +5487,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
// Test attaching nodeinstanceview to an existing model
//
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5493,7 +5495,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
model->attachView(view.data());
ModelNode rootNode = view->rootModelNode();
- ModelNode rectangleNode = addNodeListChild(rootNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode rectangleNode = addNodeListChild(rootNode, "Qt/Rectangle", 4, 7, "data");
rectangleNode.variantProperty("width").setValue(100);
@@ -5518,7 +5520,7 @@ void tst_TestCore::testInstancesAttachToExistingModel()
void tst_TestCore::testQmlModelAddMultipleStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5549,7 +5551,7 @@ void tst_TestCore::testQmlModelAddMultipleStates()
void tst_TestCore::testQmlModelRemoveStates()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle", 4, 7));
QScopedPointer<TestView> view(new TestView(model.data()));
QVERIFY(view.data());
@@ -5579,10 +5581,10 @@ void tst_TestCore::testQmlModelRemoveStates()
void tst_TestCore::testQmlModelStateWithName()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 200; } } ] }\n");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
testRewriterView1->setTextModifier(&modifier1);
@@ -5604,7 +5606,7 @@ void tst_TestCore::testQmlModelStateWithName()
view->setCurrentState(rootNode.states().allStates().at(0));
rootNode.setVariantProperty("width", 112);
- const QLatin1String expected1("import QtQuick 1.0; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
+ const QLatin1String expected1("import Qt 4.7; Rectangle { id: theRect; width: 100; states: [ State { name: \"a\"; PropertyChanges { target: theRect; width: 112 } } ] }\n");
QCOMPARE(textEdit1.toPlainText(), expected1);
QVERIFY(!rootNode.isInBaseState());
@@ -5624,10 +5626,10 @@ void tst_TestCore::testQmlModelStateWithName()
void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle {\n width: 640\n height: 480\n}\n");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle {\n width: 640\n height: 480\n}\n");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
TestRewriterView *testRewriterView1 = new TestRewriterView(model1.data());
testRewriterView1->setTextModifier(&modifier1);
@@ -5644,7 +5646,7 @@ void tst_TestCore::testRewriterAutomaticSemicolonAfterChangedProperty()
void tst_TestCore::defaultPropertyValues()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5654,12 +5656,12 @@ void tst_TestCore::defaultPropertyValues()
QCOMPARE(view->rootModelNode().variantProperty("x").value().toDouble(), 0.0);
QCOMPARE(view->rootModelNode().variantProperty("width").value().toDouble(), 0.0);
- ModelNode rectNode(addNodeListChild(view->rootModelNode(), "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rectNode(addNodeListChild(view->rootModelNode(), "Qt/Rectangle", 4, 7, "data"));
QCOMPARE(rectNode.variantProperty("y").value().toDouble(), 0.0);
QCOMPARE(rectNode.variantProperty("width").value().toDouble(), 0.0);
- ModelNode imageNode(addNodeListChild(view->rootModelNode(), "QtQuick/Image", 1, 0, "data"));
+ ModelNode imageNode(addNodeListChild(view->rootModelNode(), "Qt/Image", 4, 7, "data"));
QCOMPARE(imageNode.variantProperty("y").value().toDouble(), 0.0);
QCOMPARE(imageNode.variantProperty("width").value().toDouble(), 0.0);
@@ -5668,10 +5670,10 @@ void tst_TestCore::defaultPropertyValues()
void tst_TestCore::testModelPropertyValueTypes()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
+ textEdit1.setPlainText("import Qt 4.7; Rectangle { width: 100; radius: 1.5; color: \"red\"; }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model1(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model1(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5689,7 +5691,7 @@ void tst_TestCore::testModelPropertyValueTypes()
void tst_TestCore::testModelNodeInHierarchy()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5697,9 +5699,9 @@ void tst_TestCore::testModelNodeInHierarchy()
model->attachView(view.data());
QVERIFY(view->rootModelNode().isInHierarchy());
- ModelNode node1 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode node1 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
QVERIFY(node1.isInHierarchy());
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
QVERIFY(!node2.isInHierarchy());
node2.nodeListProperty("data").reparentHere(node1);
QVERIFY(!node2.isInHierarchy());
@@ -5710,11 +5712,11 @@ void tst_TestCore::testModelNodeInHierarchy()
void tst_TestCore::testModelNodeIsAncestorOf()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
//
- // import QtQuick 1.0
+ // import Qt 4.7
// Item {
// Item {
// id: item2
@@ -5732,11 +5734,11 @@ void tst_TestCore::testModelNodeIsAncestorOf()
model->attachView(view.data());
view->rootModelNode().setId("item1");
- ModelNode item2 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode item2 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
item2.setId("item2");
- ModelNode item3 = addNodeListChild(view->rootModelNode(), "QtQuick/Item", 1, 0, "data");
+ ModelNode item3 = addNodeListChild(view->rootModelNode(), "Qt/Item", 4, 7, "data");
item3.setId("item3");
- ModelNode item4 = addNodeListChild(item3, "QtQuick/Item", 1, 0, "data");
+ ModelNode item4 = addNodeListChild(item3, "Qt/Item", 4, 7, "data");
item4.setId("item4");
QVERIFY(view->rootModelNode().isAncestorOf(item2));
@@ -5749,7 +5751,7 @@ void tst_TestCore::testModelNodeIsAncestorOf()
void tst_TestCore::testModelDefaultProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Rectangle"));
+ QScopedPointer<Model> model(Model::create("Qt/Rectangle"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -5765,10 +5767,10 @@ void tst_TestCore::testModelDefaultProperties()
void tst_TestCore::loadAnchors()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5804,10 +5806,10 @@ void tst_TestCore::loadAnchors()
void tst_TestCore::changeAnchors()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { anchors.left: parent.left; anchors.horizontalCenter: parent.horizontalCenter; anchors.rightMargin: 20; }}");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5865,10 +5867,10 @@ void tst_TestCore::changeAnchors()
void tst_TestCore::anchorToSibling()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { Rectangle {} Rectangle { id: secondChild } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { Rectangle {} Rectangle { id: secondChild } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5909,10 +5911,10 @@ void tst_TestCore::anchorToSibling()
void tst_TestCore::removeFillAnchorByDetaching()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -5989,10 +5991,10 @@ void tst_TestCore::removeFillAnchorByDetaching()
void tst_TestCore::removeFillAnchorByChanging()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { width: 100; height: 100; Rectangle { id: child; anchors.fill: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -6069,7 +6071,7 @@ void tst_TestCore::removeFillAnchorByChanging()
void tst_TestCore::testModelBindings()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
NodeInstanceView *nodeInstanceView = new NodeInstanceView(model.data());
@@ -6089,7 +6091,7 @@ void tst_TestCore::testModelBindings()
QCOMPARE(rootInstance.size().width(), 200.0);
QCOMPARE(rootInstance.size().height(), 100.0);
- ModelNode childNode = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode childNode = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
childNode.variantProperty("width") = 100;
childNode.variantProperty("height") = 100;
@@ -6127,7 +6129,7 @@ void tst_TestCore::testModelBindings()
void tst_TestCore::testModelDynamicProperties()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
TestView *testView = new TestView(model.data());
@@ -6171,7 +6173,7 @@ void tst_TestCore::testModelDynamicProperties()
void tst_TestCore::testModelSliding()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6180,10 +6182,10 @@ void tst_TestCore::testModelSliding()
ModelNode rootModelNode(view->rootModelNode());
- ModelNode rect00(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect01(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect02(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
- ModelNode rect03(addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data"));
+ ModelNode rect00(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect01(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect02(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
+ ModelNode rect03(addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data"));
QVERIFY(rect00.isValid());
QVERIFY(rect01.isValid());
@@ -6239,13 +6241,13 @@ void tst_TestCore::testModelSliding()
void tst_TestCore::testRewriterChangeId()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { }";
+ const char* qmlString = "import Qt 4.7\nRectangle { }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6264,25 +6266,25 @@ void tst_TestCore::testRewriterChangeId()
QCOMPARE(rootModelNode.id(), QString("rectId"));
- QString expected = "import QtQuick 1.0\n"
+ QString expected = "import Qt 4.7\n"
"Rectangle { id: rectId }";
QCOMPARE(textEdit.toPlainText(), expected);
// change id for node outside of hierarchy
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7);
node.setId("myId");
}
void tst_TestCore::testRewriterRemoveId()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { id: rect }";
+ const char* qmlString = "import Qt 4.7\nRectangle { id: rect }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6300,7 +6302,7 @@ void tst_TestCore::testRewriterRemoveId()
//
// remove id in text
//
- const char* qmlString2 = "import QtQuick 1.0\nRectangle { }";
+ const char* qmlString2 = "import Qt 4.7\nRectangle { }";
textEdit.setPlainText(qmlString2);
QCOMPARE(rootModelNode.id(), QString());
@@ -6308,13 +6310,13 @@ void tst_TestCore::testRewriterRemoveId()
void tst_TestCore::testRewriterChangeValueProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { x: 10; y: 10 }";
+ const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6337,14 +6339,14 @@ void tst_TestCore::testRewriterChangeValueProperty()
// change property for node outside of hierarchy
PropertyListType properties;
properties.append(QPair<QString,QVariant>("x", 10));
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0, properties);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
node.variantProperty("x").setValue(20);
}
void tst_TestCore::testRewriterRemoveValueProperty()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"Rectangle {\n"
" x: 10\n"
" y: 10;\n"
@@ -6354,7 +6356,7 @@ void tst_TestCore::testRewriterRemoveValueProperty()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6375,7 +6377,7 @@ void tst_TestCore::testRewriterRemoveValueProperty()
rootModelNode.removeProperty("x");
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"Rectangle {\n"
" y: 10;\n"
"}\n");
@@ -6384,19 +6386,19 @@ void tst_TestCore::testRewriterRemoveValueProperty()
// remove property for node outside of hierarchy
PropertyListType properties;
properties.append(QPair<QString,QVariant>("x", 10));
- ModelNode node = view->createModelNode("QtQuick/Item", 1, 0, properties);
+ ModelNode node = view->createModelNode("Qt/Item", 4, 7, properties);
node.removeProperty("x");
}
void tst_TestCore::testRewriterSignalProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { onColorChanged: {} }";
+ const char* qmlString = "import Qt 4.7\nRectangle { onColorChanged: {} }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6416,13 +6418,13 @@ void tst_TestCore::testRewriterSignalProperty()
void tst_TestCore::testRewriterObjectTypeProperty()
{
- const char* qmlString = "import QtQuick 1.0\nRectangle { x: 10; y: 10 }";
+ const char* qmlString = "import Qt 4.7\nRectangle { x: 10; y: 10 }";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6436,11 +6438,11 @@ void tst_TestCore::testRewriterObjectTypeProperty()
ModelNode rootModelNode(view->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
- view->changeRootNodeType(QLatin1String("QtQuick/Text"), 1, 0);
+ view->changeRootNodeType(QLatin1String("Qt/Text"), 4, 7);
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Text"));
}
void tst_TestCore::testRewriterPropertyChanges()
@@ -6450,7 +6452,7 @@ void tst_TestCore::testRewriterPropertyChanges()
// Use a slightly more complicated example so that target properties are not resolved in default scope
const char* qmlString
- = "import QtQuick 1.0\n"
+ = "import Qt 4.7\n"
"Rectangle {\n"
" Text {\n"
" id: targetObj\n"
@@ -6470,7 +6472,7 @@ void tst_TestCore::testRewriterPropertyChanges()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6483,7 +6485,7 @@ void tst_TestCore::testRewriterPropertyChanges()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QVERIFY(rootNode.propertyNames().contains(QLatin1String("data")));
QVERIFY(rootNode.propertyNames().contains(QLatin1String("states")));
QCOMPARE(rootNode.propertyNames().count(), 2);
@@ -6494,7 +6496,7 @@ void tst_TestCore::testRewriterPropertyChanges()
ModelNode stateNode = statesProperty.toModelNodeList().first();
QVERIFY(stateNode.isValid());
- QCOMPARE(stateNode.type(), QString("QtQuick/State"));
+ QCOMPARE(stateNode.type(), QString("Qt/State"));
QCOMPARE(stateNode.propertyNames(), QStringList("changes"));
NodeListProperty stateChangesProperty = stateNode.property("changes").toNodeListProperty();
@@ -6521,13 +6523,13 @@ void tst_TestCore::testRewriterListModel()
try {
// ListModel uses a custom parser
- const char* qmlString = "import QtQuick 1.0; ListModel {\n ListElement {\n age: 12\n} \n}";
+ const char* qmlString = "import Qt 4.7; ListModel {\n ListElement {\n age: 12\n} \n}";
QPlainTextEdit textEdit;
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -6556,7 +6558,7 @@ void tst_TestCore::testRewriterListModel()
void tst_TestCore::testRewriterAddProperty()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6564,7 +6566,7 @@ void tst_TestCore::testRewriterAddProperty()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6577,7 +6579,7 @@ void tst_TestCore::testRewriterAddProperty()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
rootNode.variantProperty(QLatin1String("x")).setValue(123);
@@ -6586,7 +6588,7 @@ void tst_TestCore::testRewriterAddProperty()
QCOMPARE(rootNode.variantProperty(QLatin1String("x")).value(), QVariant(123));
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"x: 123\n"
@@ -6597,7 +6599,7 @@ void tst_TestCore::testRewriterAddProperty()
void tst_TestCore::testRewriterAddPropertyInNestedObject()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Rectangle {\n"
@@ -6608,7 +6610,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6621,18 +6623,18 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
ModelNode childNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
QVERIFY(childNode.isValid());
- QCOMPARE(childNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(childNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(childNode.id(), QLatin1String("rectangle1"));
childNode.variantProperty(QLatin1String("x")).setValue(10);
childNode.variantProperty(QLatin1String("y")).setValue(10);
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Rectangle {\n"
@@ -6646,7 +6648,7 @@ void tst_TestCore::testRewriterAddPropertyInNestedObject()
void tst_TestCore::testRewriterAddObjectDefinition()
{
- const QLatin1String qmlString("import QtQuick 1.0\n"
+ const QLatin1String qmlString("import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6654,7 +6656,7 @@ void tst_TestCore::testRewriterAddObjectDefinition()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6667,20 +6669,20 @@ void tst_TestCore::testRewriterAddObjectDefinition()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode childNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode childNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeAbstractProperty(QLatin1String("data")).reparentHere(childNode);
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
}
void tst_TestCore::testRewriterAddStatesArray()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6688,7 +6690,7 @@ void tst_TestCore::testRewriterAddStatesArray()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6700,13 +6702,13 @@ void tst_TestCore::testRewriterAddStatesArray()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode stateNode = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode stateNode = view->createModelNode("Qt/State", 4, 7);
rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode);
const QString expected1 = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"states: [\n"
@@ -6716,11 +6718,11 @@ void tst_TestCore::testRewriterAddStatesArray()
"}");
QCOMPARE(textEdit.toPlainText(), expected1);
- ModelNode stateNode2 = view->createModelNode("QtQuick/State", 1, 0);
+ ModelNode stateNode2 = view->createModelNode("Qt/State", 4, 7);
rootNode.nodeListProperty(QLatin1String("states")).reparentHere(stateNode2);
const QString expected2 = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"states: [\n"
@@ -6736,7 +6738,7 @@ void tst_TestCore::testRewriterAddStatesArray()
void tst_TestCore::testRewriterRemoveStates()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -6750,7 +6752,7 @@ void tst_TestCore::testRewriterRemoveStates()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6762,7 +6764,7 @@ void tst_TestCore::testRewriterRemoveStates()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
NodeListProperty statesProperty = rootNode.nodeListProperty(QLatin1String("states"));
QVERIFY(statesProperty.isValid());
@@ -6772,7 +6774,7 @@ void tst_TestCore::testRewriterRemoveStates()
state.destroy();
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" states: [\n"
@@ -6786,7 +6788,7 @@ void tst_TestCore::testRewriterRemoveStates()
state.destroy();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -6796,7 +6798,7 @@ void tst_TestCore::testRewriterRemoveStates()
void tst_TestCore::testRewriterRemoveObjectDefinition()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" MouseArea {\n"
@@ -6808,7 +6810,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6821,24 +6823,24 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 2);
ModelNode childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(1);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
childNode.destroy();
QCOMPARE(rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().size(), 1);
childNode = rootNode.nodeProperty(QLatin1String("data")).toNodeListProperty().toModelNodeList().at(0);
- QCOMPARE(childNode.type(), QString(QLatin1String("QtQuick/MouseArea")));
+ QCOMPARE(childNode.type(), QString(QLatin1String("Qt/MouseArea")));
childNode.destroy();
QVERIFY(!rootNode.hasProperty(QLatin1String("data")));
const QString expected = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" // some comment here\n"
@@ -6846,9 +6848,9 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
QCOMPARE(textEdit.toPlainText(), expected);
// don't crash when deleting nodes not in any hierarchy
- ModelNode node1 = view->createModelNode("QtQuick/Rectangle", 1, 0);
- ModelNode node2 = addNodeListChild(node1, "QtQuick/Item", 1, 0, "data");
- ModelNode node3 = addNodeListChild(node2, "QtQuick/Item", 1, 0, "data");
+ ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+ ModelNode node2 = addNodeListChild(node1, "Qt/Item", 4, 7, "data");
+ ModelNode node3 = addNodeListChild(node2, "Qt/Item", 4, 7, "data");
node3.destroy();
node1.destroy();
@@ -6857,7 +6859,7 @@ void tst_TestCore::testRewriterRemoveObjectDefinition()
void tst_TestCore::testRewriterRemoveScriptBinding()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" x: 10; // some comment\n"
@@ -6867,7 +6869,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6880,7 +6882,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
QCOMPARE(rootNode.properties().size(), 2);
QVERIFY(rootNode.hasProperty(QLatin1String("x")));
@@ -6897,7 +6899,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
QCOMPARE(rootNode.properties().size(), 0);
const QString expected = QLatin1String("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" // some comment\n"
@@ -6908,7 +6910,7 @@ void tst_TestCore::testRewriterRemoveScriptBinding()
void tst_TestCore::testRewriterNodeReparenting()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6920,7 +6922,7 @@ void tst_TestCore::testRewriterNodeReparenting()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -6933,15 +6935,15 @@ void tst_TestCore::testRewriterNodeReparenting()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
ModelNode itemNode = rootNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(itemNode.isValid());
- QCOMPARE(itemNode.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(itemNode.type(), QLatin1String("Qt/Item"));
ModelNode mouseArea = itemNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(mouseArea.isValid());
- QCOMPARE(mouseArea.type(), QLatin1String("QtQuick/MouseArea"));
+ QCOMPARE(mouseArea.type(), QLatin1String("Qt/MouseArea"));
rootNode.nodeListProperty("data").reparentHere(mouseArea);
@@ -6949,7 +6951,7 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(rootNode.nodeListProperty("data").toModelNodeList().size(), 2);
QString expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6961,9 +6963,9 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(textEdit.toPlainText(), expected);
// reparenting outside of the hierarchy
- ModelNode node1 = view->createModelNode("QtQuick/Rectangle", 1, 0);
- ModelNode node2 = view->createModelNode("QtQuick/Item", 1, 0);
- ModelNode node3 = view->createModelNode("QtQuick/Item", 1, 0);
+ ModelNode node1 = view->createModelNode("Qt/Rectangle", 4, 7);
+ ModelNode node2 = view->createModelNode("Qt/Item", 4, 7);
+ ModelNode node3 = view->createModelNode("Qt/Item", 4, 7);
node2.nodeListProperty("data").reparentHere(node3);
node1.nodeListProperty("data").reparentHere(node2);
@@ -6971,7 +6973,7 @@ void tst_TestCore::testRewriterNodeReparenting()
rootNode.nodeListProperty("data").reparentHere(node1);
expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -6991,11 +6993,11 @@ void tst_TestCore::testRewriterNodeReparenting()
QCOMPARE(textEdit.toPlainText(), expected);
// reparent out of the hierarchy
- ModelNode node4 = view->createModelNode("QtQuick/Rectangle", 1, 0);
+ ModelNode node4 = view->createModelNode("Qt/Rectangle", 4, 7);
node4.nodeListProperty("data").reparentHere(node1);
expected = "\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7011,7 +7013,7 @@ void tst_TestCore::testRewriterNodeReparenting()
void tst_TestCore::testRewriterNodeReparentingWithTransaction()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: rootItem\n"
@@ -7028,7 +7030,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7041,17 +7043,17 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootNode.id(), QLatin1String("rootItem"));
ModelNode item1Node = rootNode.nodeListProperty("data").toModelNodeList().at(0);
QVERIFY(item1Node.isValid());
- QCOMPARE(item1Node.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(item1Node.type(), QLatin1String("Qt/Item"));
QCOMPARE(item1Node.id(), QLatin1String("firstItem"));
ModelNode item2Node = rootNode.nodeListProperty("data").toModelNodeList().at(1);
QVERIFY(item2Node.isValid());
- QCOMPARE(item2Node.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(item2Node.type(), QLatin1String("Qt/Item"));
QCOMPARE(item2Node.id(), QLatin1String("secondItem"));
RewriterTransaction transaction = testRewriterView->beginRewriterTransaction();
@@ -7062,7 +7064,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
transaction.commit();
const QLatin1String expected("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" id: rootItem\n"
@@ -7081,7 +7083,7 @@ void tst_TestCore::testRewriterNodeReparentingWithTransaction()
void tst_TestCore::testRewriterMovingInOut()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7089,7 +7091,7 @@ void tst_TestCore::testRewriterMovingInOut()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7102,13 +7104,13 @@ void tst_TestCore::testRewriterMovingInOut()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"MouseArea {\n"
@@ -7127,7 +7129,7 @@ void tst_TestCore::testRewriterMovingInOut()
newNode.destroy();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7137,7 +7139,7 @@ void tst_TestCore::testRewriterMovingInOut()
void tst_TestCore::testRewriterMovingInOutWithTransaction()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7145,7 +7147,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7158,11 +7160,11 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
RewriterTransaction transaction = view->beginRewriterTransaction();
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
#define move(node, x, y) {\
@@ -7178,7 +7180,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
transaction.commit();
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
"}");
@@ -7188,7 +7190,7 @@ void tst_TestCore::testRewriterMovingInOutWithTransaction()
void tst_TestCore::testRewriterComplexMovingInOut()
{
const QLatin1String qmlString("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7198,7 +7200,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
textEdit.setPlainText(qmlString);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7211,14 +7213,14 @@ void tst_TestCore::testRewriterComplexMovingInOut()
ModelNode rootNode = view->rootModelNode();
QVERIFY(rootNode.isValid());
- QCOMPARE(rootNode.type(), QString("QtQuick/Rectangle"));
+ QCOMPARE(rootNode.type(), QString("Qt/Rectangle"));
ModelNode itemNode = rootNode.nodeListProperty(QLatin1String("data")).toModelNodeList().at(0);
- ModelNode newNode = view->createModelNode("QtQuick/MouseArea", 1, 0);
+ ModelNode newNode = view->createModelNode("Qt/MouseArea", 4, 7);
rootNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected1("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7238,7 +7240,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
move(newNode, 3, 3);
const QLatin1String expected2("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7254,7 +7256,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
itemNode.nodeListProperty(QLatin1String("data")).reparentHere(newNode);
const QLatin1String expected3("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7274,7 +7276,7 @@ void tst_TestCore::testRewriterComplexMovingInOut()
newNode.destroy();
const QLatin1String expected4("\n"
- "import QtQuick 1.0\n"
+ "import Qt 4.7\n"
"\n"
"Rectangle {\n"
" Item {\n"
@@ -7286,10 +7288,10 @@ void tst_TestCore::testRewriterComplexMovingInOut()
void tst_TestCore::removeCenteredInAnchorByDetaching()
{
QPlainTextEdit textEdit1;
- textEdit1.setPlainText("import QtQuick 1.0; Item { Rectangle { id: child; anchors.centerIn: parent } }");
+ textEdit1.setPlainText("import Qt 4.7; Item { Rectangle { id: child; anchors.centerIn: parent } }");
NotIndentingTextEditModifier modifier1(&textEdit1);
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QScopedPointer<TestRewriterView> testRewriterView1(new TestRewriterView());
testRewriterView1->setTextModifier(&modifier1);
@@ -7340,7 +7342,7 @@ void tst_TestCore::removeCenteredInAnchorByDetaching()
void tst_TestCore::changePropertyBinding()
{
- QScopedPointer<Model> model(Model::create("QtQuick/Item"));
+ QScopedPointer<Model> model(Model::create("Qt/Item"));
QVERIFY(model.data());
QScopedPointer<TestView> view(new TestView(model.data()));
@@ -7349,7 +7351,7 @@ void tst_TestCore::changePropertyBinding()
ModelNode rootModelNode(view->rootModelNode());
rootModelNode.variantProperty("width") = 20;
- ModelNode firstChild = addNodeListChild(rootModelNode, "QtQuick/Rectangle", 1, 0, "data");
+ ModelNode firstChild = addNodeListChild(rootModelNode, "Qt/Rectangle", 4, 7, "data");
firstChild.bindingProperty("width").setExpression(QString("parent.width"));
firstChild.variantProperty("height")= 10;
QVERIFY(firstChild.isValid());
@@ -7389,7 +7391,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7400,7 +7402,7 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Item"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Item"));
QVERIFY(rootModelNode.allDirectSubModelNodes().isEmpty());
}
@@ -7412,7 +7414,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7423,14 +7425,14 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 1);
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
ModelNode textNode(rootModelNode.allDirectSubModelNodes().first());
QVERIFY(textNode.isValid());
- QCOMPARE(textNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
}
@@ -7442,7 +7444,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7453,7 +7455,7 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QCOMPARE(rootModelNode.allDirectSubModelNodes().count(), 4);
QCOMPARE(rootModelNode.variantProperty("width").value().toInt(), 200);
QCOMPARE(rootModelNode.variantProperty("height").value().toInt(), 200);
@@ -7464,14 +7466,14 @@ void tst_TestCore::loadTestFiles()
ModelNode textNode(rootModelNode.nodeListProperty("data").toModelNodeList().first());
QVERIFY(textNode.isValid());
QCOMPARE(textNode.id(), QLatin1String("text"));
- QCOMPARE(textNode.type(), QLatin1String("QtQuick/Text"));
+ QCOMPARE(textNode.type(), QLatin1String("Qt/Text"));
QCOMPARE(textNode.variantProperty("x").value().toInt(), 66);
QCOMPARE(textNode.variantProperty("y").value().toInt(), 93);
ModelNode imageNode(rootModelNode.nodeListProperty("data").toModelNodeList().last());
QVERIFY(imageNode.isValid());
QCOMPARE(imageNode.id(), QLatin1String("image1"));
- QCOMPARE(imageNode.type(), QLatin1String("QtQuick/Image"));
+ QCOMPARE(imageNode.type(), QLatin1String("Qt/Image"));
QCOMPARE(imageNode.variantProperty("x").value().toInt(), 41);
QCOMPARE(imageNode.variantProperty("y").value().toInt(), 46);
QCOMPARE(imageNode.variantProperty("source").value().toUrl(), QUrl("images/qtcreator.png"));
@@ -7491,7 +7493,7 @@ void tst_TestCore::loadTestFiles()
textEdit.setPlainText(QString(file.readAll()));
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7503,12 +7505,12 @@ void tst_TestCore::loadTestFiles()
QVERIFY(model.data());
ModelNode rootModelNode(testRewriterView->rootModelNode());
QVERIFY(rootModelNode.isValid());
- QCOMPARE(rootModelNode.type(), QLatin1String("QtQuick/Rectangle"));
+ QCOMPARE(rootModelNode.type(), QLatin1String("Qt/Rectangle"));
QVERIFY(!rootModelNode.allDirectSubModelNodes().isEmpty());
}
}
-static QString rectWithGradient = "import QtQuick 1.0\n"
+static QString rectWithGradient = "import Qt 4.7\n"
"Rectangle {\n"
" gradient: Gradient {\n"
" id: pGradient\n"
@@ -7528,7 +7530,7 @@ void tst_TestCore::loadGradient()
textEdit.setPlainText(rectWithGradient);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7547,7 +7549,7 @@ void tst_TestCore::loadGradient()
QVERIFY(gradientProperty.isNodeProperty());
ModelNode gradientPropertyModelNode = gradientProperty.toNodeProperty().modelNode();
QVERIFY(gradientPropertyModelNode.isValid());
- QCOMPARE(gradientPropertyModelNode.type(), QString("QtQuick/Gradient"));
+ QCOMPARE(gradientPropertyModelNode.type(), QString("Qt/Gradient"));
QCOMPARE(gradientPropertyModelNode.allDirectSubModelNodes().size(), 2);
AbstractProperty stopsProperty = gradientPropertyModelNode.property("stops");
@@ -7560,7 +7562,7 @@ void tst_TestCore::loadGradient()
ModelNode pOne = stops.first();
ModelNode pTwo = stops.last();
- QCOMPARE(pOne.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(pOne.type(), QString("Qt/GradientStop"));
QCOMPARE(pOne.id(), QString("pOne"));
QCOMPARE(pOne.allDirectSubModelNodes().size(), 0);
QCOMPARE(pOne.propertyNames().size(), 2);
@@ -7569,7 +7571,7 @@ void tst_TestCore::loadGradient()
QCOMPARE(pOne.variantProperty("color").value().type(), QVariant::Color);
QCOMPARE(pOne.variantProperty("color").value().value<QColor>(), QColor("lightsteelblue"));
- QCOMPARE(pTwo.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(pTwo.type(), QString("Qt/GradientStop"));
QCOMPARE(pTwo.id(), QString("pTwo"));
QCOMPARE(pTwo.allDirectSubModelNodes().size(), 0);
QCOMPARE(pTwo.propertyNames().size(), 2);
@@ -7582,8 +7584,8 @@ void tst_TestCore::loadGradient()
{
ModelNode gradientNode = rootModelNode.allDirectSubModelNodes().last();
QVERIFY(gradientNode.isValid());
- QVERIFY(!gradientNode.metaInfo().isSubclassOf("QtQuick/Item", -1, -1));
- QCOMPARE(gradientNode.type(), QString("QtQuick/Gradient"));
+ QVERIFY(!gradientNode.metaInfo().isSubclassOf("Qt/Item", -1, -1));
+ QCOMPARE(gradientNode.type(), QString("Qt/Gradient"));
QCOMPARE(gradientNode.id(), QString("secondGradient"));
QCOMPARE(gradientNode.allDirectSubModelNodes().size(), 2);
@@ -7597,7 +7599,7 @@ void tst_TestCore::loadGradient()
ModelNode nOne = stops.first();
ModelNode nTwo = stops.last();
- QCOMPARE(nOne.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(nOne.type(), QString("Qt/GradientStop"));
QCOMPARE(nOne.id(), QString("nOne"));
QCOMPARE(nOne.allDirectSubModelNodes().size(), 0);
QCOMPARE(nOne.propertyNames().size(), 2);
@@ -7606,7 +7608,7 @@ void tst_TestCore::loadGradient()
QCOMPARE(nOne.variantProperty("color").value().type(), QVariant::Color);
QCOMPARE(nOne.variantProperty("color").value().value<QColor>(), QColor("blue"));
- QCOMPARE(nTwo.type(), QString("QtQuick/GradientStop"));
+ QCOMPARE(nTwo.type(), QString("Qt/GradientStop"));
QCOMPARE(nTwo.id(), QString("nTwo"));
QCOMPARE(nTwo.allDirectSubModelNodes().size(), 0);
QCOMPARE(nTwo.propertyNames().size(), 2);
@@ -7624,7 +7626,7 @@ void tst_TestCore::changeGradientId()
textEdit.setPlainText(rectWithGradient);
NotIndentingTextEditModifier textModifier(&textEdit);
- QScopedPointer<Model> model(Model::create("QtQuick/Item", 1, 0));
+ QScopedPointer<Model> model(Model::create("Qt/Item", 4, 7));
QVERIFY(model.data());
QScopedPointer<TestRewriterView> testRewriterView(new TestRewriterView());
@@ -7657,7 +7659,7 @@ void tst_TestCore::changeGradientId()
firstStop.destroy();
QVERIFY(!firstStop.isValid());
- ModelNode gradientStop = addNodeListChild(gradientNode, "QtQuick/GradientStop", 1, 0, "stops");
+ ModelNode gradientStop = addNodeListChild(gradientNode, "Qt/GradientStop", 4, 7, "stops");
gradientStop.variantProperty("position") = 0.5;
gradientStop.variantProperty("color") = QColor("yellow");
diff --git a/tests/auto/qml/qmldesigner/data/fx/attributes.qml b/tests/auto/qml/qmldesigner/data/fx/attributes.qml
index d58d77908b5c223dd2fd1ff9d2d7e034fbf847d6..e2d4ed37c412613b1cdbf693eb5f61121921ea37 100644
--- a/tests/auto/qml/qmldesigner/data/fx/attributes.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/attributes.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
id: id;
diff --git a/tests/auto/qml/qmldesigner/data/fx/empty.qml b/tests/auto/qml/qmldesigner/data/fx/empty.qml
index f6760b6a9fa35ce82f23e450b6ed3169b53740fb..dd9e9ea19308e2bb439e1a4c61b163d862753e97 100644
--- a/tests/auto/qml/qmldesigner/data/fx/empty.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/empty.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
}
diff --git a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
index d225c43630641a563d92442cbbf859c2f14f60f4..bc17ab1b27d85d324bb58526d268e504e7989654 100644
--- a/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/helloworld.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Rectangle {
width: 200
diff --git a/tests/auto/qml/qmldesigner/data/fx/properties.qml b/tests/auto/qml/qmldesigner/data/fx/properties.qml
index e9078ff8e76038dcb7b10337365dde2b0ef3dc71..12b79f63f8043b108a6cc17355e2ea628fc41070 100644
--- a/tests/auto/qml/qmldesigner/data/fx/properties.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/properties.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Item {
property bool pushed
diff --git a/tests/auto/qml/qmldesigner/data/fx/states.qml b/tests/auto/qml/qmldesigner/data/fx/states.qml
index 836e0ca0173bdcd8075910490908e3e619e97052..2e50ca9b7be4f11e7593d160b511ad461f54a3ce 100644
--- a/tests/auto/qml/qmldesigner/data/fx/states.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/states.qml
@@ -1,4 +1,4 @@
-import QtQuick 1.0
+import Qt 4.7
Rectangle {
id: rect
diff --git a/tests/auto/qml/qmldesigner/data/fx/topitem.qml b/tests/auto/qml/qmldesigner/data/fx/topitem.qml
index 84ef3c829c8f0ec359524f3e994e6ee0d1e2b840..244a7ac6f3e97c671c6000b9cbcdd37f3d45b115 100644
--- a/tests/auto/qml/qmldesigner/data/fx/topitem.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/topitem.qml
@@ -1,5 +1,5 @@
-import QtQuick 1.0
-import QtQuick 1.0 as Qt46
+import Qt 4.7
+import Qt 4.7 as Qt46
import "subitems"
import "subitems" as Subdir