forked from qt-creator/qt-creator
qbs build: Fix the names of some Qt modules in Depends items
It's "testlib", not "test". And "designercomponents" is actually a private module. Change-Id: I1a14d107bb5568b4f3807558ec6ed11937ac816a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
@@ -3,7 +3,7 @@ import qbs.FileInfo
|
|||||||
|
|
||||||
QtcProduct {
|
QtcProduct {
|
||||||
type: ["application", "autotest"]
|
type: ["application", "autotest"]
|
||||||
Depends { name: "Qt.test" }
|
Depends { name: "Qt.testlib" }
|
||||||
Depends { name: "copyable_resource" }
|
Depends { name: "copyable_resource" }
|
||||||
targetName: "tst_" + name.split(' ').join("")
|
targetName: "tst_" + name.split(' ').join("")
|
||||||
|
|
||||||
|
@@ -8,7 +8,7 @@ QtcProduct {
|
|||||||
useNonGuiPchFile: true
|
useNonGuiPchFile: true
|
||||||
Depends {
|
Depends {
|
||||||
condition: qtc.testsEnabled
|
condition: qtc.testsEnabled
|
||||||
name: "Qt.test"
|
name: "Qt.testlib"
|
||||||
}
|
}
|
||||||
|
|
||||||
targetName: QtcFunctions.qtLibraryName(qbs, name)
|
targetName: QtcFunctions.qtLibraryName(qbs, name)
|
||||||
|
@@ -22,7 +22,7 @@ QtcProduct {
|
|||||||
Depends { name: "pluginjson" }
|
Depends { name: "pluginjson" }
|
||||||
Depends {
|
Depends {
|
||||||
condition: qtc.testsEnabled
|
condition: qtc.testsEnabled
|
||||||
name: "Qt.test"
|
name: "Qt.testlib"
|
||||||
}
|
}
|
||||||
|
|
||||||
Properties {
|
Properties {
|
||||||
|
@@ -23,7 +23,7 @@ QtcPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Depends {
|
Depends {
|
||||||
name: "Qt.test"
|
name: "Qt.testlib"
|
||||||
condition: qtc.testsEnabled
|
condition: qtc.testsEnabled
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -6,7 +6,7 @@ CppApplication {
|
|||||||
targetName: "tst_benchtest"
|
targetName: "tst_benchtest"
|
||||||
|
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
Depends { name: "Qt.test" }
|
Depends { name: "Qt.testlib" }
|
||||||
|
|
||||||
files: [ "tst_benchtest.cpp" ]
|
files: [ "tst_benchtest.cpp" ]
|
||||||
|
|
||||||
|
@@ -5,7 +5,7 @@ CppApplication {
|
|||||||
name: "Dummy auto test"
|
name: "Dummy auto test"
|
||||||
targetName: "tst_FooBar"
|
targetName: "tst_FooBar"
|
||||||
|
|
||||||
Depends { name: "Qt.test" }
|
Depends { name: "Qt.testlib" }
|
||||||
Depends { name: "Qt.gui" }
|
Depends { name: "Qt.gui" }
|
||||||
|
|
||||||
files: [ "tst_foo.cpp", "tst_foo.h" ]
|
files: [ "tst_foo.cpp", "tst_foo.h" ]
|
||||||
|
@@ -4,7 +4,7 @@ CppApplication {
|
|||||||
type: "application" // suppress bundle generation on OSX
|
type: "application" // suppress bundle generation on OSX
|
||||||
|
|
||||||
Depends { name: "Qt.gui" }
|
Depends { name: "Qt.gui" }
|
||||||
Depends { name: "Qt.test" }
|
Depends { name: "Qt.testlib" }
|
||||||
|
|
||||||
files: [ "tst_simple.cpp", "tst_simple.h" ]
|
files: [ "tst_simple.cpp", "tst_simple.h" ]
|
||||||
}
|
}
|
||||||
|
@@ -21,12 +21,6 @@ Project {
|
|||||||
Depends { name: "QtSupport" }
|
Depends { name: "QtSupport" }
|
||||||
Depends { name: "TextEditor" }
|
Depends { name: "TextEditor" }
|
||||||
|
|
||||||
|
|
||||||
Depends {
|
|
||||||
name: "Qt.test"
|
|
||||||
condition: qtc.testsEnabled
|
|
||||||
}
|
|
||||||
|
|
||||||
pluginTestDepends: [
|
pluginTestDepends: [
|
||||||
"QmakeProjectManager"
|
"QmakeProjectManager"
|
||||||
]
|
]
|
||||||
|
@@ -4,7 +4,10 @@ import qbs.FileInfo
|
|||||||
QtcPlugin {
|
QtcPlugin {
|
||||||
name: "Designer"
|
name: "Designer"
|
||||||
|
|
||||||
Depends { name: "Qt"; submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents"] }
|
Depends {
|
||||||
|
name: "Qt"
|
||||||
|
submodules: ["widgets", "xml", "printsupport", "designer", "designercomponents-private"]
|
||||||
|
}
|
||||||
Depends { name: "CPlusPlus" }
|
Depends { name: "CPlusPlus" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user