Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / doc / src / declarative / advtutorial.qdoc

diff --git a/doc/src/declarative/advtutorial.qdoc b/doc/src/declarative/advtutorial.qdoc
index 263c78b..d78e2de 100644 (file)
--- a/doc/src/declarative/advtutorial.qdoc
+++ b/doc/src/declarative/advtutorial.qdoc
@@ -1,32 +1,33 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the documentation of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:FDL$
-** No Commercial Usage
-** This file contains pre-release code and may not be distributed.
-** You may use this file in accordance with the terms and conditions
-** contained in the Technology Preview License Agreement accompanying
-** this package.
-**
 ** 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.
+** Foundation and appearing in the file included in the packaging of
+** this file.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms
+** and conditions contained in a signed written agreement between you
+** and Nokia.
+**
+**
+**
+**
 **
-** If you have questions regarding the use of this file, please contact
-** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
 
 /*!
 \page qml-advtutorial.html
+\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial
 \brief A more advanced tutorial, showing how to use QML to create a game.
 \nextpage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
@@ -35,8 +36,8 @@ This tutorial walks step-by-step through the creation of a full application usin
 It assumes that you already know the basics of QML (for example, from reading the
 \l{QML Tutorial}{simple tutorial}). 
 
-In this tutorial we write a game, \e {Same Game}, based on the Same Game application
-included in the declarative \c demos directory, which looks like this:
+In this tutorial we write a game, \i {Same Game}, based on the Same Game application
+included in the declarative \c examples directory, which looks like this:
 
 \image declarative-samegame.png
 
@@ -64,6 +65,7 @@ directory.
 
 /*!
 \page qml-advtutorial1.html
+\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial
@@ -133,6 +135,7 @@ elements to get started. Next, we will populate the game canvas with some blocks
 
 /*!
 \page qml-advtutorial2.html
+\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 2 - Populating the Game Canvas
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 1 - Creating the Game Canvas and Blocks
@@ -208,6 +211,7 @@ Now, we have a screen of blocks, and we can begin to add the game mechanics.
 
 /*!
 \page qml-advtutorial3.html
+\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 3 - Implementing the Game Logic
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 2 - Populating the Game Canvas
@@ -296,6 +300,7 @@ until the next chapter - where your application becomes alive!
 
 /*!
 \page qml-advtutorial4.html
+\inqmlmodule QtQuick 2
 \title QML Advanced Tutorial 4 - Finishing Touches
 \contentspage QML Advanced Tutorial
 \previouspage QML Advanced Tutorial 3 - Implementing the Game Logic
@@ -423,7 +428,7 @@ Here is the \c saveHighScore() function in \c samegame.js:
 
 First we call \c sendHighScore() (explained in the section below) if it is possible to send the high scores to an online database.
 
-Then, we use the \l{Offline Storage API} to maintain a persistent SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabase() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrieval, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
+Then, we use the \l{Offline Storage API} to maintain a persistent SQL database unique to this application. We create an offline storage database for the high scores using \c openDatabaseSync() and prepare the data and SQL query that we want to use to save it. The offline storage API uses SQL queries for data manipulation and retrieval, and in the \c db.transaction() call we use three SQL queries to initialize the database (if necessary), and then add to and retrieve high scores. To use the returned data, we turn it into a string with one line per row returned, and show a dialog containing that string.
 
 This is one way of storing and displaying high scores locally, but certainly not the only way. A more complex alternative would be to create a high score dialog component, and pass it the results for processing and display (instead of reusing the \c Dialog). This would allow a more themeable dialog that could better present the high scores. If your QML is the UI for a C++ application, you could also have passed the score to a C++ function to store it locally in a variety of ways, including a simple format without SQL or in another SQL database.
 
@@ -461,5 +466,5 @@ By following this tutorial you've seen how you can write a fully functional appl
 \endlist
 
 There is so much more to learn about QML that we haven't been able to cover in this tutorial. Check out all the
-demos and examples and the \l {Qt Quick}{documentation} to see all the things you can do with QML!
+examples and the \l {Qt Quick}{documentation} to see all the things you can do with QML!
 */