From 3eba7e44e5205191075a32ec2c3de3a2f1569b4f Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@digia.com>
Date: Fri, 24 May 2013 15:58:33 +0200
Subject: [PATCH] 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>
---
qtcreator.qbs | 2 +-
src/libs/QtcLibrary.qbs | 2 +-
src/libs/cplusplus/cplusplus.qbs | 2 +-
src/libs/qmljs/qmljs.qbs | 2 +-
src/libs/ssh/ssh.qbs | 2 +-
src/libs/utils/utils.qbs | 4 ++--
src/plugins/QtcPlugin.qbs | 2 +-
src/plugins/analyzerbase/analyzerbase.qbs | 2 +-
src/plugins/coreplugin/coreplugin.qbs | 2 +-
src/plugins/cpptools/cpptools.qbs | 2 +-
src/plugins/debugger/debugger.qbs | 2 +-
src/plugins/projectexplorer/projectexplorer.qbs | 2 +-
src/plugins/qmljseditor/qmljseditor.qbs | 2 +-
src/plugins/qmljstools/qmljstools.qbs | 2 +-
src/plugins/qtsupport/qtsupport.qbs | 2 +-
src/plugins/remotelinux/remotelinux.qbs | 2 +-
src/plugins/texteditor/texteditor.qbs | 2 +-
17 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/qtcreator.qbs b/qtcreator.qbs
index 80a1f5f9021..945335d218e 100644
--- a/qtcreator.qbs
+++ b/qtcreator.qbs
@@ -132,7 +132,7 @@ Project {
}
}
- ProductModule {
+ Export {
Depends { name: "cpp" }
cpp.includePaths: product.buildDirectory
}
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs
index 3672957743b..80056e520c5 100644
--- a/src/libs/QtcLibrary.qbs
+++ b/src/libs/QtcLibrary.qbs
@@ -15,7 +15,7 @@ DynamicLibrary {
}
cpp.includePaths: [ ".", ".." ]
- ProductModule {
+ Export {
Depends { name: "cpp" }
cpp.includePaths: [ "." ]
}
diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs
index 08213f11d60..7b52710a34d 100644
--- a/src/libs/cplusplus/cplusplus.qbs
+++ b/src/libs/cplusplus/cplusplus.qbs
@@ -168,7 +168,7 @@ QtcLibrary {
"images/var_prot.png",
]
- ProductModule {
+ Export {
Depends { name: "cpp" }
cpp.includePaths: [
".",
diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs
index ec66195d538..10d51663454 100644
--- a/src/libs/qmljs/qmljs.qbs
+++ b/src/libs/qmljs/qmljs.qbs
@@ -107,7 +107,7 @@ QtcLibrary {
"iscriptevaluator.h"
]
- ProductModule {
+ Export {
Depends { name: "cpp" }
Depends { name: "LanguageUtils" }
cpp.defines: [
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs
index edc5663c914..571821c22c9 100644
--- a/src/libs/ssh/ssh.qbs
+++ b/src/libs/ssh/ssh.qbs
@@ -114,7 +114,7 @@ QtcLibrary {
]
}
- ProductModule {
+ Export {
Depends { name: "Qt"; submodules: ["widgets", "network"] }
}
}
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index 4c1a220c4cf..3f5e8f9872c 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -211,8 +211,8 @@ QtcLibrary {
]
}
- ProductModule {
- // ### [ remove, once qbs supports merging of ProductModule items in derived products
+ Export {
+ // ### [ remove, once qbs supports merging of Export items in derived products
Depends { name: "cpp" }
cpp.includePaths: [ ".." ]
// ### ]
diff --git a/src/plugins/QtcPlugin.qbs b/src/plugins/QtcPlugin.qbs
index 139b90794f0..48278e76e9b 100644
--- a/src/plugins/QtcPlugin.qbs
+++ b/src/plugins/QtcPlugin.qbs
@@ -47,7 +47,7 @@ Product {
qbs.installDir: "lib/qtcreator/plugins/" + provider
}
- ProductModule {
+ Export {
Depends { name: "ExtensionSystem" }
}
}
diff --git a/src/plugins/analyzerbase/analyzerbase.qbs b/src/plugins/analyzerbase/analyzerbase.qbs
index 621bdd10d7d..26073fdbdda 100644
--- a/src/plugins/analyzerbase/analyzerbase.qbs
+++ b/src/plugins/analyzerbase/analyzerbase.qbs
@@ -47,7 +47,7 @@ QtcPlugin {
"images/analyzer_start_small.png",
]
- ProductModule {
+ Export {
Depends { name: "CPlusPlus" }
}
}
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 8501f6940a7..d8ebbd8b78f 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -251,7 +251,7 @@ QtcPlugin {
]
}
- ProductModule {
+ Export {
Depends { name: "cpp" }
Depends { name: "Aggregation" }
Depends { name: "Utils" }
diff --git a/src/plugins/cpptools/cpptools.qbs b/src/plugins/cpptools/cpptools.qbs
index dc02251a1f2..c010728d3a3 100644
--- a/src/plugins/cpptools/cpptools.qbs
+++ b/src/plugins/cpptools/cpptools.qbs
@@ -119,7 +119,7 @@ QtcPlugin {
cpp.defines: outer.concat(['SRCDIR="' + FileInfo.path(filePath) + '"'])
}
- ProductModule {
+ Export {
Depends { name: "CPlusPlus" }
}
}
diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs
index b67ccd5811d..08e50e0622e 100644
--- a/src/plugins/debugger/debugger.qbs
+++ b/src/plugins/debugger/debugger.qbs
@@ -292,7 +292,7 @@ QtcPlugin {
]
}
- ProductModule {
+ Export {
Depends { name: "cpp" }
Depends { name: "QtcSsh" }
cpp.includePaths: ["."]
diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs
index 136953d0d81..1dc3fc9d93f 100644
--- a/src/plugins/projectexplorer/projectexplorer.qbs
+++ b/src/plugins/projectexplorer/projectexplorer.qbs
@@ -345,7 +345,7 @@ QtcPlugin {
files: ["outputparser_test.h", "outputparser_test.cpp"]
}
- ProductModule {
+ Export {
Depends { name: "Qt.network" }
}
}
diff --git a/src/plugins/qmljseditor/qmljseditor.qbs b/src/plugins/qmljseditor/qmljseditor.qbs
index 11d06ce5d73..f49470b8ab8 100644
--- a/src/plugins/qmljseditor/qmljseditor.qbs
+++ b/src/plugins/qmljseditor/qmljseditor.qbs
@@ -88,7 +88,7 @@ QtcPlugin {
"images/qmlfile.png",
]
- ProductModule {
+ Export {
Depends { name: "QmlJSTools" }
}
}
diff --git a/src/plugins/qmljstools/qmljstools.qbs b/src/plugins/qmljstools/qmljstools.qbs
index d787c842b1c..3848531bd52 100644
--- a/src/plugins/qmljstools/qmljstools.qbs
+++ b/src/plugins/qmljstools/qmljstools.qbs
@@ -78,7 +78,7 @@ QtcPlugin {
files: ["qmljstools_test.cpp"]
}
- ProductModule {
+ Export {
Depends { name: "CppTools" }
Depends { name: "QmlDebug" }
}
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index cc30200f0f4..87549bb8ca6 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -100,7 +100,7 @@ QtcPlugin {
"showbuildlog.ui",
]
- ProductModule {
+ Export {
Depends { name: "cpp" }
cpp.includePaths: "../../shared"
cpp.defines: [
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 79beba45593..8e3b4e3544a 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -106,7 +106,7 @@ QtcPlugin {
"images/embeddedtarget.png",
]
- ProductModule {
+ Export {
Depends { name: "Core" }
Depends { name: "QtcSsh" }
}
diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs
index 0db0da5bebf..ed32f2e26f7 100644
--- a/src/plugins/texteditor/texteditor.qbs
+++ b/src/plugins/texteditor/texteditor.qbs
@@ -267,7 +267,7 @@ QtcPlugin {
]
}
- ProductModule {
+ Export {
Depends { name: "Find" }
Depends { name: "Locator" }
}
--
GitLab