Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

bin/gdbmacros/gdbmacros.cpp

-/****************************************************************************
+/***************************************************************************
+**
 ** This file is part of Qt Creator
 **
-** Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies).*
+** Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies).
+**
+** Contact:  Qt Software Information (qt-info@nokia.com)
+**
 **
-** Contact:  Qt Software Information (qt-info@nokia.com)**
+** Non-Open Source Usage
 **
-** No Commercial Usage
-** This file contains pre-release code and may only be used for evaluation
-** and testing purposes.  It may not be used for commercial development.  You
-** may use this file in accordance with the terms and conditions contained in
-** the either Technology Preview License Agreement or the Beta Release
-** License Agreement.
+** Licensees may use this file in accordance with the Qt Beta Version
+** License Agreement, Agreement version 2.2 provided with the Software or,
+** alternatively, in accordance with the terms contained in a written
+** agreement between you and Nokia.
 **
 ** GNU General Public License Usage
+**
 ** Alternatively, this file may be used under the terms of the GNU General
 ** Public License versions 2.0 or 3.0 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the packaging
 ** of this file.  Please review the following information to ensure GNU
 ** General Public Licensing requirements will be met:
+**
 ** http://www.fsf.org/licensing/licenses/info/GPLv2.html and
-** http://www.gnu.org/copyleft/gpl.html.   In addition, as a special
-** exception, Nokia gives you certain additional rights. These rights are
-** described in the Nokia Qt GPL Exception version 1.2, included in the file
-** GPL_EXCEPTION.txt in this package.
+** http://www.gnu.org/copyleft/gpl.html.
 **
-** If you have questions regarding the use of this file, please contact Nokia
-** at qt-info@nokia.com
-****************************************************************************/
-
-// {[(
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt GPL Exception
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
+**
+***************************************************************************/
 
 #include <qglobal.h>
 
@@ -2497,6 +2498,3 @@ void qDumpObjectData440(
         qDebug() << "Unsupported protocol version" << protocolVersion;
     }
 }
-
-
-// ]})

doc/example/textfinder/main.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

doc/example/textfinder/textfinder.cpp

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

doc/example/textfinder/textfinder.h

@@ -27,7 +27,7 @@
 **
 ** In addition, as a special exception, Nokia gives you certain additional
 ** rights. These rights are described in the Nokia Qt GPL Exception
-** version 1.2, included in the file GPL_EXCEPTION.txt in this package.
+** version 1.3, included in the file GPL_EXCEPTION.txt in this package.
 **
 ***************************************************************************/
 

doc/qtcreator.qdoc

 /*!
     \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
@@ -20,7 +20,8 @@
 
     \table
     \row
-    \o \inlineimage qtcreator.png
+    \o \inlineimage qtcreator-screenshots.png
+    \row
     \o Qt Creator includes a wide range of useful features. Among them are:
     \list 1
         \o \bold{Smart Code Editor}: The code editor provides syntax
@@ -54,7 +55,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 +95,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 +171,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
 
@@ -284,16 +285,16 @@
 	    \i \inlineimage qtcreator-new-project.png
             \i \bold{Creating a New Project}
 
-    To create a new project, select \gui{New Project} from the \gui{File} menu.
-    You can create one of the following three projects:
+        To create a new project, select \gui{New Project} from the \gui{File} menu.
+        You can create one of the following three projects:
     
-    \list
-        \o Qt4 Console Application