diff options
author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-27 10:50:54 +0200 |
---|---|---|
committer | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2012-09-27 11:19:39 +0200 |
commit | d246abe6773baa7821d94c985957c3385eecd110 (patch) | |
tree | a5dcae71d710af14fd704619aa25a89f1c2c4cea | |
parent | 28f8bf07cccf4b82a9609795db416f98bdfb4e58 (diff) |
QmlDesigner: use import QtQuick 1.0 and not Qt 4.7
Qt5 warns about import Qt 4.7
Change-Id: I1561f957637945d4bc61fb90abd8d0a60599133f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
75 files changed, 75 insertions, 75 deletions
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml index 3ea3783950..f4d393ddc1 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml index 28897aea41..1f8cfe4aab 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml index 3ac8b94dfd..1d2b681d62 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml index 7c38be3bc4..879715b00a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml index 0aa9ed11f6..fb47039d53 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml index 7d049be701..8592a97d86 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { //This is a special checkBox that does color coding for states diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml index 18e01c6f66..efdbdcbaa3 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QExtGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml index ef2d785e39..95ccbd9777 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QLabel { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml index 2d72667dd8..72af55214f 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 Item { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml index 4747659f3d..d0cd5b259e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml index df021b5438..e61a2f8365 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml index 57aae5ee3e..f9bada2a3e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { //This is a special doubleSpinBox that does color coding for states diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml index bb3b8a3246..2ba94bb7d2 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { //This is a special doubleSpinBox that does color coding for states diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml index 84def1230f..7407537d72 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml index 1c0ee8be0b..55ef709e50 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml index 97b7c03170..126fda1d6e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 AnimatedToolButton { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml index ded59e67df..3f95e107f7 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QScrollArea { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml index 866b43f21d..615b754bdd 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QFrame { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml index cde0c25847..433e4ed664 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QPushButton { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml index 9dc5762bd3..90a0c41458 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml index 66c5e11c6d..7037d14383 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml index daf5adb211..a51f1d4398 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml index 65f503b35f..c34a53e1e9 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FlowSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml index 73d052e737..8b8c3139e2 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml index eb475a7190..a5f4641c82 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml index 60cdd3cb4e..f070b2dfd1 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml index 456a0b42c6..cb7060fef5 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml index 63f60a0d00..e438ab1371 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml index caf7d32740..93717db920 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GridViewSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml index bccc5be9d2..154f704517 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QExtGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml index 234c6dfa80..68956af80c 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QExtGroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml index 85db67f704..c51ccb45fe 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QHBoxLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml index 182283e996..4d1017dc1e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QLineEdit { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml index 47984923d9..333ecbfb20 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml index 1305236026..f2c0a6367a 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml index 87bb18fe46..4f68fbf19d 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 PropertyFrame { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml index 10d6966ef2..d7357063af 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QLabel { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml index 68beea3209..ee29971aa7 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml index 6895c6625d..d8a50b68b6 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QScrollArea { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml index 6591c34141..2c7f5d6e45 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml index ba62aa18ef..9cd5bb7103 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml index 3ee05c8218..84610be744 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml index dedcea9b98..bd2cf58747 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/MouseAreaSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml index 5967a6074c..ba11dbd74d 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PathViewSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml index ab730dc4a5..43f5d4a86b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml index 2dc4e0c76c..347e28ffc5 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 WidgetFrame { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml index 727d48783c..7c9c19ac31 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml index 4b498002c5..d9ea3370ae 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml index 22d3da269f..e7fdce89ff 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml index 0b3fe2e806..715a47a0f1 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml index 373558f808..825cf9374e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml index ea2c500056..2b0347a49b 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { //This is a special spinBox that does color coding for states diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml index 6ed92957df..cb78f7d44e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml index c67af2b3d0..e854363152 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml index e114ac3d7b..136f751a93 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QFrame { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml index 19790bc5ca..a930d460b8 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml index fd89d35569..dc18fc84b5 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditor.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml index 5422869881..85f8dc9e18 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml index e313397644..a023d3a029 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml index ca5dcb4dd4..b8232140ac 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QWidget { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml index 26a6ea6f5b..b70efb321e 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml index 4bf8ce0d6e..20261ceadf 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml index 825ece05d1..891d5cb11d 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 QVBoxLayout { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml index b848e1fb28..79b00442c7 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 GroupBox { diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml index a42d4ed507..557123a4d0 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 PropertyFrame { diff --git a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml index 27b87143b8..9384712cca 100644 --- a/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml +++ b/share/qtcreator/qmldesigner/propertyeditor/QtWebKit/WebViewSpecifics.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 import Bauhaus 1.0 import "../Qt/" diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml index 8fe77e41fa..a03ac687af 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemView.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 // view displaying an item library grid item diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml index f960860dae..b691a8133d 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsView.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 /* The view displaying the item grid. diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml index 679a65ace2..4dfb36549e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/ItemsViewStyle.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 // the style used the items view diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml index a505303915..1a7d69c7da 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 // scrollbar for the items view diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml index 7bb5fb65e6..c066ea728c 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 // view displaying one item library section including its grid diff --git a/src/plugins/qmldesigner/components/itemlibrary/qml/Selector.qml b/src/plugins/qmldesigner/components/itemlibrary/qml/Selector.qml index 0bd4a0b131..cd2b586ae2 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/qml/Selector.qml +++ b/src/plugins/qmldesigner/components/itemlibrary/qml/Selector.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 // the coloured selector of the items view diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp index e926ab1e69..275506ff7f 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp @@ -625,7 +625,7 @@ void PropertyEditor::timerEvent(QTimerEvent *timerEvent) QString templateGeneration(NodeMetaInfo type, NodeMetaInfo superType, const QmlObjectNode &objectNode) { - QString qmlTemplate = QLatin1String("import Qt 4.7\nimport Bauhaus 1.0\n"); + QString qmlTemplate = QLatin1String("import QtQuick 1.0\nimport Bauhaus 1.0\n"); qmlTemplate += QLatin1String("GroupBox {\n"); qmlTemplate += QString(QLatin1String("caption: \"%1\"\n")).arg(objectNode.modelNode().simplifiedTypeName()); qmlTemplate += QLatin1String("layout: VerticalLayout {\n"); diff --git a/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml b/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml index 02bf9dbbca..6116d68571 100644 --- a/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml +++ b/src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Item { property variant flickable: this; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml index d61f91b0b1..6a080ec36b 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml +++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml @@ -28,7 +28,7 @@ ** **************************************************************************/ -import Qt 4.7 +import QtQuick 1.0 Rectangle { id: root |