summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-184-4/+41
|\ | | | | | | | | | | | | Conflicts: src/widgets/styles/qmacstyle_mac.mm Change-Id: If8326db9e7da3cbf45dbf7475fdff9915c7723b1
| * Doc: Support for meta-content in manifest XML filesTopi Reinio2013-02-152-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes qdoc support additional attributes and tags written to example/demo manifest files. The goal is to enable highlighting of selected items, as well as having additional content to make searching for specific categories work better in Qt Creator welcome screen. This meta-content is stored in manifest-meta.qdocconf, which is loaded globally for all modules. Tag handling is also changed to use a QSet to eliminate possible duplicate tags. Task-number: QTBUG-29354 Change-Id: I2c4b2dff6229172efbecc2bfc1c269017edc4d56 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Doc: Added margin to the QML API description.Jerome Pasion2013-02-152-4/+7
| | | | | | | | | | | | | | -added a margin to "qmldoc" div class. Change-Id: I7297aff4de5d41a7e4de14a09c0a70acb8006bb9 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-141-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| * Merge branch 'release' into stableSergio Ahumada2013-01-311-3/+3
| |\ | | | | | | | | | Change-Id: If3aa1b7ed75082eff6e9761ad82c83691135ed60
| | * Fix some more old references and links to NokiaSergio Ahumada2013-01-281-3/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28156 Change-Id: I9ba0d6f1e92103219bec1e61e716b6b2f269a8ad Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Remove left-overs of QT_{BEGIN,END}_HEADERSSergio Ahumada2013-01-311-2/+0
|/ / | | | | | | | | | | | | | | | | | | | | | | | | This macro is useless from Qt 5.1 on, so: - Remove comment about using QT_BEGIN_NAMESPACE after QT_BEGIN_HEADER - There is no need to blacklist these in qt-cpp-ignore.qdocconf Change-Id: I2c3ceb3d77d294a606b87f7486071a2350b3d42f Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-01-224-4/+4
|\| | | | | | | Change-Id: Iaa321deb9e536ce89b87a337b57634f00c770a32
| * Doc: Updated HTML copyright year to 2013.Jerome Pasion2013-01-224-4/+4
| | | | | | | | | | Change-Id: I9e750fa78ea552f6f906afb4dc52373f3eac2d39 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Update copyright year in Digia's license headersSergio Ahumada2013-01-1840-40/+40
|/ | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Change ftp.qt.nokia.com -> ftp.qt-project.orgSergio Ahumada2012-12-181-1/+1
| | | | | | Task-number: QTBUG-28156 Change-Id: I0060144f0336791933205355b125251ccba73b3e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Removing extra included images in the HTML online build.Jerome Pasion2012-12-181-26/+4
| | | | | | | | -images not needed and removed. Change-Id: I917544dcc9e3cf959b1f8f2723cf4709cdc96a46 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* QtBase: Removed moved linguist examples.David Schulz2012-12-146-642/+0
| | | | | | | Linguist examples are now in qttools. Change-Id: I8abfff50d81cda143a080711bf9583e7be777009 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: remove example docs that were moved to qttoolsLeena Miettinen2012-12-142-100/+0
| | | | | | | | | Remove docs and images for Multiple Inheritance and Text Finder examples that were moved to qttools/uitools. Change-Id: I29e8f76b2512e329c354a6d3676c9b2e09e35726 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* Some fixes to the OpenGL docs in GUIGunnar Sletta2012-12-121-0/+0
| | | | | Change-Id: I6415ff16b1765a5814d50a4cd39db00495d43073 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Doc CSS: Edited CSS line-height of paragraphs and landing page.Jerome Pasion2012-12-112-2/+8
| | | | | | | | -value copied from qt-project.org -more room between lines of text and the list at the landing page. Change-Id: Iee995325ded0c803feca44d112c5e73a024917bb Reviewed-by: hjk <qthjk@ovi.com>
* Doc: Restored CSS images for the offline HTML and QCH buildJerome Pasion2012-12-108-70/+31
| | | | | | | | | | | | | Revert "Doc: Removing entry in CSS for adding icons to HTTP links" This reverts commit ceb2799163c7e80148ef0bffafac9b05269514d7. Also: -edited image to use Qt Project brand colors -removed breadcrumbs from CSS Change-Id: I3c2e655f8eac463677b20b68bc2ffa0efd2fd468 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QtBase: Remove linguist example which was already movedDavid Schulz2012-12-1011-261/+0
| | | | | | | ... to QtTools. Change-Id: I707d8debcf35b01046b78718fd4b48c03b1fa6e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Updated CSS style for QML code snippetsJerome Pasion2012-12-052-2/+2
| | | | | | | -padding should be the same as C++ code snippet. Change-Id: Idba44d252f411f70b6957161b83626811c1c69f2 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Doc: Added a README file for building documentation.Jerome Pasion2012-12-051-0/+109
| | | | | | Change-Id: I5987af88f7e8efc1b3c4fb788e5fd985e53b08a1 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Fixed online HTML templateJerome Pasion2012-12-031-1/+1
| | | | | | | -missing a slash Change-Id: I866e7438fe67a7a78eefa57379a8d5cd99537a66 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Added \ingroup and \brief qdoc tags to IPC examples.Samuel Rødal2012-12-013-0/+7
| | | | | Change-Id: Ic8fb033597340bfb44ee7e0ca7a3763b36c097aa Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docs: Moved layout example's image do correct locationOliver Wolff2012-11-302-0/+0
| | | | | Change-Id: I85c6812d8d172c92fc4322d4300721e0f45f34e7 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Fix links for threading examplesPaul Olav Tvete2012-11-306-828/+0
| | | | | Change-Id: I498936e91e3bbf5658ea9f3f0eb33cff271a1d62 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Docs: Moved mainwindow example's image do correct locationOliver Wolff2012-11-301-0/+0
| | | | | Change-Id: Idc22e18aa73fed293f629bdccc438567298f1274 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Adding empty tags in the HTMLJerome Pasion2012-11-304-11/+2
| | | | | Change-Id: I7251b77b645a2085d25443826aa2b9550a373d88 Reviewed-by: Martin Smith <martin.smith@digia.com>
* doc: Add touch input examples to correct groupEskil Abrahamsen Blomfeldt2012-11-302-0/+4
| | | | | | | Make them appear in list of touch input examples. Change-Id: Ia5f489e28771f0a272da9ec7b61de186ca305e36 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Removing entry in CSS for adding icons to HTTP linksJerome Pasion2012-11-301-10/+0
| | | | | | | | | | This is a temporary solution to QDoc bug https://bugreports.qt-project.org/browse/QTBUG-28307 The links will not have the icon. Change-Id: Ib81bcc9c55cd5f403c85fdd38c0ee71219091e76 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix docs for Drag and Drop examplesPaul Olav Tvete2012-11-302-360/+0
| | | | | | Change-Id: Ic1622b64603f7634b697bd7d8412dcc9f1a8c3fa Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix path to style/offline.css in qt-module-defaults.qdocconfhjk2012-11-301-1/+1
| | | | | Change-Id: I203cca8041c44116bef7021837ad21bd85e86b4c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Modified CSS according to a graphic designer's recommendations.Jerome Pasion2012-11-302-0/+66
| | | | | | | -Landing page in qtdoc uses the CSS classes. Change-Id: I05efae40d4d6d1802585c129a0a12b2af7eee5e7 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Added link to Html5 Web Database APINico Vertriest2012-11-271-0/+5
| | | | | | | | Removed trailing whitespace Change-Id: I98e57b23dbd037bea3b9f5f67fee70110207e3e0 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix link to licensing pageLars Knoll2012-11-271-1/+1
| | | | | | Change-Id: I398a9e46fd9c4beacd9e8554dab544154e48b870 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Added reference to W3C's XML specsNico Vertriest2012-11-231-0/+5
| | | | | | | Removed 's from title Change-Id: I7c44279aab02edd26e454da5f59f4a9a19eab18a Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Various modifications to the online and offline stylesheets.Jerome Pasion2012-11-212-66/+40
| | | | | | | | -used Qt Project colors -changed margins and paddings Change-Id: If7a533ac3a32debbaca7b403aa68290c2b9aab2c Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Changing titles in HTML template.Jerome Pasion2012-11-201-2/+2
| | | | | | | -Easier to differentiate the links. Change-Id: I9294affcdbf037d91d94fa707449d78fac01bcbb Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Adding subtitle to the online snapshot HTMLJerome Pasion2012-11-192-36/+124
| | | | | | | -other fixes to the HTML template. Change-Id: I85070c615796c4342a89cc730ab2ca8ab51dd5e6 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Adding online stylesJerome Pasion2012-11-1935-3/+794
| | | | | | | | | -Has the Qt logo -For generating the archives and online snapshot Change-Id: I88d1d6335c0ba600a62868a25fadaed8a751f2b4 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Removed "class=" in an /div.Jerome Pasion2012-11-161-1/+1
| | | | | | | -not valid XML Change-Id: I832490e87113d9143b2280127b539c68a46b0e94 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Removed "templatedir" from qdocconf file.Jerome Pasion2012-11-161-2/+1
| | | | | | | No longer needed as the paths are resolved relative to the file. Change-Id: Id4012336b7de00a5dcf8686e44f7a972e2b8b284 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Adding \externalpage links to qtbase/doc/globalJerome Pasion2012-11-135-0/+748
| | | | | | | | | | | -Moved from qtdoc repository -included in the default configuration for each module -grouped links Change-Id: I544d9232950f50ae9fb877c1a0166ab157f70942 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Fixing templatedir paths according to the fix to QTBUG-27878Jerome Pasion2012-11-092-1/+2
| | | | | Change-Id: Ib95be5267514e4afadad4f6fbfd48514a7552227 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Adding necessary HTML elements in the HTML template.Jerome Pasion2012-11-091-1/+4
| | | | | | | | -needed by qt-project.org -won't affect the qch style Change-Id: I720a5cae2ea12e8a3dd81ce10b7c003981d61cd8 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Doc: Adding style/offline.css to the global QHP configuration.Jerome Pasion2012-11-071-0/+3
| | | | | | | | All modules wishing to use the default style will get the offline style in their QCH files. Change-Id: I37f41f72be7946a6473e6d56d4ef2f6d7c454f47 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Placed missing '\'Jerome Pasion2012-11-071-3/+3
| | | | | Change-Id: I311ea81e2cdd0069f2a93758c3cd38bc75ae0b54 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Integrated ignoretokens and ignoredirectives from Qt Multimedia.Jerome Pasion2012-11-072-8/+10
| | | | | | | Sorted the entries Change-Id: I6e1716c899e2f7e5360571ccfbde5aaf798d65af Reviewed-by: Martin Smith <martin.smith@digia.com>
* Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtbase into newdocsJerome Pasion2012-11-021-1/+1
|\ | | | | | | Change-Id: I7e6cee190a341901dfbf8effb54ebccb91bf7a17
| * CONFIG+=uitools is deprecated. Use QT+=uitools insteadSergio Ahumada2012-10-311-1/+1
| | | | | | | | | | Change-Id: I45105e5e1dde614d90b1fb392b6e01e698c27a7f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Doc: Added three column layout in CSS fileJerome Pasion2012-10-291-0/+84
| | | | | | | | | | Change-Id: I8a7c4538ff7eafb3dd23423c1735e27342b6391c Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Doc: Consolidated the QDoc variables.Jerome Pasion2012-10-263-131/+70
| | | | | | | | | | | | | | | | | | -Modules only need to include qt-module-defaults.qdocconf -Sorted the variables. -The variables still need to be confirmed to be important. Change-Id: I7b40f665bf6348b668f3bcfd3c5ab4d881ef6aed Reviewed-by: Martin Smith <martin.smith@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-25 00:24:41 +0000