Changeset 846 for trunk/doc/src/platforms/emb-install.qdoc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• doc/src/platforms/emb-install.qdoc (modified) (6 diffs)

trunk/doc/src/platforms/emb-install.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:FDL$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in a
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** 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.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 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 the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** 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.
 **
 ** If you have questions regarding the use of this file, please contact
@@ -43 +29 @@
     \page qt-embedded-install.html
 
-    \title Installing Qt on Embedded Linux
+    \title Installing Qt for Embedded Linux
     \ingroup qt-embedded-linux
     \ingroup installation
-    \brief How to install Qt on Embedded Linux.
+    \brief How to install Qt for Embedded Linux.
 
     This document describes how to install \l{Qt for Embedded Linux} in your
@@ -90 +76 @@
 
     Note that by default, \l{Qt for Embedded Linux} is configured for
-    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.6.3}
+    installation in the \c{/usr/local/Trolltech/QtEmbedded-4.7.2}
     directory, but this can be changed by using the \c{-prefix}
     option. Alternatively, the \c{-prefix-install} option can be used
@@ -150 +136 @@
     For compilers that do not support \c rpath you must also extend
     the \c LD_LIBRARY_PATH environment variable to include
-    \c /usr/local/Trolltech/QtEmbedded-4.6.3/lib. Note that on Linux
+    \c /usr/local/Trolltech/QtEmbedded-4.7.2/lib. Note that on Linux
     with GCC, this step is not needed.
 
@@ -167 +153 @@
 
     Note that the virtual framebuffer requires a Qt for X11
-    installation. See \l {Installing Qt on X11 Platforms} for details.
+    installation. See \l {Installing Qt for X11 Platforms} for details.
 
     The Linux framebuffer, on the other hand, is enabled by default on