forked from qt-creator/qt-creator
rename ProductModule into Export
This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
This commit is contained in:
committed by
Christian Kandeler
parent
bc74d936b2
commit
3eba7e44e5
@@ -132,7 +132,7 @@ Project {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: product.buildDirectory
|
cpp.includePaths: product.buildDirectory
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ DynamicLibrary {
|
|||||||
}
|
}
|
||||||
cpp.includePaths: [ ".", ".." ]
|
cpp.includePaths: [ ".", ".." ]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: [ "." ]
|
cpp.includePaths: [ "." ]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -168,7 +168,7 @@ QtcLibrary {
|
|||||||
"images/var_prot.png",
|
"images/var_prot.png",
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: [
|
cpp.includePaths: [
|
||||||
".",
|
".",
|
||||||
|
|||||||
@@ -107,7 +107,7 @@ QtcLibrary {
|
|||||||
"iscriptevaluator.h"
|
"iscriptevaluator.h"
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
Depends { name: "LanguageUtils" }
|
Depends { name: "LanguageUtils" }
|
||||||
cpp.defines: [
|
cpp.defines: [
|
||||||
|
|||||||
@@ -114,7 +114,7 @@ QtcLibrary {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "Qt"; submodules: ["widgets", "network"] }
|
Depends { name: "Qt"; submodules: ["widgets", "network"] }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -211,8 +211,8 @@ QtcLibrary {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
// ### [ remove, once qbs supports merging of ProductModule items in derived products
|
// ### [ remove, once qbs supports merging of Export items in derived products
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: [ ".." ]
|
cpp.includePaths: [ ".." ]
|
||||||
// ### ]
|
// ### ]
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ Product {
|
|||||||
qbs.installDir: "lib/qtcreator/plugins/" + provider
|
qbs.installDir: "lib/qtcreator/plugins/" + provider
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "ExtensionSystem" }
|
Depends { name: "ExtensionSystem" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ QtcPlugin {
|
|||||||
"images/analyzer_start_small.png",
|
"images/analyzer_start_small.png",
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "CPlusPlus" }
|
Depends { name: "CPlusPlus" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -251,7 +251,7 @@ QtcPlugin {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
Depends { name: "Aggregation" }
|
Depends { name: "Aggregation" }
|
||||||
Depends { name: "Utils" }
|
Depends { name: "Utils" }
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ QtcPlugin {
|
|||||||
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
|
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "CPlusPlus" }
|
Depends { name: "CPlusPlus" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -292,7 +292,7 @@ QtcPlugin {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
Depends { name: "QtcSsh" }
|
Depends { name: "QtcSsh" }
|
||||||
cpp.includePaths: ["."]
|
cpp.includePaths: ["."]
|
||||||
|
|||||||
@@ -345,7 +345,7 @@ QtcPlugin {
|
|||||||
files: ["outputparser_test.h", "outputparser_test.cpp"]
|
files: ["outputparser_test.h", "outputparser_test.cpp"]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "Qt.network" }
|
Depends { name: "Qt.network" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,7 +88,7 @@ QtcPlugin {
|
|||||||
"images/qmlfile.png",
|
"images/qmlfile.png",
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "QmlJSTools" }
|
Depends { name: "QmlJSTools" }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -78,7 +78,7 @@ QtcPlugin {
|
|||||||
files: ["qmljstools_test.cpp"]
|
files: ["qmljstools_test.cpp"]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "CppTools" }
|
Depends { name: "CppTools" }
|
||||||
Depends { name: "QmlDebug" }
|
Depends { name: "QmlDebug" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,7 +100,7 @@ QtcPlugin {
|
|||||||
"showbuildlog.ui",
|
"showbuildlog.ui",
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "cpp" }
|
Depends { name: "cpp" }
|
||||||
cpp.includePaths: "../../shared"
|
cpp.includePaths: "../../shared"
|
||||||
cpp.defines: [
|
cpp.defines: [
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ QtcPlugin {
|
|||||||
"images/embeddedtarget.png",
|
"images/embeddedtarget.png",
|
||||||
]
|
]
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "Core" }
|
Depends { name: "Core" }
|
||||||
Depends { name: "QtcSsh" }
|
Depends { name: "QtcSsh" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -267,7 +267,7 @@ QtcPlugin {
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
||||||
ProductModule {
|
Export {
|
||||||
Depends { name: "Find" }
|
Depends { name: "Find" }
|
||||||
Depends { name: "Locator" }
|
Depends { name: "Locator" }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user