summaryrefslogtreecommitdiffstats
path: root/doc/global
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Properly parse the new namespace macros for Bluetooth and NFC libsAlex Blasche2013-06-261-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-31851 Change-Id: I4c0eb3cf69ae10246a22f93e76a09d3a72c2196c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alex <alexander.blasche@digia.com>
* | | Doc: Fixed QDoc's navigation mechanism.Jerome Pasion2013-06-2517-243/+350
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HTML pages need to display minimal navigation such as a link to the module landing page or Qt 5's index.html. -new variables available in qdocconf files: navigation.landingpage navigation.homepage navigation.cppclassespage navigation.qmltypespage buildversion The navigation variables are for the new navigation bar. The buildversion variable is to insert documentation build information into the pages. Note about compatibility with Qt Creator docs: The HTML template files for Qt Creator is retained to keep Qt Creator compatible with 5.0.x and 5.1.x. Change-Id: Ibb4d7cada19644204457d822b6b77b2aa7b70f8d Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | | Doc: Applying new qt-project.org style to "online" style.Jerome Pasion2013-06-258-147/+280
|/ / | | | | | | | | | | | | | | -added images -modified template and CSS file Change-Id: I0d50f940271d6af80ade38f50d4efa2028441dba Reviewed-by: Martin Smith <martin.smith@digia.com>
* / make images non-executableOswald Buddenhagen2013-06-1718-0/+0
|/ | | | | Change-Id: I7d6c28e7fd18125c95e56eca2d0d6d67003f9c5d Reviewed-by: Martin Smith <martin.smith@digia.com>
* Update Urls to CMake docs.Stephen Kelly2013-05-201-5/+5
| | | | | Change-Id: Ic6743e8adb8d386fabc20c17c47fd110a47201da Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Doc: Add tags for Qt WebKit examplesTopi Reinio2013-05-131-1/+21
| | | | | | | | | | | | Use the manifest meta-content system to add suitable tags for Qt WebKit examples. This enables users to filter for them in Qt Creator Welcome mode by typing 'webkit'. Change-Id: Ie9b5f6ff9f455dd3d8f7c64e5f73e30ff021f208 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Highlight a number of examplesTopi Reinio2013-05-081-0/+19
| | | | | | | | | | Add an 'isHighlighted' attribute to selected examples to bring them to the top on Qt Creator Welcome mode/Examples tab. Task-number: QTBUG-29354 Change-Id: I6c72c11f1f8359d889649ff5b7f91e5c4de583bd Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Copying changes to external pages from qtdocJerome Pasion2013-05-073-6/+21
| | | | | | | | | | -the externalsites from qtdoc is being removed and the new copy is in qtbase/doc/global. Change-Id: I8f509acf05c0e1f399205daf4e4831cf46475746 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Adding Qt Creator Manual as \externalpageJerome Pasion2013-04-301-0/+491
| | | | | | | | | -This should allow any Qt 5 module which inherit qt-module-defaults to link to the Qt Creator Manual. Change-Id: If413fe299fa604d16c06fa261024c1a12be24b09 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qdoc: Added missing CPP ignore token, Q_QML_EXPORTMartin Smith2013-04-081-0/+1
| | | | | | | | | This token must be ignored by qdoc's hapless C++ parser. Task-number: QTBUG-29444 Change-Id: I02a0c5926a3fa6284648a632341e38614a237a30 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Added the Q_REVISION macro to the ignore listVenu2013-03-241-1/+2
| | | | | | | | | | | | This should avoid QDoc warnings when the macro is used with the signals and slots. Task-number QTBUG-30105 Change-Id: I8d1b32854c15ff07e6ece7b326be38666ae29c3f Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Various changes to global CSS files.Jerome Pasion2013-02-282-38/+45
| | | | | | | | | -added style for JavaScript code blocks -code blocks is scrollable when viewed in a narrow window -improved alignment of table of contents Change-Id: I45acdb4c7aa0ae57fe030e7e68a230c1a7d41b8f Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* 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>
* | 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-184-4/+4
|/ | | | | 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>
* 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>
* 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: Fixed online HTML templateJerome Pasion2012-12-031-1/+1
| | | | | | | -missing a slash Change-Id: I866e7438fe67a7a78eefa57379a8d5cd99537a66 Reviewed-by: Geir Vattekar <geir.vattekar@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: 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 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>
* 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>
* Doc: Adding base macros and other QDoc definitionsJerome Pasion2012-10-264-0/+168
| | | | | | | The module documentation require these definitions. Change-Id: Iecef3df5edad761d8c5f67b14783e13952ab2dbb Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Added landing-, examples- and C++ class list-page to qtwidgetsJan Arve Saether2012-10-191-0/+1
| | | | | | | | | | It seems this is the pattern to follow: landing page: qtwidgets-index.html examples page: qtwidgets-examples.html class list page: qtwidgets-module.html Change-Id: I3e5459fe650178e0398cb43181b594c0f12a170e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* HTML template: Updated copyright information from Nokia to Digia PlcJerome Pasion2012-09-272-3/+3
| | | | | | | Change-Id: Ib4315aa0a7a92e3b36da855c2787b60cc3c332fe Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Add Q_PRINTSUPPORT_EXPORT to qdoc ignores.Frederik Gladhorn2012-09-181-0/+1
| | | | | | Change-Id: I0b8676a14133baf818ec12cda77dcb0670b5ee85 Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 03:19:33 +0000