Changeset 561 for trunk/doc/src/examples/drilldown.qdoc

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/examples/drilldown.qdoc (modified) (6 diffs)

trunk/doc/src/examples/drilldown.qdoc

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the documentation of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -51 +51 @@
 
     When running the example application, a user can retrieve
-    information about each of Nokia's Qt Software offices by clicking the
+    information about each of Nokia's Qt offices by clicking the
     corresponding image. The application pops up an information window
     displaying the data, and allows the users to alter the location
@@ -295 +295 @@
     The QGraphicsView class is part of the \l {The Graphics View
     Framework} which we will use to display the images of Nokia's
-    Qt Software offices. To be able to respond to user interaction;
+    Qt offices. To be able to respond to user interaction;
     i.e., showing the
     appropriate information window whenever the user clicks one of the
@@ -390 +390 @@
     is hovering over the image (by default, no items accept hover
     events). Please see the \l{The Graphics View Framework}
-    documentation and the
-    \l{Qt Examples#Graphics View}{Graphics View examples} for more
-    details.
+    documentation and the \l{Graphics View Examples} for more details.
 
     \snippet examples/sql/drilldown/view.cpp 5