From a02144318d3bd1f39238910bd526b464866c531e Mon Sep 17 00:00:00 2001 From: Daniel Teske Date: Wed, 14 Aug 2013 14:03:54 +0200 Subject: Doc: Adding qt: Integrate Blackberry section into the normal setup MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tobias Nätterlund --- doc/images/qtcreator-qt4-qtversions-win-qnx.png | Bin 16368 -> 0 bytes doc/src/projects/creator-projects-qt-versions.qdoc | 4 +++- .../qnx/creator-projects-qt-version-qnx.qdocinc | 21 --------------------- 3 files changed, 3 insertions(+), 22 deletions(-) delete mode 100644 doc/images/qtcreator-qt4-qtversions-win-qnx.png delete mode 100644 doc/src/qnx/creator-projects-qt-version-qnx.qdocinc (limited to 'doc') diff --git a/doc/images/qtcreator-qt4-qtversions-win-qnx.png b/doc/images/qtcreator-qt4-qtversions-win-qnx.png deleted file mode 100644 index ed5a14b9ac..0000000000 Binary files a/doc/images/qtcreator-qt4-qtversions-win-qnx.png and /dev/null differ 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 -- cgit v1.2.1