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

Fix qbs build.

Browse Source 
Change-Id: I18669823c5bd06e288e24afd4925a38ca8480095
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
Nikolai Kosjar
2012-10-08 12:24:13 +02:00
committed by Christian Kandeler
parent 30acba5931
commit 3e773824bd
2 changed files with 82 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

113
share/share.qbs
View File

@@ -337,6 +337,8 @@ Product {
"createinstancescommand.h",
"createscenecommand.cpp",
"createscenecommand.h",
"endpuppetcommand.cpp",
"endpuppetcommand.h",
"informationchangedcommand.cpp",
"informationchangedcommand.h",
"pixmapchangedcommand.cpp",
@@ -345,6 +347,8 @@ Product {
"removeinstancescommand.h",
"removepropertiescommand.cpp",
"removepropertiescommand.h",
"removesharedmemorycommand.cpp",
"removesharedmemorycommand.h",
"reparentinstancescommand.cpp",
"reparentinstancescommand.h",
"statepreviewimagechangedcommand.cpp",
@@ -405,40 +409,13 @@ Product {
}
Group {
qbs.installDir: "share/qtcreator/qml/qmlpuppet/qmlpuppet/instances"
qbs.installDir: "share/qtcreator/qml/qmlpuppet/instances"
fileTags: ["install"]
prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/instances/"
prefix: "qtcreator/qml/qmlpuppet/instances/"
files: [
"anchorchangesnodeinstance.cpp",
"anchorchangesnodeinstance.h",
"behaviornodeinstance.cpp",
"behaviornodeinstance.h",
"childrenchangeeventfilter.cpp",
"childrenchangeeventfilter.h",
"componentnodeinstance.cpp",
"componentnodeinstance.h",
"dummycontextobject.cpp",
"dummycontextobject.h",
"dummynodeinstance.cpp",
"dummynodeinstance.h",
"instances.pri",
"nodeinstanceclientproxy.cpp",
"nodeinstanceclientproxy.h",
"nodeinstancemetaobject.cpp",
"nodeinstancemetaobject.h",
"nodeinstanceserver.cpp",
"nodeinstanceserver.h",
"nodeinstancesignalspy.cpp",
"nodeinstancesignalspy.h",
"objectnodeinstance.cpp",
"objectnodeinstance.h",
"qmlpropertychangesnodeinstance.cpp",
"qmlpropertychangesnodeinstance.h",
"qmlstatenodeinstance.cpp",
"qmlstatenodeinstance.h",
"qmltransitionnodeinstance.cpp",
"qmltransitionnodeinstance.h",
"servernodeinstance.cpp",
"servernodeinstance.h",
]
}
@@ -461,6 +438,7 @@ Product {
prefix: "qtcreator/qml/qmlpuppet/qml2puppet/"
files: [
"main.cpp",
"qml2puppet.pri",
"qml2puppet.pro",
]
}
@@ -470,7 +448,35 @@ Product {
fileTags: ["install"]
prefix: "qtcreator/qml/qmlpuppet/qml2puppet/instances/"
files: [
"anchorchangesnodeinstance.cpp",
"anchorchangesnodeinstance.h",
"behaviornodeinstance.cpp",
"behaviornodeinstance.h",
"childrenchangeeventfilter.cpp",
"childrenchangeeventfilter.h",
"componentnodeinstance.cpp",
"componentnodeinstance.h",
"dummycontextobject.cpp",
"dummycontextobject.h",
"dummynodeinstance.cpp",
"dummynodeinstance.h",
"instances.pri",
"nodeinstancemetaobject.cpp",
"nodeinstancemetaobject.h",
"nodeinstanceserver.cpp",
"nodeinstanceserver.h",
"nodeinstancesignalspy.cpp",
"nodeinstancesignalspy.h",
"objectnodeinstance.cpp",
"objectnodeinstance.h",
"positionernodeinstance.cpp",
"positionernodeinstance.h",
"qmlpropertychangesnodeinstance.cpp",
"qmlpropertychangesnodeinstance.h",
"qmlstatenodeinstance.cpp",
"qmlstatenodeinstance.h",
"qmltransitionnodeinstance.cpp",
"qmltransitionnodeinstance.h",
"qt5informationnodeinstanceserver.cpp",
"qt5informationnodeinstanceserver.h",
"qt5nodeinstanceclientproxy.cpp",
@@ -481,8 +487,10 @@ Product {
"qt5previewnodeinstanceserver.h",
"qt5rendernodeinstanceserver.cpp",
"qt5rendernodeinstanceserver.h",
"sgitemnodeinstance.cpp",
"sgitemnodeinstance.h",
"quickitemnodeinstance.cpp",
"quickitemnodeinstance.h",
"servernodeinstance.cpp",
"servernodeinstance.h",
]
}
@@ -502,13 +510,40 @@ Product {
fileTags: ["install"]
prefix: "qtcreator/qml/qmlpuppet/qmlpuppet/instances/"
files: [
".instances.pri.swp",
"anchorchangesnodeinstance.cpp",
"anchorchangesnodeinstance.h",
"behaviornodeinstance.cpp",
"behaviornodeinstance.h",
"childrenchangeeventfilter.cpp",
"childrenchangeeventfilter.h",
"componentnodeinstance.cpp",
"componentnodeinstance.h",
"dummycontextobject.cpp",
"dummycontextobject.h",
"dummynodeinstance.cpp",
"dummynodeinstance.h",
"graphicsobjectnodeinstance.cpp",
"graphicsobjectnodeinstance.h",
"instances.pri",
"nodeinstancemetaobject.cpp",
"nodeinstancemetaobject.h",
"nodeinstanceserver.cpp",
"nodeinstanceserver.h",
"nodeinstancesignalspy.cpp",
"nodeinstancesignalspy.h",
"objectnodeinstance.cpp",
"objectnodeinstance.h",
"positionernodeinstance.cpp",
"positionernodeinstance.h",
"qmlgraphicsitemnodeinstance.cpp",
"qmlgraphicsitemnodeinstance.h",
"qmlpropertychangesnodeinstance.cpp",
"qmlpropertychangesnodeinstance.h",
"qmlstatenodeinstance.cpp",
"qmlstatenodeinstance.h",
"qmltransitionnodeinstance.cpp",
"qmltransitionnodeinstance.h",
"qt4informationnodeinstanceserver.cpp",
"qt4informationnodeinstanceserver.h",
"qt4nodeinstanceclientproxy.cpp",
@@ -519,6 +554,8 @@ Product {
"qt4previewnodeinstanceserver.h",
"qt4rendernodeinstanceserver.cpp",
"qt4rendernodeinstanceserver.h",
"servernodeinstance.cpp",
"servernodeinstance.h",
]
}
@@ -1070,6 +1107,17 @@ Product {
]
}
Group {
qbs.installDir: "share/qtcreator/templates/wizards/codesnippet"
fileTags: ["install"]
prefix: "qtcreator/templates/wizards/codesnippet/"
files: [
"main.cpp",
"project.pro",
"wizard.xml",
]
}
Group {
qbs.installDir: "share/qtcreator/templates/wizards/helloworld"
fileTags: ["install"]
@@ -1223,7 +1271,6 @@ Product {
"CustomTab.qml",
"CustomizedGridView.qml",
"Delegate.qml",
"Feedback.qml",
"GettingStartedItem.qml",
"IconAndLink.qml",
"LinkedText.qml",

3
src/plugins/qmljstools/qmljstools.qbs
View File

@@ -67,9 +67,10 @@ QtcPlugin {
"qmlconsoleitemdelegate.h",
"qmlconsoleedit.cpp",
"qmlconsoleedit.h",
"qmlconsoleproxymodel.cpp",
"qmlconsoleproxymodel.h",
"qmljsinterpreter.cpp",
"qmljsinterpreter.h",
"qmljsconsoleproxymodel.h",
"qmljstools.qrc"
]