diff options
| -rw-r--r-- | qbs/pluginspec/pluginspec.qbs | 4 | ||||
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/qbs/pluginspec/pluginspec.qbs b/qbs/pluginspec/pluginspec.qbs index 3a6297f7774..2922ce40eae 100644 --- a/qbs/pluginspec/pluginspec.qbs +++ b/qbs/pluginspec/pluginspec.qbs @@ -81,7 +81,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'); } @@ -89,7 +89,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", 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<ServerNodeInstance> childItems() const Q_DECL_OVERRIDE; - QList<ServerNodeInstance> childItemsForChild(QQuickItem *childItem) const Q_DECL_OVERRIDE; + QList<ServerNodeInstance> childItemsForChild(QQuickItem *childItem) const; bool isMovable() const Q_DECL_OVERRIDE; |