From 64839753f21771efd9afceb204ca81ae6c47d7b8 Mon Sep 17 00:00:00 2001
From: Alexis Menard <alexis.menard@nokia.com>
Date: Fri, 18 Jun 2010 15:46:31 +0200
Subject: [PATCH] QML WebKit component is now named QtWebKit
Reviewed-by:Christiaan Janssen
---
.../designercore/instances/nodeinstance.cpp | 2 +-
.../designercore/metainfo/metainfo.cpp | 2 +-
src/plugins/qmldesigner/fxplugin/fx.metainfo | 2 +-
src/tools/qml/qmldump/main.cpp | 2 +-
.../qml/qmldesigner/coretests/testcore.cpp | 18 +++++++++---------
tests/auto/qml/qmldesigner/data/fx/imports.qml | 2 +-
tests/manual/qml/testfiles/webview.qml | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
index c2aa8218936..3c95bff3396 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
@@ -134,7 +134,7 @@ Internal::ObjectNodeInstance::Pointer NodeInstance::createInstance(const NodeMet
if (!metaInfo.isValid())
instance = Internal::DummyNodeInstance::create();
- else if (metaInfo.isSubclassOf("org.webkit/WebView", 1, 0))
+ else if (metaInfo.isSubclassOf("QtWebKit/WebView", 1, 0))
instance = Internal::DummyNodeInstance::create();
else if (metaInfo.isSubclassOf("Qt/QWidget", 4, 7))
instance = Internal::DummyNodeInstance::create();
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
index 9bc25d65c82..79a9739770f 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainfo.cpp
@@ -130,7 +130,7 @@ void MetaInfoPrivate::loadPlugins(QDeclarativeEngine *engine)
QStringList pluginList;
pluginList += "import Qt 4.7";
- pluginList += "import org.webkit 1.0";
+ pluginList += "import QtWebKit 1.0";
// load maybe useful plugins
pluginList += "import Qt.labs.folderlistmodel 1.0";
diff --git a/src/plugins/qmldesigner/fxplugin/fx.metainfo b/src/plugins/qmldesigner/fxplugin/fx.metainfo
index f994480be04..4bca726911f 100644
--- a/src/plugins/qmldesigner/fxplugin/fx.metainfo
+++ b/src/plugins/qmldesigner/fxplugin/fx.metainfo
@@ -111,7 +111,7 @@
</itemlibraryentry>
</node>
- <node name="org.webkit/WebView" icon=":/fxplugin/images/webview-icon16.png">
+ <node name="QtWebKit/WebView" icon=":/fxplugin/images/webview-icon16.png">
<propertyDefaultValue name="width" type="int" defaultValue="300"/>
<propertyDefaultValue name="height" type="int" defaultValue="300"/>
<itemlibraryentry name="Web View" category="Qt - Widgets" icon=":/fxplugin/images/webview-icon.png">
diff --git a/src/tools/qml/qmldump/main.cpp b/src/tools/qml/qmldump/main.cpp
index b21dbe0d88a..34271bc63bf 100644
--- a/src/tools/qml/qmldump/main.cpp
+++ b/src/tools/qml/qmldump/main.cpp
@@ -260,7 +260,7 @@ int main(int argc, char *argv[])
code += "import Qt.labs.particles 4.7;\n";
code += "import Qt.labs.gestures 4.7;\n";
code += "import Qt.labs.folderlistmodel 4.7;\n";
- code += "import org.webkit 1.0;\n";
+ code += "import QtWebKit 1.0;\n";
code += "Item {}";
QDeclarativeComponent c(engine);
c.setData(code, QUrl("xxx"));
diff --git a/tests/auto/qml/qmldesigner/coretests/testcore.cpp b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
index 8ff2caba1bc..bf8ca7fd750 100644
--- a/tests/auto/qml/qmldesigner/coretests/testcore.cpp
+++ b/tests/auto/qml/qmldesigner/coretests/testcore.cpp
@@ -803,10 +803,10 @@ void TestCore::testRewriterImports()
QVERIFY(!import.hasVersion());
QVERIFY(!import.hasAlias());
- // import org.webkit 1.0 as Web
+ // import QtWebKit 1.0 as Web
import = model->imports().at(2);
QVERIFY(import.isLibraryImport());
- QCOMPARE(import.url(), QString("org.webkit"));
+ QCOMPARE(import.url(), QString("QtWebKit"));
QVERIFY(import.hasVersion());
QCOMPARE(import.version(), QString("1.0"));
QVERIFY(import.hasAlias());
@@ -835,12 +835,12 @@ void TestCore::testRewriterChangeImports()
//
// Add / Remove an import in the model
//
- Import webkitImport = Import::createLibraryImport("org.webkit", "1.0");
+ Import webkitImport = Import::createLibraryImport("QtWebKit", "1.0");
model->addImport(webkitImport);
const QLatin1String qmlWithImport("\n"
"import Qt 4.7\n"
- "import org.webkit 1.0\n"
+ "import QtWebKit 1.0\n"
"\n"
"Rectangle {}\n");
QCOMPARE(textEdit.toPlainText(), qmlWithImport);
@@ -856,12 +856,12 @@ void TestCore::testRewriterChangeImports()
//
// Add / Remove an import in the model (with alias)
//
- webkitImport = Import::createLibraryImport("org.webkit", "1.0", "Web");
+ webkitImport = Import::createLibraryImport("QtWebKit", "1.0", "Web");
model->addImport(webkitImport);
const QLatin1String qmlWithAliasImport("\n"
"import Qt 4.7\n"
- "import org.webkit 1.0 as Web\n"
+ "import QtWebKit 1.0 as Web\n"
"\n"
"Rectangle {}\n");
QCOMPARE(textEdit.toPlainText(), qmlWithAliasImport);
@@ -880,12 +880,12 @@ void TestCore::testRewriterChangeImports()
textEdit.setPlainText(qmlWithImport);
QCOMPARE(model->imports().size(), 2);
QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
- QCOMPARE(model->imports().last(), Import::createLibraryImport("org.webkit", "1.0"));
+ QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0"));
textEdit.setPlainText(qmlWithAliasImport);
QCOMPARE(model->imports().size(), 2);
QCOMPARE(model->imports().first(), Import::createLibraryImport("Qt", "4.7"));
- QCOMPARE(model->imports().last(), Import::createLibraryImport("org.webkit", "1.0", "Web"));
+ QCOMPARE(model->imports().last(), Import::createLibraryImport("QtWebKit", "1.0", "Web"));
textEdit.setPlainText(qmlString);
QCOMPARE(model->imports().size(), 1);
@@ -3709,7 +3709,7 @@ void TestCore::testMetaInfo()
QVERIFY(model->metaInfo().hasNodeMetaInfo("Qt/Item", 4, 7));
// test whether types from plugins are registered
- QVERIFY(model->metaInfo().hasNodeMetaInfo("org.webkit/WebView", 1, 0));
+ QVERIFY(model->metaInfo().hasNodeMetaInfo("QtWebKit/WebView", 1, 0));
// test whether non-qml type is registered
QVERIFY(model->metaInfo().hasNodeMetaInfo("QGraphicsObject", 4, 7)); // Qt 4.7 namespace
diff --git a/tests/auto/qml/qmldesigner/data/fx/imports.qml b/tests/auto/qml/qmldesigner/data/fx/imports.qml
index 0c528046e0f..5331e595ba7 100644
--- a/tests/auto/qml/qmldesigner/data/fx/imports.qml
+++ b/tests/auto/qml/qmldesigner/data/fx/imports.qml
@@ -1,6 +1,6 @@
import Qt 4.7
import "subitems"
-import org.webkit 1.0 as Web
+import QtWebKit 1.0 as Web
Rectangle {
}
diff --git a/tests/manual/qml/testfiles/webview.qml b/tests/manual/qml/testfiles/webview.qml
index b841d9f94b7..46fd1b34db9 100644
--- a/tests/manual/qml/testfiles/webview.qml
+++ b/tests/manual/qml/testfiles/webview.qml
@@ -1,4 +1,4 @@
-import org.webkit 1.0
+import QtWebKit 1.0
// Test loading of import libraries
WebView {
--
GitLab