summaryrefslogtreecommitdiffstats
path: root/doc/src/legal
diff options
context:
space:
mode:
authorCasper van Donderen <casper.vandonderen@nokia.com>2011-11-10 09:59:15 (GMT)
committerCasper van Donderen <casper.vandonderen@nokia.com>2011-11-10 09:59:15 (GMT)
commit68f32a3e4f447f86cad7f1fddbd566227a7bd00d (patch)
tree0efcc617c227d07c5d61de746f77811de1cde54c /doc/src/legal
parent98e14cd4b62e57609ee67030845a0740d8ba01ab (diff)
downloadQt-68f32a3e4f447f86cad7f1fddbd566227a7bd00d.zip
Qt-68f32a3e4f447f86cad7f1fddbd566227a7bd00d.tar.gz
Qt-68f32a3e4f447f86cad7f1fddbd566227a7bd00d.tar.bz2
Update supported platforms and remove commercial page.
The supported platforms page conatined a lot of platforms that are untested for Qt 4.8, so those are removed. The platform notes had not been updated since 2009 and were therefore severely outdated. Nokia does not provide a commercial edition of Qt anymore. A user can find the link to purchasing Qt through the Qt Developer Network at http://developer.qt.nokia.com
Diffstat (limited to 'doc/src/legal')
-rw-r--r--doc/src/legal/commercialeditions.qdoc82
1 files changed, 0 insertions, 82 deletions
diff --git a/doc/src/legal/commercialeditions.qdoc b/doc/src/legal/commercialeditions.qdoc
deleted file mode 100644
index 9d7ac6b..0000000
--- a/doc/src/legal/commercialeditions.qdoc
+++ /dev/null
@@ -1,82 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the documentation of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:FDL$
-** 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.
-**
-** 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.
-**
-**
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-/*!
- \page commercialedition.html
- \title Qt Commercial Edition
- \ingroup licensing
- \brief Information about the license and features of the Commercial Edition.
-
- Qt can be used to develop closed source software if you obtain a commercial
- license.
-
- If you want to develop Free or Open Source software for release using a recognized
- Open Source license, you can use the \l{Open Source Versions of Qt}.
-
- The following table is a summary of the licenses under which Qt is made available.
-
- \table
- \row \o \bold{Qt Commercial Developer License}
- \o The Qt Commercial Developer License is the appropriate version to use for the
- development of proprietary and/or commercial software where the developer does not
- wish to share or distribute any source code of the Qt libraries or otherwise comply
- with the terms of the \l{GNU Lesser General Public License (LGPL)}{GNU Lesser General
- Public License version 2.1} or \l{GNU General Public License (GPL)}{GNU GPL version
- 3.0}.
- \row \o \bold{Qt GNU LGPL v. 2.1}
- \o This version of Qt is appropriate for the development of Qt applications
- (proprietary or open source) provided you can comply with the terms and conditions
- contained in the \l{GNU Lesser General Public License (LGPL)}{GNU LGPL version 2.1}.
- \row \o \bold{Qt GNU GPL v. 3.0}
- \o This version of Qt is appropriate for the development of Qt applications where
- you wish to use such applications in combination with software subject to the terms
- of the GNU General Public License version 3.0 or where you are otherwise willing to
- comply with the terms of the
- \l{GNU General Public License (GPL)}{GNU General Public License version 3.0}.
- \endtable
-
- Please see the \l{Supported Platforms}{list of supported
- platforms} for up-to-date information about the various platforms
- and compilers that Qt supports.
-
- On the Qt Web site, you can find a
- \l{Qt Licensing Overview} and information on \l{Qt License Pricing}
- for commercial editions of Qt and other Qt-related products.
-
- \section1 Purchasing and Sales Information
-
- To purchase, please visit the \l{How to Order}{online order form}.
-
- For further information and assistance, please contact the Qt sales team
- via one of the following channels:
-
- \table
- \row \o Web: \o \bold{http://qt.nokia.com/contact}
- \row \o Phone, U.S. office (for sales in North America): \o \bold{1-408-220-9020}
- \row \o Phone, Norway office (for sales in the rest of the world): \o \bold{+47 21 60 48 00}
- \endtable
-*/