diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-08-14 16:18:42 +0200 |
| commit | 187c114987572f5492722b4d66b76366e3e50365 (patch) | |
| tree | bc2bff3a99b333433f09537bc0b9c5fc709057e0 /src/app | |
| parent | 6144279d346670130e0ecdfaf789beaa44cd6755 (diff) | |
| parent | adc28c434853cf0fa17e95cc207e5a1c6eb761de (diff) | |
Merge 1.9 into master
Change-Id: I6da76b0a53bf87105c4e7b48724d9760cb68e831
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config-ui/config-ui.qbs | 6 | ||||
| -rw-r--r-- | src/app/qbs/parser/commandlineparser.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/app/config-ui/config-ui.qbs b/src/app/config-ui/config-ui.qbs index 33fe36eae..2222e6a17 100644 --- a/src/app/config-ui/config-ui.qbs +++ b/src/app/config-ui/config-ui.qbs @@ -26,6 +26,8 @@ QbsApp { cpp.frameworks: ["ApplicationServices", "Cocoa"] } - Depends { name: "bundle" } - bundle.isBundle: false + Properties { + condition: qbs.targetOS.contains("darwin") + bundle.isBundle: false + } } diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp index 4105a5bd2..33e8af7d3 100644 --- a/src/app/qbs/parser/commandlineparser.cpp +++ b/src/app/qbs/parser/commandlineparser.cpp @@ -391,7 +391,7 @@ static QString extractToolDescription(const QString &tool, const QString &output QString CommandLineParser::CommandLineParserPrivate::generalHelp() const { QString help = Tr::tr("Usage: qbs [command] [command parameters]\n"); - help += Tr::tr("Internal commands:\n"); + help += Tr::tr("Built-in commands:\n"); const int rhsIndentation = 30; // Sorting the commands by name is nicer for the user. |