diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/aboutqt.doc | 16 | ||||
| -rw-r--r-- | doc/commercialeditions.doc | 170 | ||||
| -rw-r--r-- | doc/html/aboutntqt.html | 13 | ||||
| -rw-r--r-- | doc/html/commercialeditions.html | 161 | ||||
| -rw-r--r-- | doc/html/index.html | 3 | ||||
| -rw-r--r-- | doc/indices.doc | 21 |
6 files changed, 4 insertions, 380 deletions
diff --git a/doc/aboutqt.doc b/doc/aboutqt.doc index c03de7844..6577587e4 100644 --- a/doc/aboutqt.doc +++ b/doc/aboutqt.doc @@ -30,21 +30,7 @@ Qt is supported on the following platforms: \i <b>Embedded</b> -- Linux platforms with framebuffer support. \endlist -Qt is released in different editions: -\list -\i The \link commercialeditions.html <b>TQt Enterprise -Edition\endlink</b> and the \link commercialeditions.html <b>Qt -Professional Edition\endlink</b> 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 <b>TQt Open Source Edition\endlink</b> 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 113862224..000000000 --- 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 <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP - \i <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, - IBM AIX, SGI IRIX and a wide range of others - \i <b>Macintosh</b> -- Mac OS X - \i <b>\link http://www.trolltech.com/products/embedded/index.html -Qt/Embedded\endlink</b> -- 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 -<a href="https://webshop.trolltech.com/cgi-bin/index.cgi">Trolltech -webshop</a>. 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): <strong>(+1) 650-813-1676</strong> - -Phone, Norway office (for others): <strong>+47 2160 4800</strong> - -<table border="1" cellpadding="5" cellspacing="0" width="100%"> - <tr> - <td bgcolor="#a1c410"><b><a name="Chart"></a>Professional/Enterprise Comparison Chart</b></td> - <td width="100" align="center" bgcolor="#a1c410"><b>Professional</b></td> - <td width="100" align="center" bgcolor="#a1c410"><b>Enterprise</b></td> - </tr> - <tr> - <td><b><a href=index.html">TQt Base Modules (Tools, Kernel, - Widgets, Dialogs)</a></b><br> - The platform-independent TQt GUI toolkit and utility classes</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="designer-manual.html"><b>TQt Designer</b></a><br> - Visual TQt GUI builder</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="iconview.html"><b>Iconview module</b></a><br> - Visualization of sets of pixmaps with user interaction.</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="workspace.html"><b>Workspace module</b></a><b><br> - </b>Multiple Document Interface (MDI) support</td> - <td width="100" align="center"><b>X</b></td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="opengl.html"><b>OpenGL 3D Graphics module</b></a><b><br> - </b>Integration of TQt with OpenGL</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="network.html"><b>Network module</b></a><b><br> - </b>Platform-independent classes for sockets, TCP, FTP and asynchronous DNS lookup.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="canvas.html"><b>Canvas module</b></a><br> - Optimized 2D graphics area for visualization, diagrams, etc.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="table.html"><b>Table module</b></a><br> - Flexible and editable table / spreadsheet</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="xml.html"><b>XML module</b></a><br> - Well-formed XML parser with SAX interface and DOM Level 1.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="activentqt.html"><b>ActiveQt extension</b></a><br> - Support for building and hosting ActiveX controls on Windows.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> - <tr> - <td><a href="motif-extension.html"><b>QMotif extension</b></a><br> - Motif co-existence and migration support.</td> - <td width="100" align="center"><br> - </td> - <td width="100" align="center"><b>X</b></td> - </tr> -</table> - -*/ diff --git a/doc/html/aboutntqt.html b/doc/html/aboutntqt.html index be2173f90..ba8e3eec1 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 <li> <b>Macintosh</b> -- Mac OS X <li> <b>Embedded</b> -- Linux platforms with framebuffer support. </ul> -<p> TQt is released in different editions: -<ul> -<li> The <a href="commercialeditions.html"><b>TQt Enterprise -Edition</a></b> and the <a href="commercialeditions.html"><b>TQt -Professional Edition</a></b> 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, <a href="http://www.trolltech.com/pricing.html">Pricing and Availability</a> -page, or contact <a href="mailto:sales@trolltech.com">sales@trolltech.com</a>. The Enterprise Edition offers additional -<a href="modules.html">modules</a> compared to the Professional -Edition. -</ul> +<p> TQt is released in following edition(s): <p> <ul> <li> The <a href="opensourceedition.html"><b>TQt Open Source Edition</a></b> is available for Unix/X11, Macintosh and Embedded Linux. The Open Source Edition diff --git a/doc/html/commercialeditions.html b/doc/html/commercialeditions.html deleted file mode 100644 index 8b4b858c7..000000000 --- a/doc/html/commercialeditions.html +++ /dev/null @@ -1,161 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> -<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/doc/commercialeditions.doc:36 --> -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"> -<title>TQt Commercial Editions</title> -<style type="text/css"><!-- -fn { margin-left: 1cm; text-indent: -1cm; } -a:link { color: #004faf; text-decoration: none } -a:visited { color: #672967; text-decoration: none } -body { background: #ffffff; color: black; } ---></style> -</head> -<body> - -<table border="0" cellpadding="0" cellspacing="0" width="100%"> -<tr bgcolor="#E5E5E5"> -<td valign=center> - <a href="index.html"> -<font color="#004faf">Home</font></a> - | <a href="classes.html"> -<font color="#004faf">All Classes</font></a> - | <a href="mainclasses.html"> -<font color="#004faf">Main Classes</font></a> - | <a href="annotated.html"> -<font color="#004faf">Annotated</font></a> - | <a href="groups.html"> -<font color="#004faf">Grouped Classes</font></a> - | <a href="functions.html"> -<font color="#004faf">Functions</font></a> -</td> -<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>TQt Commercial Editions</h1> - - -<p> The TQt Professional and Enterprise Editions are the commercial -versions of <a href="aboutntqt.html">TQt</a>. -<p> You may only write commercial, proprietary and non-free software if -you have purchased the Professional Edition or the Enterprise -Edition. -<a href="#footnote1"><sup>(1)</sup></a><a name="footnote-call1"></a> -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. -<p> TQt is supported on the following platforms: -<ul> -<li> <b>MS/Windows</b> -- 95, 98, NT 4.0, ME, 2000, and XP -<li> <b>Unix/X11</b> -- Linux, Sun Solaris, HP-UX, Compaq Tru64 UNIX, -IBM AIX, SGI IRIX and a wide range of others -<li> <b>Macintosh</b> -- Mac OS X -<li> <b><a href="http://www.trolltech.com/products/embedded/index.html">TQt/Embedded</a></b> -- Linux platforms with framebuffer support. -</ul> -<p> On Trolltech's web site, you can find <a href="http://www.trolltech.com/products/qt/licensing.html">licensing -information</a> and <a href="http://www.trolltech.com/products/qt/pricing.html">price lists</a> for -TQt Professional Edition, TQt Enterprise Edition, and other Trolltech -products. -<p> To purchase, please visit the -<a href="https://webshop.trolltech.com/cgi-bin/index.cgi">Trolltech -webshop</a>. In the webshop, you can generate a Purchase Order, order -a Quote, or purchase directly using credit card. -<p> For further information and assistance, please contact Trolltech sales: -<p> Email: <a href="mailto:sales@trolltech.com">sales@trolltech.com</a> -<p> Phone, US office (for North America): <strong>(+1) 650-813-1676</strong> -<p> Phone, Norway office (for others): <strong>+47 2160 4800</strong> -<p> <table border="1" cellpadding="5" cellspacing="0" width="100%"> -<tr> -<td bgcolor="#a1c410"><b><a name="Chart"></a>Professional/Enterprise Comparison Chart</b></td> -<td width="100" align="center" bgcolor="#a1c410"><b>Professional</b></td> -<td width="100" align="center" bgcolor="#a1c410"><b>Enterprise</b></td> -</tr> -<tr> -<td><b><a href=index.html">TQt Base Modules (Tools, Kernel, -Widgets, Dialogs)</a></b><br> -The platform-independent TQt GUI toolkit and utility classes</td> -<td width="100" align="center"><b>X</b></td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="designer-manual.html"><b>TQt Designer</b></a><br> -Visual TQt GUI builder</td> -<td width="100" align="center"><b>X</b></td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="iconview.html"><b>Iconview module</b></a><br> -Visualization of sets of pixmaps with user interaction.</td> -<td width="100" align="center"><b>X</b></td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="workspace.html"><b>Workspace module</b></a><b><br> -</b>Multiple Document Interface (MDI) support</td> -<td width="100" align="center"><b>X</b></td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="opengl.html"><b>OpenGL 3D Graphics module</b></a><b><br> -</b>Integration of TQt with OpenGL</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="network.html"><b>Network module</b></a><b><br> -</b>Platform-independent classes for sockets, TCP, FTP and asynchronous DNS lookup.</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="canvas.html"><b>Canvas module</b></a><br> -Optimized 2D graphics area for visualization, diagrams, etc.</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="table.html"><b>Table module</b></a><br> -Flexible and editable table / spreadsheet</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="xml.html"><b>XML module</b></a><br> -Well-formed XML parser with SAX interface and DOM Level 1.</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="activentqt.html"><b>ActiveTQt extension</b></a><br> -Support for building and hosting ActiveX controls on Windows.</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -<tr> -<td><a href="motif-extension.html"><b>TQMotif extension</b></a><br> -<a href="motif-extension.html#Motif">Motif</a> co-existence and migration support.</td> -<td width="100" align="center"><br> -</td> -<td width="100" align="center"><b>X</b></td> -</tr> -</table> -<p> -<hr> -<ol> <li><a name="footnote1"></a> - -If you want to develop free/open source software for -release using a recognized open source license you can use the -<a href="opensourceedition.html">TQt Open Source Edition</a>. - <a href="#footnote-call1">Back...</a></ol> -</hr> -<!-- eof --> -<p><address><hr><div align=center> -<table width=100% cellspacing=0 border=0><tr> -<td>Copyright © 2007 -<a href="troll.html">Trolltech</a><td align=center><a href="trademarks.html">Trademarks</a> -<td align=right><div align=right>TQt 3.3.8</div> -</table></div></address></body> -</html> diff --git a/doc/html/index.html b/doc/html/index.html index d5fb8cc00..366892e03 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -39,7 +39,7 @@ body { background: #ffffff; color: black; } <table cellpadding=2 cellspacing=1 border=0 width="100%" bgcolor="#e5e5e5"> <tr bgcolor="white"><td colspan=3 align="center"><b>Notice</b>: This edition is for the development of <a href="opensourceedition.html">Free and Open -Source</a> software only; see <a href="commercialeditions.html">Commercial Editions</a>.</td></tr> +Source</a> software only.</td></tr> <tr> @@ -77,7 +77,6 @@ Solutions</a> <td valign="top"> <ul> <li> <a href="aboutntqt.html">About TQt</a> -<li> <a href="commercialeditions.html">Commercial Editions</a> <li> <a href="opensourceedition.html">Open Source Edition</a> <li> <a href="troll.html">About Trolltech</a> </ul> diff --git a/doc/indices.doc b/doc/indices.doc index 140dc073e..4e5ac260d 100644 --- a/doc/indices.doc +++ b/doc/indices.doc @@ -39,29 +39,11 @@ /*! \page index.html -\if defined(commercial) -\title TQt Reference Documentation (Commercial Edition) -\endif -\if defined(noncommercial) -\title TQt Reference Documentation (Non-Commercial Edition) -\endif -\if !defined(commercial) && !defined(noncommercial) \title TQt Reference Documentation (Open Source Edition) -\endif <table cellpadding=2 cellspacing=1 border=0 width="100%" bgcolor="#e5e5e5"> -\if !defined(commercial) && !defined(noncommercial) <tr bgcolor="white"><td colspan=3 align="center"><b>Notice</b>: This edition is for the development of \link opensourceedition.html Free and Open -Source\endlink software only; see \link commercialeditions.html -Commercial Editions\endlink.</td></tr> -\endif -\if defined(noncommercial) -<tr bgcolor="white"><td colspan=3 align="center"><b>Notice</b>: This -edition is for the development of non-commercial software in -accordance with the license you agreed to when you installed the -software from the CD; see also \link -commercialeditions.html Commercial Editions\endlink.</td></tr> -\endif +Source\endlink software only.</td></tr> <tr> <th bgcolor="#a2c511" width="33%"> Qt Community @@ -97,7 +79,6 @@ Solutions\endlink <td valign="top"> \list \i \link aboutntqt.html About Qt\endlink -\i \link commercialeditions.html Commercial Editions\endlink \i \link opensourceedition.html Open Source Edition\endlink \i \link troll.html About Trolltech\endlink \endlist |