Doc: remove obsolete \if defined commands

The doc sources are no longer used for single-sourcing.

Change-Id: I934c88c19646d84b4de3c5787234148f947c4489
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

13 files changed, 1 insertions, 107 deletions

diff --git a/doc/config/qt-defines.qdocconf b/doc/config/qt-defines.qdocconf
index 1ce9a8045f..bf7fd08597 100644
--- a/doc/config/qt-defines.qdocconf
+++ b/doc/config/qt-defines.qdocconf
@@ -10,9 +10,7 @@ defines                 = Q_QDOC \
                           Q_BYTE_ORDER \
 			  QT_DEPRECATED \
                           Q_NO_USING_KEYWORD \
-                          __cplusplus \
-                          qtquick \
-                          qcmanual
+                          __cplusplus
 
 versionsym              = QT_VERSION_STR
 
diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc
index d322ac3c33..a9636f6c5f 100644
--- a/doc/src/debugger/creator-debugger.qdoc
+++ b/doc/src/debugger/creator-debugger.qdoc
@@ -238,11 +238,7 @@
     debugging) or runs a separate process (e.g. when using GDB server
     on embedded Linux). The host side typically
     consists of \QC itself, often with the help of an external process, such as
-    \if defined(qcmanual)
     GDB or CDB.
-    \else
-    GDB.
-    \endif
 
     While this setup might look daunting, it is mostly invisible to
     the user of \QC. To start debugging on a remote target with the
