Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

3 files changed, 35 insertions, 23 deletions

diff --git a/doc/qtcreator-breakdown.png b/doc/qtcreator-breakdown.png
index 9b9f070695..bba842e1f5 100644
--- a/doc/qtcreator-breakdown.png
+++ b/doc/qtcreator-breakdown.png
diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch
index 1e94462e89..493d4f15a4 100644
--- a/doc/qtcreator.qch
+++ b/doc/qtcreator.qch
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index e4bbfa7517..66859a95dd 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -1,17 +1,17 @@
 /*!
     \contentspage{index.html}{Qt Creator}
     \page index.html
-    \nextpage qtcreator-quick-tour.html
+    \nextpage creator-quick-tour.html
 
     \title Qt Creator Manual
 
-    \section1 Version 0.9 - Technical Preview
+    \section1 Version 0.9.1 (Beta)
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
     the Linux, Mac OS X and Windows platforms.
 
-    \note Qt Creator is currently released as a Technical Preview. It is
+    \note The current version of Qt Creator is 0.9.1 (Beta). It is
     possible to edit source code, compile, run and debug applications; other
     features are still under development. Please send bug reports and
     suggestions to qt-creator@trolltech.com. To subscribe, send a
@@ -54,7 +54,7 @@
        \o \l{Debugging with Qt Creator}
        \o \l{Tips and Tricks}
        \o \l{Glossary}
-       \o \l{Known Issues of Version 0.9 (Technical Preview)}
+       \o \l{Known Issues of Version 0.9.1 (Beta)}
     \endlist
 
 */
@@ -94,8 +94,8 @@
     on the left provides different views to navigate between files.
 
     \o \gui{Debug Mode} - Provides various ways to inspect the state of the
-    program while debugging. See \l{qtcreator-debugging}{Debugging With Qt
-    Creator} for a hands-on description of how to use this mode.
+    program while debugging. See \l{Debugging With Qt Creator} for a hands-on
+    description of how to use this mode.
 
     \o \gui{Projects Mode} - Lets you configure how projects can be built and
     executed. Under the list of projects, there are tabs to configure the 
@@ -170,7 +170,7 @@
     interface forms just like you would with the standalone version. The Qt
     Designer integration also includes project management and code completion.
     For more information on Qt Designer, you can refer to
-    \l{The Designer Manual}.
+    \l{http://doc.trolltech.com/designer-manual.html}{The Designer Manual}.
 
     \image qtcreator-formedit.png
 
@@ -407,11 +407,18 @@
 
     \image qtcreator-textfinder-ui.png
 
-    Design the form above using a QLabel, QLineEdit, QPushButton and a
-    QTextEdit. We recommend that you use a QGridLayout to lay out the QLabel,
-    QLineEdit and QPushButton. The QTextEdit can then be added to a
-    QVBoxLayout, along with the QGridLayout. If you are new to designing forms
-    with \QD, you can take a look at the 
+    Design the form above using a \l{http://doc.trolltech.com/qlabel.html}
+    {QLabel}, \l{http://doc.trolltech.com/qlinedit.html}{QLineEdit},
+    \l{http://doc.trolltech.com/qpushbutton.html}{QPushButton} and a
+    \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit}. We recommend that
+    you use a QGridLayout to lay out the
+    \l{http://doc.trolltech.com/qlabel.html}{QLabel},
+    \l{http://doc.trolltech.com/qlinedit.html}{QLineEdit} and
+    \l{http://doc.trolltech.com/qpushbutton.html}{QPushButton}. The
+    \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit} can then be added to
+    a \l{http://doc.trolltech.com/qvboxlayout.html}{QVBoxLayout}, along with
+    the \l{http://doc.trolltech.com/qgridlayout.html}{QGridLayout}. If you are
+    new to designing forms with \QD, you can take a look at the 
     \l{http://doc.trolltech.com/designer-manual.html}{Designer Manual}.
 
     \section2 The Header File
@@ -420,8 +427,9 @@
     constructor, a destructor, and the \c{Ui} object. We need to add a private
     slot, \c{on_findButton_clicked()}, to carry out our find operation. We
     also need a private function, \c{loadTextFile()}, to read and display the
-    contents of our input text file in the QTextEdit. This is done with the
-    following code:
+    contents of our input text file in the
+    \l{http://doc.trolltech.com/qtextedit.html}{QTextEdit}. This is done with
+    the following code:
 
     \code
     private slots:
@@ -455,12 +463,16 @@
     }
     \endcode
 
-    Basically, we load a text file using QFile, read it with QTextStream, and
-    then display it on \c{textEdit} with \l{QTextEdit::}{setPlainText()}.
+    Basically, we load a text file using
+    \l{http://doc.trolltech.com/qfile.html}{QFile}, read it with
+    \l{http://doc.trolltech.com/qtextstream.html}{QTextStream}, and
+    then display it on \c{textEdit} with
+    \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()}.
 
     For the \c{on_findButton_clicked()} slot, we extract the search string and
-    use the \l{QTextEdit::}{find()} function to look for the search string
-    within the text file. The code snippet below further describes it:
+    use the \l{http://doc.trolltech.com/qtextedit.html#find}{find()} function
+    to look for the search string within the text file. The code snippet below
+    further describes it:
 
     \code
     void TextFinder::on_findButton_clicked()
@@ -902,9 +914,9 @@
             \i \bold{Setting a Breakpoint}
 
     First, we set a breakpoint on the line where we invoke
-    \l{QTextEdit::}{setPlainText()} by clicking between the line number and the
-    window border. Then, select \gui{Start Debugging} from the \gui{Debug} menu
-    or press \key{F5}.
+    \l{http://doc.trolltech.com/qtextedit.html#plainText-prop}{setPlainText()}
+    by clicking between the line number and the window border. Then, select
+    \gui{Start Debugging} from the \gui{Debug} menu or press \key{F5}.
     \endtable
 
     Breakpoints are visible in the \gui{Breakpoints} view, shown below, in
@@ -1138,9 +1150,9 @@
     \previouspage creator-keyboard-shortcuts.html
     \page creator-known-issues.html
 
-    \title Known Issues of Version 0.9 (Technical Preview)
+    \title Known Issues of Version 0.9.1 (Beta)
 
-    There are some known issues with the Technical Preview.
+    There are some known issues with Qt Creator 0.9.1 (Beta).
     The development team is aware of those, there is no need to report them as bug.
 
     \list