Changeset 846 for trunk/doc/src/qt-webpages.qdoc
- Timestamp:
- May 5, 2011, 5:36:53 AM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk
- Property svn:mergeinfo changed
/branches/vendor/nokia/qt/4.7.2 (added) merged: 845 /branches/vendor/nokia/qt/current merged: 844 /branches/vendor/nokia/qt/4.6.3 removed
- Property svn:mergeinfo changed
-
trunk/doc/src/qt-webpages.qdoc
r651 r846 1 1 /**************************************************************************** 2 2 ** 3 ** Copyright (C) 201 0Nokia Corporation and/or its subsidiary(-ies).3 ** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). 4 4 ** All rights reserved. 5 5 ** Contact: Nokia Corporation (qt-info@nokia.com) … … 7 7 ** This file is part of the documentation of the Qt Toolkit. 8 8 ** 9 ** $QT_BEGIN_LICENSE: LGPL$9 ** $QT_BEGIN_LICENSE:FDL$ 10 10 ** Commercial Usage 11 11 ** Licensees holding valid Qt Commercial licenses may use this file in 12 12 ** accordance with the Qt Commercial License Agreement provided with the 13 ** Software or, alternatively, in accordance with the terms contained in 14 ** a written agreement between you and Nokia. 15 ** 16 ** GNU Lesser General Public License Usage 17 ** Alternatively, this file may be used under the terms of the GNU Lesser 18 ** General Public License version 2.1 as published by the Free Software 19 ** Foundation and appearing in the file LICENSE.LGPL included in the 20 ** packaging of this file. Please review the following information to 21 ** ensure the GNU Lesser General Public License version 2.1 requirements 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 23 ** 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 ** 28 ** GNU General Public License Usage 29 ** Alternatively, this file may be used under the terms of the GNU 30 ** General Public License version 3.0 as published by the Free Software 31 ** Foundation and appearing in the file LICENSE.GPL included in the 32 ** packaging of this file. Please review the following information to 33 ** ensure the GNU General Public License version 3.0 requirements will be 34 ** met: http://www.gnu.org/copyleft/gpl.html. 13 ** Software or, alternatively, in accordance with the terms contained in a 14 ** written agreement between you and Nokia. 15 ** 16 ** GNU Free Documentation License 17 ** Alternatively, this file may be used under the terms of the GNU Free 18 ** Documentation License version 1.3 as published by the Free Software 19 ** Foundation and appearing in the file included in the packaging of this 20 ** file. 35 21 ** 36 22 ** If you have questions regarding the use of this file, please contact … … 61 47 62 48 /*! 63 \externalpage http://qt.nokia.com/ products/add-on-products/add-on-products/64 \title Third-Party Tools49 \externalpage http://qt.nokia.com/services-partners/partners/partner-directory 50 \title Partner Directory 65 51 */ 66 52 … … 156 142 157 143 /*! 158 \externalpage http:// qt.nokia.com/doc/supported-platforms.html144 \externalpage http://doc.qt.nokia.com/supported-platforms.html 159 145 \title Platform Support Policy 160 146 */ … … 166 152 167 153 /*! 168 \externalpage http:// qt.nokia.com/doc/supported-platforms.html154 \externalpage http://doc.qt.nokia.com/supported-platforms.html 169 155 \title Qt 4 Platforms Overview 170 156 */ … … 176 162 177 163 /*! 178 \externalpage http:// qt.nokia.com/doc/qq/164 \externalpage http://doc.qt.nokia.com/qq/ 179 165 \title Qt Quarterly 180 166 */ … … 196 182 197 183 /*! 198 \externalpage http:// qt.nokia.com/doc/qtcanvas184 \externalpage http://doc.qt.nokia.com/qtcanvas 199 185 \title QtCanvas 200 186 */ … … 216 202 217 203 /*! 218 \externalpage http://labs.qt.nokia.com/gitweb?p=qtestlib-tools;a=summary219 \title qtestlib-tools220 */221 222 /*!223 204 \externalpage http://qt.nokia.com/products/library/modular-class-library#info_scripting 224 205 \title Qt Script for Applications (QSA) … … 249 230 \title Public Qt Repository 250 231 */ 232 233 /*! 234 \externalpage http://get.qt.nokia.com/nokiasmartinstaller/ 235 \title Smart Installer 236 */ 237 238 /*! 239 \externalpage http://qt.gitorious.org/qt-labs/qtestlib-tools 240 \title qtestlib-tools 241 */ 242 243 /*! 244 \externalpage http://labs.qt.nokia.com 245 \title Qt Labs 246 */
Note:
See TracChangeset
for help on using the changeset viewer.