From af0304ca8efe94380af13e252636e5c2290a4d83 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Date: Mon, 19 Apr 2010 16:06:06 +0200
Subject: [PATCH] QmlDesigner.propertyEditor: avoid warnings

---
 .../qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml  | 2 +-
 share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml    | 2 +-
 .../qmldesigner/components/propertyeditor/propertyeditor.cpp    | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
index 28ba8bb6be8..314afc2745d 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
@@ -67,7 +67,7 @@ GroupBox {
                 SliderWidget {
                     id: scaleSlider;
                     backendValue: backendValues.scale;
-                    property var pureValue: backendValues.scale.value;
+                    property variant pureValue: backendValues.scale.value;
                     onPureValueChanged: {
                         if (value != pureValue * 100)
                             value = pureValue * 100;
diff --git a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
index 45fea9f6dfb..4e1c6303a2c 100644
--- a/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
+++ b/share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
@@ -52,7 +52,7 @@ GroupBox {
                     id: opacitySlider
                     minimum: 0
                     maximum: 100
-                    property var pureValue: backendValues.opacity.value;
+                    property variant pureValue: backendValues.opacity.value;
                     onPureValueChanged: {
                         if (value != pureValue * 100)
                             value = pureValue * 100;
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index ecd9183dc82..cd23ccf1bc5 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -245,6 +245,8 @@ void PropertyEditor::NodeType::initialSetup(const QString &typeName, const QUrl
     ctxt->setContextProperty("specificsUrl", QVariant(qmlSpecificsFile));
     ctxt->setContextProperty("stateName", QVariant(QLatin1String("basestate")));
     ctxt->setContextProperty("isBaseState", QVariant(true));
+    ctxt->setContextProperty("specificQmlData", QVariant(QLatin1String("")));
+    ctxt->setContextProperty("globalBaseUrl", QVariant(QUrl()));
 }
 
 PropertyEditor::PropertyEditor(QWidget *parent) :