From 2557e0f39de79d7f48e1a7401271acf666f0350f Mon Sep 17 00:00:00 2001 From: Marco Bubke Date: Thu, 18 Apr 2013 13:57:44 +0200 Subject: [PATCH 1/2] QmlDesigner: Remove override from non virtual function Change-Id: I8d0b782df5e0819d7f20c2294aa4be9b017a6cb9 Reviewed-by: Thomas Hartmann --- .../qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h index 31d2a1fdfa9..90f5405b97c 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h @@ -73,7 +73,7 @@ public: bool hasContent() const Q_DECL_OVERRIDE; QList childItems() const Q_DECL_OVERRIDE; - QList childItemsForChild(QQuickItem *childItem) const Q_DECL_OVERRIDE; + QList childItemsForChild(QQuickItem *childItem) const; bool isMovable() const Q_DECL_OVERRIDE; From 7dc52d1a5497c29757e833914a90dfa25645a0cc Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 18 Apr 2013 14:15:06 +0200 Subject: [PATCH 2/2] Fix module name capitalization in pluginspec.qbs. Change-Id: I66ca1ad22f8a857582e6d3fdb0bf2dfc8334628a Reviewed-by: Joerg Bornemann --- qbs/pluginspec/pluginspec.qbs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index a528821baf5..5ce3f077a90 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -60,7 +60,7 @@ Module { Artifact { fileTags: ["qt_plugin_metadata"] fileName: { - var destdir = FileInfo.joinPaths(product.moduleProperty("qt/core", "generatedFilesDir"), + var destdir = FileInfo.joinPaths(product.moduleProperty("Qt/core", "generatedFilesDir"), input.fileName); return destdir.replace(/\.[^\.]*$/, '.json'); } @@ -68,7 +68,7 @@ Module { prepare: { var xslFile = project.path + "/src/pluginjsonmetadata.xsl"; - var xmlPatternsPath = product.moduleProperty("qt/core", "binPath") + "/xmlpatterns"; + var xmlPatternsPath = product.moduleProperty("Qt/core", "binPath") + "/xmlpatterns"; var args = [ "-no-format", "-output",