summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: Replaced all "#location" with "file.xml#location"Martin Smith2010-11-191-10/+29
|
* qdoc: Changed some outputclass attributes.Martin Smith2010-11-101-2/+4
|
* qdoc: Removed unused code.Martin Smith2010-11-102-78/+0
|
* <?xml version="1.0" encoding="UTF-8"?>Martin Smith2010-11-092-58/+11
| | | | | | | | | | | | | | | | | | | | | | | | <!DOCTYPE topic PUBLIC "-//OASIS//DTD DITA Topic//EN" "dtd/topic.dtd"> <!--commercialeditions.qdoc--> <topic id="id-686f5cb9-31b5-470e-97e6-7b6f8d47e4e8" outputclass="page"> <title>Qt Commercial Edition</title> <shortdesc>Information about the license and features of the Commercial Edition.</shortdesc> <body> <section id="id-3680bc34-a532-447a-b782-1c901e84f41e" outputclass="details"> <p outputclass="brief">Information about the license and features of the Commercial Edition.</p> <p>Qt can be used to develop closed source software if you obtain a commercial license.</p> <p>If you want to develop Free or Open Source software for release using a recognized Open Source license, you can use the <xref href="opensourceedition.xml">Open Source Versions of Qt</xref>.</p> <p>The table below summarizes the differences between the two commercial editions:</p> <p>Please see the <xref href="supported-platforms.xml">list of supported platforms</xref> for up-to-date information about the various platforms and compilers that Qt supports.</p> <p>On the Qt web site, you can find a <xref href="http://qt.nokia.com/products/licensing/">Qt Licensing Overview</xref> and information on <xref href="http://qt.nokia.com/products/pricing/">Qt License Pricing</xref> for commercial editions of Qt and other Qt-related products.</p> <p>To purchase, please visit the <xref href="http://qt.nokia.com/about/contact-us">online order form</xref>.</p> <p>For further information and assistance, please contact Qt sales.</p> <p>Web: http://qt.nokia.com/contact.</p> <p>Phone, U.S&amp;#x2e; office (for North America): <b>1-650-813-1676</b>.</p> <p>Phone, Norway office (for the rest of the world): <b>+47 21 60 48 00</b>.</p> </section> </body> </topic>
* qdoc: Removed unused code.Martin Smith2010-11-092-119/+0
|
* qdoc: Second pass at generating a map.Martin Smith2010-11-071-0/+1
| | | | | | | | | | All the files are there now. It outputs each element as a <topicref>. We might want to output the entries for C++ classes, namespaces, and QML classes differently. But the validator is able to use this map to validate everything, and there are no errors. So until we get further instructions, this is it. Task-number: QTBUG-14981
* qdoc: First pass at generating a map.Martin Smith2010-11-053-5/+32
| | | | | | | Some files are missing, and I don't know if the syntax is complete. But it's a start. Task-number: QTBUG-14981
* qdoc: Added the <related-links> element to the <topic>Martin Smith2010-11-042-2/+59
| | | | | | | This contains the next, previous, and start links for pages that have them. Task-number: QTBUG-14980
* doc: Corrections to linking errors in the docs.Martin Smith2010-11-014-6/+27
|
* qdoc: Don't put classes that have empty doc in hierarchy.Martin Smith2010-10-292-15/+4
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-282-252/+89
| | | | | | | | The obsolete and Qt3 support files no longer exist, so all the references to them had to be cleaned up, and the elements that were formerly in those files had to be included in the class, namespace, or header file with the appropriate outputclass attr.
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-281-6/+18
| | | | Fixed some \table problems as well.
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-271-0/+3
|
* doc: Fixed some DITA XML validation errors.Martin Smith2010-10-271-2/+1
| | | | No <br> elements allowed.
* doc: Fixed some DITA XML validation errors.Martin Smith2010-10-271-7/+6
| | | | No links in the <title> text.
* doc: Fixed some DITA XML validation errors.Martin Smith2010-10-271-9/+6
| | | | These were in the compact list.
* doc: Fixed some DITA XML validation errors.Martin Smith2010-10-263-36/+34
| | | | Also fixed a bug in qdoc3 for html generation.
* doc: Fixed some DITA XML validation errors.Martin Smith2010-10-251-4/+10
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-253-2/+13
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-251-16/+4
|
* qdoc: Output the \qmlclass as a <cxxClass>.Martin Smith2010-10-231-4/+151
| | | | Still more work to do here to make the detail sections correct.
* qdoc: Output the \headerfile as a <cxxClass>.Martin Smith2010-10-222-157/+299
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-201-4/+3
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-201-0/+3
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-201-4/+18
|
* qdoc: Fixed some DITA XML validation errors.Martin Smith2010-10-205-102/+108
|
* qdoc: Fixed <p> inside of <p> for legalese text.Martin Smith2010-10-182-6/+17
|
* qdoc: Added extraneous enum Definition File elementsMartin Smith2010-10-182-150/+21
| | | | Removed bread crumb generator from DITA XML generator.
* qdoc: Changed GUIDs from "{xxxxxx}" to "id-xxxxxxx".Martin Smith2010-10-185-34/+16
|
* qdoc: Fixed invalid element nesting in some <topic> elements.Martin Smith2010-10-151-26/+41
|
* qdoc: Included file path as small-subtitle for example source files.Martin Smith2010-10-141-1/+7
|
* qdoc: Fixed bug where cpp and h files not copied for examples.Martin Smith2010-10-141-2/+14
|
* Merge branch 'mimir' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into mimirMartin Smith2010-10-131-5/+12
|\
| * Merge branch '4.7' into mimirMorten Engvoldsen2010-10-131-5/+12
| |\
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-111-5/+12
| | |\
| | | * Designer: Fix a crash when copying empty page-based containers.Friedemann Kleint2010-10-111-5/+12
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-14208
* | | | qdoc: Fix const problem.Martin Smith2010-10-131-2/+2
|/ / /
* | | Merge branch '4.7' into mimirMorten Engvoldsen2010-10-0918-413/+372
|\ \ \ | |/ /
| * | Merge branch '4.7-upstream' into 4.7-docA-Team2010-10-0813-407/+199
| |\ \ | | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0713-407/+199
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (26 commits) Live texture updates to meegographicssystem helper. Live texture updates to meegographicssystem plugin. Revert the integration of the merge request 2286. Fix text rendering in GL when using the broken-fbo-fallback ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions Fix compilation Code cleaning with the merge request 2286 Fix a pending issue with the merge request 2286 Doc: fix description of the expected behavior for QGraphicsItem::cursor Fixed the build error in qtconfig Resolved a little code style issue in qtconfig Renamed controls in qtconfig's MainWindow Removed inheritance from UI file in qtconfig's MainWindow Fixed a bug and resolved some translation issues in qtconfig Fixed some problems in qtconfig's PreviewWidget Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced Replaced the unnecessary include with declaration Resolved some code style issues and fixed the broken copyright year Finally removed the qtconfig dependency from qt3support Modified previewwidget's ui file in qtconfig ...
| | | * Live texture updates to meegographicssystem helper.Michael Dominic K2010-10-0711-406/+197
| | | | | | | | | | | | | | | | | | | | Merge-request: 848 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | | * Revert the integration of the merge request 2286.Benjamin Poulain2010-10-0723-1496/+2798
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The merge request 2286 will be integrated in master. This should let an angry developer calm down and resume his work.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-10-0724-2798/+1497
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (22 commits) ActiveQt: also make the designer plugin for qaxwidget build in the opensource versions Fix compilation Code cleaning with the merge request 2286 Fix a pending issue with the merge request 2286 Doc: fix description of the expected behavior for QGraphicsItem::cursor Fixed the build error in qtconfig Resolved a little code style issue in qtconfig Renamed controls in qtconfig's MainWindow Removed inheritance from UI file in qtconfig's MainWindow Fixed a bug and resolved some translation issues in qtconfig Fixed some problems in qtconfig's PreviewWidget Removed the inheritance from ui file in qtconfig's PaletteEditorAdvanced Replaced the unnecessary include with declaration Resolved some code style issues and fixed the broken copyright year Finally removed the qtconfig dependency from qt3support Modified previewwidget's ui file in qtconfig Fixed some code style issues in qtconfig Refactored the MainWindow in qtconfig Refactored PaletteEditorAdvanced in qtconfig Removed more legacy code from qtconfig and fixed codestyle issues ...
| | | | * ActiveQt: also make the designer plugin for qaxwidget build in the ↵Patrick Spendrin2010-10-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | opensource versions Reviewed-by: Olivier Goffart Merge-Request: 843
| | | | * Fix compilationOlivier Goffart2010-10-074-8/+9
| | | | | | | | | | | | | | | | | | | | after merge request 2286
| | | | * Code cleaning with the merge request 2286Benjamin Poulain2010-10-065-17/+15
| | | | | | | | | | | | | | | | | | | | | | | | | The merge request 2286 changes a lot of the QtConfig tool. I took this opportunity to clean some old style mistake.
| | | | * Fix a pending issue with the merge request 2286Benjamin Poulain2010-10-061-6/+1
| | | | | | | | | | | | | | | | | | | | A merge conflict was forgoten in the last update. This patch fixes that.
| | | | * Fixed the build error in qtconfigBoris Moiseev2010-10-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qtconfig failed to build with Phonon gstreamer backend turned on Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * Resolved a little code style issue in qtconfigBoris Moiseev2010-10-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * Renamed controls in qtconfig's MainWindowBoris Moiseev2010-10-062-346/+357
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All the controls are ensured to be named according to a Qt Coding Style. The code is much more readable now. Also, the html code inserts and tab stops in UI was fixed. Merge-request: 2286 Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>