diff options
| author | Daniel Teske <daniel.teske@digia.com> | 2013-08-14 14:03:54 +0200 |
|---|---|---|
| committer | Daniel Teske <daniel.teske@digia.com> | 2013-08-14 16:13:54 +0200 |
| commit | a02144318d3bd1f39238910bd526b464866c531e (patch) | |
| tree | 4df19c003638c24aea98fb8ba079b130f2478aa9 /doc | |
| parent | 09d0f77733d44d75057f538a1a8021a7c8240541 (diff) | |
| download | qt-creator-a02144318d3bd1f39238910bd526b464866c531e.tar.gz | |
Doc: Adding qt: Integrate Blackberry section into the normal setup
There's just one difference for adding a Blackberry qt version, that
doesn't require a duplication of everything else to explain.
Change-Id: I097d3b30bc823e47b89efe219dd5447608958ee6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/images/qtcreator-qt4-qtversions-win-qnx.png | bin | 16368 -> 0 bytes | |||
| -rw-r--r-- | doc/src/projects/creator-projects-qt-versions.qdoc | 4 | ||||
| -rw-r--r-- | doc/src/qnx/creator-projects-qt-version-qnx.qdocinc | 21 |
3 files changed, 3 insertions, 22 deletions
diff --git a/doc/images/qtcreator-qt4-qtversions-win-qnx.png b/doc/images/qtcreator-qt4-qtversions-win-qnx.png Binary files differdeleted file mode 100644 index ed5a14b9ac..0000000000 --- a/doc/images/qtcreator-qt4-qtversions-win-qnx.png +++ /dev/null diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc index 176e69892f..738282c8db 100644 --- a/doc/src/projects/creator-projects-qt-versions.qdoc +++ b/doc/src/projects/creator-projects-qt-versions.qdoc @@ -69,10 +69,12 @@ necessary, because the internal data structures of Qt can change between versions. For more information, see \l{Using Debugging Helpers}. + \li If the Qt version is for Blackberry or QNX, enter the path + to your installed Blackberry NDK or QNX SDK in the + \gui {Blackberry Native SDK} or \gui{QNX SDK} field respectively. \endlist - \include qnx/creator-projects-qt-version-qnx.qdocinc */ diff --git a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc b/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc deleted file mode 100644 index 1085c9496e..0000000000 --- a/doc/src/qnx/creator-projects-qt-version-qnx.qdocinc +++ /dev/null @@ -1,21 +0,0 @@ - \section2 Setting Up Qt for QNX Versions - - If you install Qt for QNX as a part of Qt Playbook SDK, it is automatically - detected by \QC. The \gui {BlackBerry Native SDK} field displays the path to the directory where - the Blackberry NDK is located. - - To view Qt for QNX version settings, select \gui {Tools > Options > - Build & Run > Qt Versions}. - - \image qtcreator-qt4-qtversions-win-qnx.png - - If you have built your own version of Qt for QNX or BlackBerry you need to - add this manually to Qt Creator using the above dialog: - - \list 1 - \li Select \gui {Tools > Options > Build & Run > Qt Versions > Add}. - \li Navigate to and select the qmake application that is part of your Qt for QNX build and select - \gui {Open}. - \li In the \gui {Blackberry Native SDK} or \gui{QNX SDK} field enter the path to your installed Blackberry NDK or QNX SDK respectively. - \li Select \gui {OK}. - \endlist |
