diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-05-27 17:17:40 +0200 |
| commit | 45f8e241ba24ba663a22d0c6a8c7b201f37e7c8f (patch) | |
| tree | 13e18102fecaf3a797053a571a9a0f05dbf2f5a6 /src/libs | |
| parent | 116db445bf9f0175acdc7217ea603a3521bd635d (diff) | |
| parent | 4ae9f3778f9e1f7847783ffd7a1b779dd71d093d (diff) | |
Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
src/plugins/android/androiddebugsupport.cpp
src/plugins/qtsupport/qtsupport.qbs
Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
Diffstat (limited to 'src/libs')
| -rw-r--r-- | src/libs/QtcLibrary.qbs | 2 | ||||
| -rw-r--r-- | src/libs/cplusplus/cplusplus.qbs | 2 | ||||
| -rw-r--r-- | src/libs/qmljs/qmljs.qbs | 2 | ||||
| -rw-r--r-- | src/libs/ssh/ssh.qbs | 2 | ||||
| -rw-r--r-- | src/libs/utils/utils.qbs | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/libs/QtcLibrary.qbs b/src/libs/QtcLibrary.qbs index 85e27024df..44a6641cb8 100644 --- a/src/libs/QtcLibrary.qbs +++ b/src/libs/QtcLibrary.qbs @@ -18,7 +18,7 @@ DynamicLibrary { : ["$ORIGIN", "$ORIGIN/.."] cpp.includePaths: [ ".", ".." ] - ProductModule { + Export { Depends { name: "cpp" } cpp.includePaths: [ "." ] } diff --git a/src/libs/cplusplus/cplusplus.qbs b/src/libs/cplusplus/cplusplus.qbs index 20041d8634..31ea51c940 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: [ "../3rdparty" diff --git a/src/libs/qmljs/qmljs.qbs b/src/libs/qmljs/qmljs.qbs index bf0efb0611..4253e0bb09 100644 --- a/src/libs/qmljs/qmljs.qbs +++ b/src/libs/qmljs/qmljs.qbs @@ -106,7 +106,7 @@ QtcLibrary { "iscriptevaluator.h" ] - ProductModule { + Export { Depends { name: "cpp" } Depends { name: "LanguageUtils" } } diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index edc5663c91..571821c22c 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 885a6caa2e..b8f9bd7632 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: [ ".." ] // ### ] |