feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/2.7'

Browse Source
This commit is contained in:
Oswald Buddenhagen
2013-04-18 15:18:34 +02:00
parent 72e0ded3c4 7dc52d1a54
commit d77883c16a
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qbs/pluginspec/pluginspec.qbs
View File

@@ -81,7 +81,7 @@ Module {
Artifact { Artifact {
fileTags: ["qt_plugin_metadata"] fileTags: ["qt_plugin_metadata"]
fileName: { fileName: {
var destdir = FileInfo.joinPaths(product.moduleProperty("qt/core", "generatedFilesDir"), var destdir = FileInfo.joinPaths(product.moduleProperty("Qt/core", "generatedFilesDir"),
input.fileName); input.fileName);
return destdir.replace(/\.[^\.]*$/, '.json'); return destdir.replace(/\.[^\.]*$/, '.json');
} }
@@ -89,7 +89,7 @@ Module {
prepare: { prepare: {
var xslFile = project.path + "/src/pluginjsonmetadata.xsl"; 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 = [ var args = [
"-no-format", "-no-format",
"-output", "-output",

2
share/qtcreator/qml/qmlpuppet/qml2puppet/instances/quickwindownodeinstance.h
View File

@@ -73,7 +73,7 @@ public:
bool hasContent() const Q_DECL_OVERRIDE; bool hasContent() const Q_DECL_OVERRIDE;
QList<ServerNodeInstance> childItems() 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; bool isMovable() const Q_DECL_OVERRIDE;