diff --git a/doc/src/howto/qtcreator-faq.qdoc b/doc/src/howto/qtcreator-faq.qdoc
index 026eb8ef38..77b500343e 100644
--- a/doc/src/howto/qtcreator-faq.qdoc
+++ b/doc/src/howto/qtcreator-faq.qdoc
@@ -100,9 +100,7 @@
     You can look up any issue in the
     \l{http://bugreports.qt-project.org/}{Qt bug tracker}.
 
-    \if defined(qcmanual)
     \include widgets/creator-faq-qtdesigner.qdocinc
-    \endif
 
     \section1 Help Questions
 
diff --git a/doc/src/linux-mobile/maemodev.qdoc b/doc/src/linux-mobile/maemodev.qdoc
index ae4bfba8b0..c6b8b887f9 100644
--- a/doc/src/linux-mobile/maemodev.qdoc
+++ b/doc/src/linux-mobile/maemodev.qdoc
@@ -19,11 +19,7 @@
     /*!
 
     \contentspage index.html
-    \if defined(qcmanual)
     \previouspage creator-developing-generic-linux.html
-    \else
-    \previouspage creator-developing-meego.html
-    \endif
     \page creator-developing-maemo.html
     \nextpage creator-developing-meego.html
 
@@ -40,11 +36,9 @@
     development is disabled by default. To enable it, select \gui Help >
     \gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC.
 
-    \if defined(qcmanual)
     For more
     information about the Maemo 5 platform, see
     \l{http://maemo.org/intro/platform/}{Software Platform} on the Maemo web site.
-    \endif
 
     For more information about developing applications for the Maemo 5
     platform, select \gui {Help > Index} and look for \gui {Platform Notes},
@@ -58,10 +52,8 @@
 
         \li Maemo 5 device: Nokia N900 with software update release 1.3
                     (V20.2010.36-2) or later installed.
-       \if defined(qcmanual)
        \li MADDE cross-platform Maemo development
            tool (installed as part of the Qt 4 SDK).
-       \endif
 
        \li  Nokia USB drivers.
 
@@ -234,13 +226,7 @@
     testing. If you write applications that use Qt Mobility APIs, you might want
     to test them with real user data. To create a connection as a user, specify
     the \gui Username and \gui Password in \QC. For more information, see
-    \if defined(qcmanual)
     \l{Testing with User Data on Maemo Devices}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-maemo.html#testing-with-user-data-on-maemo-devices}
-    {Testing with User Data on Maemo Devices}.
-    \endif
-
 
     You can protect the connections between \QC and
     a device by using either a password or an SSH key. If you use a password, you
@@ -250,22 +236,11 @@
     If you do not have an SSH key, you can create it in \QC.
     Encrypted keys are not supported. For more
     information, see
-    \if defined(qcmanual)
     \l{Generating SSH Keys}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
-    {Generating SSH Keys}.
-    \endif
-
 
     You can view processes running on devices and kill them. For more
     information, see
-    \if defined(qcmanual)
     \l{Managing Device Processes}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
-    {Managing Device Processes}.
-    \endif
 
 
     To configure connections between \QC and a
@@ -309,8 +284,6 @@
 
             \endlist
 
-        \if defined(qcmanual)
-
         \li  To test applications on the emulator (QEMU) separately, you must
            create a connection to it from the development PC. If you installed
            Qt 4 SDK, the connection is created automatically and you can omit this
@@ -330,7 +303,6 @@
                 connection.
 
             \endlist
-    \endif
 
             \li Select \gui Tools > \gui Options > \gui {Build & Run} >
                 \gui Kits > \gui Add to add a kit for building for the device:
diff --git a/doc/src/linux-mobile/meegodev.qdoc b/doc/src/linux-mobile/meegodev.qdoc
index 982f45e0ff..863d986eca 100644
--- a/doc/src/linux-mobile/meegodev.qdoc
+++ b/doc/src/linux-mobile/meegodev.qdoc
@@ -21,11 +21,7 @@
     \contentspage index.html
     \previouspage creator-developing-maemo.html
     \page creator-developing-meego.html
-    \if defined(qcmanual)
     \nextpage creator-developing-qnx.html
-    \else
-    \nextpage creator-developing-maemo.html
-    \endif
 
     \title Connecting MeeGo Harmattan Devices
 
@@ -39,12 +35,9 @@
     development is disabled by default. To enable it, select \gui Help >
     \gui {About Plugins} > \gui {Device Support} > \gui Madde and restart \QC.
 
-    \if defined(qcmanual)
     For more information about the Harmattan platform, see
     \l{http://library.developer.nokia.com/topic/MeeGo_1.2_Harmattan_API/html/guide/html/Developer_Library_Harmattan_overview_5dcf.html}
     {Harmattan Overview} in the MeeGo 1.2 Harmattan Developer Library.
-    \endif
-
 
     \note Qt 4 SDK does not contain the tool chains for building applications for
     other MeeGo devices than MeeGo Harmattan. You can try to run applications
@@ -247,13 +240,7 @@
     If you write applications that use Qt Mobility APIs, you might want to test
     them with real user data. To create a connection as a user, specify the
     \gui Username and \gui Password in \QC. For more information, see
-    \if defined(qcmanual)
     \l{Testing with User Data on MeeGo Devices}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#testing-with-user-data-on-meego-devices}
-    {Testing with User Data on MeeGo Devices}.
-    \endif
-
 
     You can protect the connections between \QC and a device by using
     either a password or an SSH key. If you use a password, you must generate it
@@ -262,23 +249,11 @@
 
     If you do not have an SSH key, you can create it in \QC. Encrypted
     keys are not supported. For more information, see
-    \if defined(qcmanual)
     \l{Generating SSH Keys}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#generating-ssh-keys}
-    {Generating SSH Keys}.
-    \endif
-
 
     You can view processes running on devices and kill them. For more
     information, see
-    \if defined(qcmanual)
     \l{Managing Device Processes}.
-    \else
-    \l{http://doc.qt.digia.com/qtcreator/creator-developing-meego.html#managing-device-processes}
-    {Managing Device Processes}.
-    \endif
-
 
     To configure connections between \QC and a device:
 
@@ -324,8 +299,6 @@
 
             \endlist
 
-        \if defined(qcmanual)
-
         \li To test applications on the emulator (QEMU), you must
             create a connection to it from the development PC. If you installed
             Qt 4 SDK, the connection is created automatically and you can omit this
@@ -355,8 +328,6 @@
 
             \endlist
 
-        \endif
-
             \li Select \gui Tools > \gui Options > \gui {Build & Run} >
                 \gui Kits > \gui Add to add a kit for building for the device:
 
@@ -410,8 +381,6 @@
 
         \endlist
 
-    \if defined(qcmanual)
-
     \section2 Testing with User Data on MeeGo Devices
 
     To run your application as the default user, you must first assign a
@@ -436,8 +405,6 @@
     \include linux-mobile/linuxdev-keys.qdocinc
     \include linux-mobile/linuxdev-processes.qdocinc
 
-    \endif
-
     \section1 Troubleshooting Harmattan Connections
 
     The addresses used in this example might be reserved by some other
diff --git a/doc/src/overview/creator-issues.qdoc b/doc/src/overview/creator-issues.qdoc
index 8713a745bc..5b25d7476a 100644
--- a/doc/src/overview/creator-issues.qdoc
+++ b/doc/src/overview/creator-issues.qdoc
@@ -104,11 +104,9 @@
 
         \li  Creating new CMake projects with \QC is not supported.
 
-        \if defined(qcmanual)
         \li  On Windows, you must create projects for Maemo 5 and Harmattan
             device types on the same partition where you installed Qt 4 SDK, \QC, and
             MADDE.
-        \endif
 
         \li  If error messages displayed in the \gui {Compile Output} pane contain
             paths where slashes are missing (for example, C:QtSDK),
diff --git a/doc/src/projects/creator-projects-creating.qdoc b/doc/src/projects/creator-projects-creating.qdoc
index f3dc8d4bc0..5d197a6d8c 100644
--- a/doc/src/projects/creator-projects-creating.qdoc
+++ b/doc/src/projects/creator-projects-creating.qdoc
@@ -98,7 +98,6 @@
 
         \list
 
-            \if defined(qcmanual)
             \li Qt GUI Application
 
                 Use \QD forms to design a Qt widget based user interface for the
@@ -110,7 +109,6 @@
                 mobile devices and C++ to implement the application logic.
                 Select this template to develop for devices that support only
                 Qt 4.6.x
-            \endif
 
             \li Qt Quick Application (Built-in Types)
 
@@ -277,18 +275,14 @@
 
             C++ class, source, or header files that you can use to write the
             application logic in both Qt Quick projects and
-            \if defined(qcmanual)
             Qt widget based projects
-            \endif
 
         \li Qt
 
         \list
 
-            \if defined(qcmanual)
             \li \QD forms and \QD form classes, which specify parts of user
                 interfaces in Qt widget based projects
-            \endif
 
         \li Qt resource files, which allow you to store binary files in the
             application executable
diff --git a/doc/src/projects/creator-projects-qt-versions.qdoc b/doc/src/projects/creator-projects-qt-versions.qdoc
index 23861f54e3..a8b280f4ec 100644
--- a/doc/src/projects/creator-projects-qt-versions.qdoc
+++ b/doc/src/projects/creator-projects-qt-versions.qdoc
@@ -72,9 +72,7 @@
 
         \endlist
 
-    \if defined(qcmanual)
     \include qnx/creator-projects-qt-version-qnx.qdocinc
-    \endif
 
 */
 
diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc
index 88efbc4bd2..7f1c20b7db 100644
--- a/doc/src/projects/creator-projects-running.qdoc
+++ b/doc/src/projects/creator-projects-running.qdoc
@@ -41,16 +41,9 @@
     For more information on the options you have, see
     \l{Specifying Run Settings}.
 
-    \if defined(qcmanual)
     \include projects/creator-projects-running-desktop.qdocinc
-    \endif
-
     \include projects/creator-projects-running-simulator.qdocinc
-
-    \if defined(qcmanual)
     \include linux-mobile/creator-projects-running-generic-linux.qdocinc
     \include linux-mobile/creator-projects-running-madde.qdocinc
     \include qnx/creator-projects-running-qnx.qdocinc
-    \endif
-
 */
diff --git a/doc/src/projects/creator-projects-settings-run.qdoc b/doc/src/projects/creator-projects-settings-run.qdoc
index ccf554a9ee..06c907851f 100644
--- a/doc/src/projects/creator-projects-settings-run.qdoc
+++ b/doc/src/projects/creator-projects-settings-run.qdoc
@@ -45,13 +45,11 @@
     parsed .pro files. For more information on how the commands are constructed,
     see \l{Starting External Processes}.
 
-    \if defined(qcmanual)
     \include projects/creator-projects-settings-run-desktop.qdocinc
     \include projects/creator-projects-settings-run-analyze.qdocinc
     \include projects/creator-projects-settings-run-debug.qdocinc
     \include linux-mobile/creator-projects-settings-run-linux.qdocinc
     \include qnx/creator-projects-settings-run-qnx.qdocinc
-    \endif
 
     \section1 Selecting the Run Environment
 
diff --git a/doc/src/qtquick/qtquick-app-development.qdoc b/doc/src/qtquick/qtquick-app-development.qdoc
index e3b40cd3be..61caacd9a8 100644
--- a/doc/src/qtquick/qtquick-app-development.qdoc
+++ b/doc/src/qtquick/qtquick-app-development.qdoc
@@ -64,11 +64,9 @@
     \section1 Related Topics
 
     \list
-        \if defined(qcmanual)
         \li \l {Using Qt Quick Designer}
         \li \l {Creating Buttons}
         \li \l {Creating Scalable Buttons and Borders}
-        \endif
         \li \l {Exporting Designs from Graphics Software}
         \li \l {Using QML Modules with Plugins}
 
diff --git a/doc/src/qtquick/qtquick-components.qdoc b/doc/src/qtquick/qtquick-components.qdoc
index 05fb8f0fe5..5d453f0f70 100644
--- a/doc/src/qtquick/qtquick-components.qdoc
+++ b/doc/src/qtquick/qtquick-components.qdoc
@@ -109,7 +109,6 @@
 
     \endlist
 
-    \if defined(qcmanual)
     The following sections contain examples of how to create some common
     components:
 
@@ -130,5 +129,4 @@
     top level when you are done editing the component.
 
     \image qmldesigner-breadcrumbs.png "Go into Component command"
-    \endif
 */
diff --git a/doc/src/qtquick/qtquick-screens.qdoc b/doc/src/qtquick/qtquick-screens.qdoc
index 180f2d8e9d..e9b62f89d5 100644
--- a/doc/src/qtquick/qtquick-screens.qdoc
+++ b/doc/src/qtquick/qtquick-screens.qdoc
@@ -35,10 +35,8 @@
     screens. Typically, the main qml file in a Qt Quick project specifies the
     main window of an application.
 
-    \if defined(qcmanual)
     The QML files in the project folder are displayed in \gui {QML Components}
     in the \gui Library pane.
-    \endif
 
     You can also use ready-made Qt Quick 1 Components (for Qt 4) to create
     screens with a native look and feel for a particular target platform.
@@ -47,7 +45,6 @@
     can install Qt Quick 1 Components as part of the Qt 4 SDK and the Qt Quick
     Controls as part of Qt 5.1, or later.
 
-    \if defined(qcmanual)
     \section1 Adding Components to Screens
 
     \list 1
@@ -60,7 +57,6 @@
             For example, you can anchor components to a position on the screen.
 
     \endlist
-    \endif
 
 
     \section1 Using Data Models
@@ -85,9 +81,7 @@
     \l{http://qt-project.org/doc/qt-5.0/qtquick/qml-qtquick2-listmodel.html}{ListModel} and the
     delegate component that creates an instance for each item in the model are
     added automatically. You can edit item properties
-    \if defined(qcmanual)
     in the \gui Properties pane or
-    \endif
     in the code editor. You can also replace the default model and
     delegate with other, more complex models and delegates in the code editor.
 
@@ -112,12 +106,9 @@
 
     \endlist
 
-    \if defined(qcmanual)
     To lay out several items in a Column, Row, Grid, or Flow, select
     the items on the canvas, and then select \gui Layout in the context
     menu.
-    \endif
-
 
     \section1 Using States
 
@@ -127,7 +118,6 @@
     controls, their properties and behavior and the available actions. For
     example, you can use states to create two screens.
 
-    \if defined(qcmanual)
     To add states, click the empty slot in the \gui States pane. Then modify the
     new state in the visual editor.
 
@@ -136,8 +126,6 @@
     The properties that you change in a state are highlighted with blue color.
     In the code editor, you can see the changes recorded as changes to the base
     state.
-    \endif
-
 
     To keep the QML code clean, you should create a base state that contains all
     the types you will need in the application. You can then create states,
@@ -160,7 +148,6 @@
 
     \endlist
 
-    \if defined(qcmanual)
     To create screens for an application by using states:
 
     \list 1
@@ -195,7 +182,6 @@
             \endqml
 
         \endlist
-    \endif
 
 */