diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-08 12:25:00 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-08 12:25:00 +0200 |
| commit | 505cadeb2a072216b904d8655f5e6e62b0f9380b (patch) | |
| tree | 36a771df1107eb6c5edd3304f22fdfc3361895eb /doc/qbs.qdoc | |
| parent | daf715d9cae1c297ea50587c9e40c0f24bd59a07 (diff) | |
| parent | a98416dcf9895ad6f840a0e35da10a667a8a20ae (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
doc/reference/items/transformer.qdoc
share/qbs/modules/cpp/GenericGCC.qbs
Change-Id: I45560834560019b18274c373c45651eb8aadd206
Diffstat (limited to 'doc/qbs.qdoc')
| -rw-r--r-- | doc/qbs.qdoc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index 8d782823b..574ed4a2f 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing ** -** This file is part of the Qt Build Suite. +** This file is part of Qbs. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in @@ -36,7 +36,7 @@ /*! - \contentspage{index.html}{Qt Build Suite} + \contentspage{index.html}{Qbs} \page index.html \nextpage overview.html @@ -44,12 +44,12 @@ \section1 Version \qbsversion - Qt Build Suite (\QBS) is a tool that helps simplify the build process for + \QBS is a tool that helps simplify the build process for developing projects across multiple platforms. \QBS can be used for any - software project, whether it is written in Qt or not. + software project, regardless of programming language, toolkit, or libraries used. \QBS is an all-in-one tool that generates a build graph from a high-level - project description (like qmake or cmake) and additionally undertakes the + project description (like qmake or CMake) and additionally undertakes the task of executing the commands in the low-level build graph (like make). \note Please report bugs and suggestions to the |