diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2016-05-01 08:36:33 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2016-05-02 09:19:05 +0000 |
| commit | e231073a40e2507d51d1439dbe71e6518ddbfd5e (patch) | |
| tree | 5e32f7d414276321e2b9f80e1af00c332f371a20 | |
| parent | 00324a9af1eb742d3962830c1a6d5339f4a5f830 (diff) | |
| download | qt-creator-e231073a40e2507d51d1439dbe71e6518ddbfd5e.tar.gz | |
Qbs: Enable exceptions where needed
Align with qmake project
Change-Id: Ic68619a0b5e3bf6052c8b52165337063a24e2b5d
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
| -rw-r--r-- | src/libs/ssh/ssh.qbs | 1 | ||||
| -rw-r--r-- | src/libs/utils/utils.qbs | 2 | ||||
| -rw-r--r-- | src/plugins/debugger/debugger.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/texteditor/texteditor.qbs | 1 | ||||
| -rw-r--r-- | src/plugins/valgrind/valgrind.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/debugger/namedemangler.qbs | 3 |
6 files changed, 10 insertions, 0 deletions
diff --git a/src/libs/ssh/ssh.qbs b/src/libs/ssh/ssh.qbs index 185f397b61..c248b1bf34 100644 --- a/src/libs/ssh/ssh.qbs +++ b/src/libs/ssh/ssh.qbs @@ -6,6 +6,7 @@ QtcLibrary { cpp.defines: base.concat(["QSSH_LIBRARY"]).concat(botanDefines) cpp.includePaths: botanIncludes cpp.dynamicLibraries: botanLibs + cpp.enableExceptions: true Depends { name: "Qt"; submodules: ["widgets", "network" ] } diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 53125f5fef..a01fbfb592 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -22,6 +22,8 @@ QtcLibrary { return libs; } + cpp.enableExceptions: true + Properties { condition: qbs.targetOS.contains("osx") cpp.frameworks: ["Foundation"] diff --git a/src/plugins/debugger/debugger.qbs b/src/plugins/debugger/debugger.qbs index 28c55f7705..2241b60da7 100644 --- a/src/plugins/debugger/debugger.qbs +++ b/src/plugins/debugger/debugger.qbs @@ -29,6 +29,7 @@ QtcPlugin { ] cpp.includePaths: base.concat([project.sharedSourcesDir + "/registryaccess"]) + cpp.enableExceptions: true pluginRecommends: [ "CppEditor" diff --git a/src/plugins/texteditor/texteditor.qbs b/src/plugins/texteditor/texteditor.qbs index 532cdc03e2..13407a3269 100644 --- a/src/plugins/texteditor/texteditor.qbs +++ b/src/plugins/texteditor/texteditor.qbs @@ -10,6 +10,7 @@ QtcPlugin { Depends { name: "Core" } cpp.includePaths: base.concat([path]) // Needed for the highlighterengine autotest. + cpp.enableExceptions: true files: [ "autocompleter.cpp", diff --git a/src/plugins/valgrind/valgrind.qbs b/src/plugins/valgrind/valgrind.qbs index de2d53b699..beaf1bb830 100644 --- a/src/plugins/valgrind/valgrind.qbs +++ b/src/plugins/valgrind/valgrind.qbs @@ -13,6 +13,8 @@ QtcPlugin { Depends { name: "ProjectExplorer" } Depends { name: "TextEditor" } + cpp.enableExceptions: true + Group { name: "General" files: [ diff --git a/tests/auto/debugger/namedemangler.qbs b/tests/auto/debugger/namedemangler.qbs index a22d294ad0..d6356728d6 100644 --- a/tests/auto/debugger/namedemangler.qbs +++ b/tests/auto/debugger/namedemangler.qbs @@ -2,6 +2,9 @@ import qbs QtcAutotest { name: "Name demangler autotest" + + cpp.enableExceptions: true + Group { name: "Sources from Debugger plugin" prefix: project.debuggerDir + "namedemangler/" |