diff --git a/doc/aboutqt.doc b/doc/aboutqt.doc index c03de784..6577587e 100644 --- a/doc/aboutqt.doc +++ b/doc/aboutqt.doc @@ -30,21 +30,7 @@ Qt is supported on the following platforms: \i Embedded -- Linux platforms with framebuffer support. \endlist -Qt is released in different editions: -\list -\i The \link commercialeditions.html TQt Enterprise -Edition\endlink and the \link commercialeditions.html Qt -Professional Edition\endlink provide for commercial software -development. They permit traditional commercial software distribution -and include free upgrades and Technical Support. For the latest -prices, see the Trolltech web site, \link -http://www.trolltech.com/pricing.html Pricing and Availability\endlink -page, or contact \link mailto:sales@trolltech.com -sales@trolltech.com\endlink. The Enterprise Edition offers additional -\link modules.html modules \endlink compared to the Professional -Edition. -\endlist - +Qt is released in following edition(s): \list \i The \link opensourceedition.html TQt Open Source Edition\endlink is available for Unix/X11, Macintosh and Embedded Linux. The Open Source Edition diff --git a/doc/commercialeditions.doc b/doc/commercialeditions.doc deleted file mode 100644 index 11386222..00000000 --- a/doc/commercialeditions.doc +++ /dev/null @@ -1,170 +0,0 @@ -/**************************************************************************** -** -** Documentation on the commercial editions -** -** Copyright (C) 2005-2008 Trolltech ASA. All rights reserved. -** -** This file is part of the TQt GUI Toolkit. -** -** This file may be used under the terms of the GNU General -** Public License versions 2.0 or 3.0 as published by the Free -** Software Foundation and appearing in the files LICENSE.GPL2 -** and LICENSE.GPL3 included in the packaging of this file. -** Alternatively you may (at your option) use any later version -** of the GNU General Public License if such license has been -** publicly approved by Trolltech ASA (or its successors, if any) -** and the KDE Free TQt Foundation. -** -** Please review the following information to ensure GNU General -** Public Licensing requirements will be met: -** http://trolltech.com/products/qt/licenses/licensing/opensource/. -** If you are unsure which license is appropriate for your use, please -** review the following information: -** http://trolltech.com/products/qt/licenses/licensing/licensingoverview -** or contact the sales department at sales@trolltech.com. -** -** This file may be used under the terms of the Q Public License as -** defined by Trolltech ASA and appearing in the file LICENSE.QPL -** included in the packaging of this file. Licensees holding valid Qt -** Commercial licenses may use this file in accordance with the Qt -** Commercial License Agreement provided with the Software. -** -** This file is provided "AS IS" with NO WARRANTY OF ANY KIND, -** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted -** herein. -** -**********************************************************************/ - -/*! \page commercialeditions.html - -\title TQt Commercial Editions - -The TQt Professional and Enterprise Editions are the commercial -versions of \link aboutntqt.html Qt\endlink. - -You may only write commercial, proprietary and non-free software if -you have purchased the Professional Edition or the Enterprise -Edition. -\footnote -If you want to develop free/open source software for -release using a recognized open source license you can use the -\link opensourceedition.html TQt Open Source Edition\endlink. -\endfootnote -The purchase of a TQt commercial edition includes technical support and -upgrades. TQt for Microsoft Windows is only available in the -Professional and Enterprise Editions. - -Qt is supported on the following platforms: -\list - \i MS/Windows -- 95, 98, NT 4.0, ME, 2000, and XP - \i Unix/X11 -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, - IBM AIX, SGI IRIX and a wide range of others - \i Macintosh -- Mac OS X - \i \link http://www.trolltech.com/products/embedded/index.html -Qt/Embedded\endlink -- Linux platforms with framebuffer support. -\endlist - -On Trolltech's web site, you can find \link -http://www.trolltech.com/products/qt/licensing.html licensing -information\endlink and \link -http://www.trolltech.com/products/qt/pricing.html price lists\endlink for -Qt Professional Edition, TQt Enterprise Edition, and other Trolltech -products. - -To purchase, please visit the -Trolltech -webshop. In the webshop, you can generate a Purchase Order, order -a Quote, or purchase directly using credit card. - -For further information and assistance, please contact Trolltech sales: - -Email: \link mailto:sales@trolltech.com sales@trolltech.com\endlink - -Phone, US office (for North America): (+1) 650-813-1676 - -Phone, Norway office (for others): +47 2160 4800 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Professional/Enterprise Comparison ChartProfessionalEnterprise
TQt Base Modules (Tools, Kernel, - Widgets, Dialogs)
- The platform-independent TQt GUI toolkit and utility classes		XX
TQt Designer
- Visual TQt GUI builder		XX
Iconview module
- Visualization of sets of pixmaps with user interaction.		XX
Workspace module
- Multiple Document Interface (MDI) support		XX
OpenGL 3D Graphics module
- Integration of TQt with OpenGL
- 		X
Network module
- Platform-independent classes for sockets, TCP, FTP and asynchronous DNS lookup.
- 		X
Canvas module
- Optimized 2D graphics area for visualization, diagrams, etc.
- 		X
Table module
- Flexible and editable table / spreadsheet
- 		X
XML module
- Well-formed XML parser with SAX interface and DOM Level 1.
- 		X
ActiveQt extension
- Support for building and hosting ActiveX controls on Windows.
- 		X
QMotif extension
- Motif co-existence and migration support.
- 		X
- -*/ diff --git a/doc/html/aboutntqt.html b/doc/html/aboutntqt.html index be2173f9..ba8e3eec 100644 --- a/doc/html/aboutntqt.html +++ b/doc/html/aboutntqt.html @@ -52,18 +52,7 @@ IBM AIX, SGI IRIX and a wide range of others
  • Macintosh -- Mac OS X
  • Embedded -- Linux platforms with framebuffer support. -

    TQt is released in different editions: -

    +

    TQt is released in following edition(s):