From b7692adbd6ac1bd55d76957a7073b80321dac2ad Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Thu, 24 Nov 2011 10:10:19 +0100 Subject: [PATCH] Doc: resolve merge conflicts Change-Id: I76f544e86acd903864e301c798048f95d62b79a3 Reviewed-by: Leena Miettinen --- doc/src/debugger/creator-debugger.qdoc | 2 +- doc/src/overview/creator-tutorials.qdoc | 62 ++++++++++++ .../projects/creator-projects-running.qdoc | 2 +- doc/src/symbian/symbiandev.qdoc | 98 +++++++++---------- 4 files changed, 113 insertions(+), 51 deletions(-) create mode 100644 doc/src/overview/creator-tutorials.qdoc diff --git a/doc/src/debugger/creator-debugger.qdoc b/doc/src/debugger/creator-debugger.qdoc index 73938cb627b..0477e531345 100644 --- a/doc/src/debugger/creator-debugger.qdoc +++ b/doc/src/debugger/creator-debugger.qdoc @@ -27,7 +27,7 @@ /*! \contentspage index.html - \previouspage creator-running-targets.html + \previouspage creator-testing.html \page creator-debugging.html \nextpage creator-debugging-example.html diff --git a/doc/src/overview/creator-tutorials.qdoc b/doc/src/overview/creator-tutorials.qdoc new file mode 100644 index 00000000000..896b7e718b7 --- /dev/null +++ b/doc/src/overview/creator-tutorials.qdoc @@ -0,0 +1,62 @@ +/**************************************************************************** +** +** This file is part of Qt Creator +** +** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). +** +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** +** GNU Free Documentation License +** +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of this +** file. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +****************************************************************************/ + +// ********************************************************************** +// NOTE: the sections are not ordered by their logical order to avoid +// reshuffling the file each time the index order changes (i.e., often). +// Run the fixnavi.pl script to adjust the links to the index order. +// ********************************************************************** + +/*! + \contentspage index.html + \previouspage creator-build-example-application.html + \page creator-tutorials.html + \nextpage creator-qml-application.html + + \title Tutorials + + You can use \QC to create applications for several platforms by using + several technologies. The tutorials in this manual explain how to create + some basic applications. + + \table + \row + \i + \i + \i + \row + \o \l{Creating a Qt Quick Application} + + To learn about the basic Qt Quick concepts and QML elements, go + to \l{Creating a Qt Quick Application}. + \o \l{Creating a Qt Quick Application Using Qt Quick Components} + + To learn how to develop a Qt Quick application for mobile + devices, go to + \l{Creating a Qt Quick Application Using Qt Quick Components}. + + \o \l{Creating a Qt Widget Based Application} + + To learn how to create a Qt widget based application for + the desktop, go to \l{Creating a Qt Widget Based Application}. + \endtable + +*/ diff --git a/doc/src/projects/creator-projects-running.qdoc b/doc/src/projects/creator-projects-running.qdoc index 8fc19667edd..54317bd321b 100644 --- a/doc/src/projects/creator-projects-running.qdoc +++ b/doc/src/projects/creator-projects-running.qdoc @@ -29,7 +29,7 @@ \contentspage index.html \previouspage creator-building-targets.html \page creator-running-targets.html - \nextpage creator-debugging.html + \nextpage creator-testing.html \title Running Applications on Multiple Targets diff --git a/doc/src/symbian/symbiandev.qdoc b/doc/src/symbian/symbiandev.qdoc index 63054f273ec..9ffdf0a466a 100644 --- a/doc/src/symbian/symbiandev.qdoc +++ b/doc/src/symbian/symbiandev.qdoc @@ -28,7 +28,7 @@ \endif \page creator-developing-symbian.html \if defined(qcmanual) - \nextpage creator-project-managing-sessions.html + \nextpage creator-deployment.html \else \nextpage creator-developing-meego.html \endif @@ -206,33 +206,33 @@ \table \header - \i Qt Version - \i Qt Quick - \i Qt Quick Components - \i Qt Mobility Version - \i Native Symbian C++ APIs - \i Qt OpenGL Support + \o Qt Version + \o Qt Quick + \o Qt Quick Components + \o Qt Mobility Version + \o Native Symbian C++ APIs + \o Qt OpenGL Support \row - \i S60 5th Edition Qt 4.7.3 (online installer only) - \i 1.0 - \i No - \i 1.1.3 - \i No - \i No + \o S60 5th Edition Qt 4.7.3 (online installer only) + \o 1.0 + \o No + \o 1.1.3 + \o No + \o No \row - \i Symbian Anna Qt 4.7.4 - \i 1.1 - \i 1.1 - \i 1.2 - \i Yes (Symbian Anna APIs) - \i Yes + \o Symbian Anna Qt 4.7.4 + \o 1.1 + \o 1.1 + \o 1.2 + \o Yes (Symbian Anna APIs) + \o Yes \row - \i Symbian Belle Qt 4.7.4 (online installer only) - \i 1.1 - \i 1.1 - \i 1.2 - \i Yes (Symbian Belle APIs) - \i Yes + \o Symbian Belle Qt 4.7.4 (online installer only) + \o 1.1 + \o 1.1 + \o 1.2 + \o Yes (Symbian Belle APIs) + \o Yes \endtable \section2 Developing Applications Using Qt 4.6.3 or Qt 4.7.3 for Symbian @@ -267,33 +267,33 @@ \table \header - \i Qt Version - \i Qt Quick - \i Qt Quick Components - \i Qt Mobility Version - \i Native Symbian C++ APIs - \i Qt OpenGL Support + \o Qt Version + \o Qt Quick + \o Qt Quick Components + \o Qt Mobility Version + \o Native Symbian C++ APIs + \o Qt OpenGL Support \row - \i Qt 4.6.3 for Symbian^1 (S60 5th Edition) - \i No - \i No - \i 1.0.2 - \i No - \i No + \o Qt 4.6.3 for Symbian^1 (S60 5th Edition) + \o No + \o No + \o 1.0.2 + \o No + \o No \row - \i Qt 4.6.3 for Symbian^3 - \i No - \i No - \i 1.0.2 - \i Yes (Symbian^3 APIs) - \i No + \o Qt 4.6.3 for Symbian^3 + \o No + \o No + \o 1.0.2 + \o Yes (Symbian^3 APIs) + \o No \row - \i Qt 4.7.3 for Symbian^3 and Symbian Anna - \i 1.0 - \i 1.0 - \i 1.1.3 - \i Yes (Symbian Anna APIs) - \i Yes + \o Qt 4.7.3 for Symbian^3 and Symbian Anna + \o 1.0 + \o 1.0 + \o 1.1.3 + \o Yes (Symbian Anna APIs) + \o Yes \endtable \section1 Advanced Development with Symbian SDK