diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-18 15:53:58 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-05-18 15:54:07 +0200 |
| commit | b44b0659da151f2cc78c00b75ce342c03d53ce41 (patch) | |
| tree | 1f188dced36326b189636013acb1dccc3576816b /doc | |
| parent | 7d4b127b4c2005a913351e204658031c866f32c4 (diff) | |
| parent | 8cca696d8fc9891589e02f0be8bb820af717956c (diff) | |
Merge remote-tracking branch 'origin/1.5'
Conflicts:
qbs-resources/imports/QbsFunctions/functions.js
qbs_version.pri
Change-Id: I24c4c941d825e61ddd2e704c8cea29eaa9943997
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/qbs.qdoc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index b8d896910..a2043f8f1 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -300,7 +300,8 @@ \QBS project files are written using a QML dialect. A very simple C++ hello world project looks like this: - \code ---helloworld.qbs--- + \code + ---helloworld.qbs--- import qbs 1.0 Application { |