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

Timestamp:

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

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/examples/arrowpad.qdoc (modified) (5 diffs)

trunk/doc/src/examples/arrowpad.qdoc

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -141 +141 @@
     environment variable, for example. Notice that the use of a naming
     convention that incorporates the locale for \c .qm message files,
-    (and \c .ts files), makes it easy to implement choosing the
+    (and  files), makes it easy to implement choosing the
     translation file according to locale.
 
-    If there is no \c .qm message file for the locale chosen the original
+    If there is no  message file for the locale chosen the original
     source text will be used and no error raised.
 
@@ -195 +195 @@
 
     We have to convert the \c tt1_fr.ts and \c tt1_nl.ts translation source
-    files into \c .qm files. We could use \e {Qt Linguist} as we've done
+    files into  files. We could use \e {Qt Linguist} as we've done
     before; however using the command line tool \c lrelease ensures that
-    \e all the \c .qm files for the application are created without us
+    \e all the  files for the application are created without us
     having to remember to load and \gui File|Release each one
     individually from \e {Qt Linguist}.