summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
...
| * Doc: Update the online documentation templateTopi Reinio2015-03-117-42/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes a number of issues in the online template: - Missing vertical line after the login icon in the header - Update header, footer links and appearance - Adjust alternate background color of table cells to improve readability - Fix style of cookie notification in the html header - Add The Qt Company logo in the footer - Adjust list item marker image - Improve responsiveness of footer Change-Id: I77147b4b4161d6001c095a4b67e15552132100e6 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Adjust wiki links to the new redirectSergio Ahumada2015-03-043-8/+8
| | | | | | | | | | | | | | it looks nicer this way Change-Id: I872976bdef5f581187a758aa92b02e2f5f32b130 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Doc: Update URLsTobias Hunger2015-03-251-2/+2
| | | | | | | | | | | | | | Gitorious is closing down, so point to code.qt.io instead. Change-Id: Ibc453f05e59cf227a7a7086201b008cf7b576a26 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-044-0/+0
|\ \ | |/ | | | | Change-Id: I556be99cc7ad3fc6f7177542b7444269616a7478
| * Remove unneeded exec permission from icomoon fontsDmitry Shachnev2015-03-024-0/+0
| | | | | | | | | | | | Change-Id: I47f111b4fa1278889689c28da762fabe94b95015 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Oswald Buddenhagen2015-03-029-22/+39
|\ \ | |/ | | | | Change-Id: I95b3a87c5068c6b8068b30a35655b4c2419e7f9e
| * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-02-274-10/+10
| | | | | | | | | | Change-Id: If6c05a5b1f60e97c64f3d6b64041a84c3af82964 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Doc: Update online documentation templateTopi Reinio2015-02-263-9/+26
| | | | | | | | | | | | | | | | | | | | | | - Online CSS tweaks: Max-width, font-sizes, font-weights to improve readability, other minor fixes - Remove duplicate include statement and unnecessary definitions for online template Change-Id: I713bddd0e175235668c4d9790d0df58b4131d19f Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: Update Copyright information in template/footerTopi Reinio2015-02-262-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | This change updates the copyright information as it appears in the footer for both offline and online documentation templates. - Update copyright year to 2015 - Update copyright holder to The Qt Company Ltd Change-Id: I82fef6067dee42ec9db561aef9c3c506beafb3c6 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-02-243-7/+7
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/xml/htmlinfo/simpleexample.html examples/xml/rsslisting/rsslisting.cpp qmake/generators/win32/msbuild_objectmodel.cpp src/3rdparty/harfbuzz-ng/src/hb-private.hh src/corelib/global/qlogging.cpp src/corelib/io/qstorageinfo_unix.cpp src/corelib/thread/qwaitcondition_unix.cpp src/gui/kernel/qguiapplication.cpp src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp src/testlib/doc/src/qt-webpages.qdoc tests/auto/other/qaccessibility/tst_qaccessibility.cpp Change-Id: Ib272ff0bc30a1a5d51275eb3cd2f201dc82c11ff
| * Doc: Replace qt-project.org/doc with doc.qt.ioSergio Ahumada2015-02-142-5/+5
| | | | | | | | | | Change-Id: I91f50ce2e2b916eb2b6bee782c40b75ac3b97c71 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Replace blog.qt.digia.com with blog.qt.ioSergio Ahumada2015-02-062-2/+2
| | | | | | | | | | | | Change-Id: I7f1c897d8c96780ee330bca18edd9fe893ee7c90 Reviewed-by: Tero Kojo <tero.kojo@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | qdoc: Let qdoc ignore Q_ENUM and Q_FLAGMartin Smith2015-02-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Q_ENUM and Q_FLAG were not listed in the Cpp.ignoredirectives variable in qt-cpp-defines.qdocconf. This never used to cause parsing errors in qdoc, but now it does. The cause for this change was not determined at the time of this fix, which is to add Q_ENUM and Q_FLAG to the ignore directives list. Change-Id: I717c9101f7706097869f23b53eeca8cb1a0fee0a Task-number: QTBUG-44510 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* | Updated BSD licensed file headersJani Heikkinen2015-02-1512-36/+36
| | | | | | | | | | Change-Id: I6441ff931dbd33b698d762e6f6784898f3f60fe7 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1134-181/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Outdated header.LGPL removed (use header.LGPL21 instead) Old header.LGPL3 renamed to header.LGPL3-COMM to match actual licensing combination. New header.LGPL-COMM taken in the use file which were using old header.LGPL3 (src/plugins/platforms/android/extract.cpp) Added new header.LGPL3 containing Commercial + LGPLv3 + GPLv2 license combination Change-Id: I6f49b819a8a20cc4f88b794a8f6726d975e8ffbe Reviewed-by: Matti Paaso <matti.paaso@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-104-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro src/gui/image/qimage_conversions.cpp src/gui/opengl/qopenglextensions_p.h src/gui/text/qtextengine.cpp src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/eglfs/qeglfshooks_stub.cpp src/plugins/platforms/eglfs/qeglfsscreen.cpp src/plugins/platforms/eglfs/qeglfswindow.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp src/plugins/platforms/windows/qwindowsnativeinterface.cpp src/plugins/platforms/windows/qwindowsscreen.cpp src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/windows/qwindowswindow.h src/plugins/platforms/xcb/qxcbdrag.h src/widgets/itemviews/qabstractitemview.cpp src/widgets/kernel/qwidget.cpp src/widgets/util/qsystemtrayicon_p.h tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp conflicts. Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
| * Merge 5.4 into 5.4.1Oswald Buddenhagen2015-01-162-95/+8
| |\ | | | | | | | | | Change-Id: I78d848c0bb396584a205a8066d253f2bcac8da56
| * | Bump copyright year to 2015Kai Koehne2015-01-154-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bump copyright year in tool output and user visible strings to 2015. Change-Id: I9b29907fe3f555e78005cb296a49d92f601fb7ec Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | | Make it more obvious that Q_WS_ is dead code, and should perhaps be portedTor Arne Vestbø2015-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We still have a bunch of Q_WS_ ifdefs in our code, which are easy to mistake for Q_OS_ ifdefs when quickly scanning the code. By renaming the ifdefs we make it clear that the code in question is dead. In incremental follow-ups, we can then selectively either remove, or port, the pieces that are dead code. Change-Id: Ib5ef3e9e0662d321f179f3e25122cacafff0f41f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-212-95/+8
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
| * | Doc: added entry for link to main page Qt CreatorNico Vertriest2015-01-161-95/+0
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-43115 Change-Id: I10413536b981bf248950522dfe07b96394db9c29 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * | Doc: add Qt Creator 3.3.1 pages to externalsitesLeena Miettinen2015-01-091-0/+8
| |/ | | | | | | | | Change-Id: I9dd02f7fc1da30d68dca5983e5c9a0cba41bcab5 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-182-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d
| * Change bugreports.qt-project.org -> bugreports.qt.ioAlex Blasche2014-12-182-2/+2
| | | | | | | | | | | | | | The Qt bug tracker URL changes as part of the qt.io transition Change-Id: Icb4ab198943b93639b5e3a8d99262303785c6459 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-1021-1173/+2372
|\ \ | |/ | | | | | | | | | | | | Conflicts: doc/global/template/style/online.css mkspecs/android-g++/qmake.conf Change-Id: Ib39ea7bd42f5ae12e82a3bc59a66787a16bdfc61
| * Doc: new template for qt.io online styleTopi Reinio2014-12-0319-1036/+2271
| | | | | | | | | | | | | | | | | | | | | | | | An online documentation template that follows the style of qt.io site. Update the url variable for Qt modules to point to doc.qt.io/qt-5/. Task-number: QTBUG-42086 Change-Id: I5428a02cd503aef2217efd7361f4c8b7b5895a52 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Doc: Update external links to point to doc.qt.ioTopi Reinio2014-12-032-126/+126
| | | | | | | | | | | | Task-number: QTBUG-43062 Change-Id: Ic630f0c7af20ab5ffa88a71a6ab99d42250cf272 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * Doc: corrected autolink errors corelib/ioNico Vertriest2014-11-261-37/+0
| | | | | | | | | | | | | | Task-number: QTBUG-40362 Change-Id: I1cdbde1f6b003556ba4b5e97a49c6d918518da0d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Use the new warning enabling/disabling macros in qtbaseThiago Macieira2014-12-031-1/+7
| | | | | | | | | | | | Change-Id: I91ff06644e8047c2ca483f9768b46c1372eb6171 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@theqtcompany.com>
* | qdoc: ignore Q_DECL_OVERRIDEOlivier Goffart2014-11-271-0/+1
| | | | | | | | | | | | Change-Id: Idf07753b6811c1ec8dba1ddd0fbb8036ce6723f2 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-249-3/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
| * qdoc: Prepare QDoc for the new style on qt.ioTopi Reinio2014-11-111-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new template and CSS have some requirements that need changes in the generated .html: - Generate a new div 'sidebar' and place the TOC (if one exists) inside it, allowing the template to extend the sidebar contents dynamically. Do this for all pages except index.html. - Change the DOCTYPE declaration to be html5-compliant - Replace <tt> tags with <code> to be html5-compliant - Add a new config variable HTML.prologue - this allows the template to insert custom html into beginning of the page, before the page title but after any navigation or table-of-contents items. - Wrap tables inside <div> elements. This allows for better-working CSS design for small-screen devices. - Write out extra parameters first when outputting function synopsis to have better styling. - Inject zero-width-space characters into function names to allow the browser break up long function signatures in a nice manner. - Edit the CSS for the offline style to adapt to above changes. Task-number: QTBUG-42086 Change-Id: I3075cdc11bcb07a66150388519263fd721c8002b Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Doc: add new Qt Creator Manual topics to externalpagesLeena Miettinen2014-11-051-0/+12
| | | | | | | | | | | | | | | | | | | | | | New in some earlier version: - Parsing C++ Files New in Qt Creator 3.3: - Qt Quick UI Forms - Using Clang Static Analyzer Change-Id: I2821b31f4c67b79e6a178018a6acba5b828edb3e Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Documentation CSS: remove body text colorShawn Rutledge2014-11-051-1/+0
| | | | | | | | | | | | | | | | Help text should use the QPalette color. Task-number: QTBUG-42399 Change-Id: Ibc8658b4a7affc2481d895c13cfa673b50a872e0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * New Qt logoAlessandro Portale2014-11-053-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | This patch replaces the old Qt logo with the new, flatter one. The PNGs were optimized via: optipng -o7 -strip "all" Task-number: QTBUG-41685 Change-Id: I51983a45144373bf7aee31a32990ecbb2582f488 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Doc: Updated thumbnail images for some examples.Jerome Pasion2014-10-284-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -Application Example -Analog Clock -Analog Clock Window -Scribble -Digital Clock -Thumbnail images were created with an obscure window manager and they look out of place in the Welcome Mode in Qt Creator. -Used Windows 7 as the platform. -Images within the documentation not updated because they are still relevant. Task-number: QTBUG-33597 Change-Id: I255fc4960e9adcec273f21287ef2182656c6b007 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | qdoc: Generate cross-module links-to-links pagesMartin Smith2014-11-112-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cross-module link report is modified so that each module listed in the table is a link to a subpage on which all the links from the current module to that module are listed. To check that these links go to the correct place, click on one to be taken to the actual link. The actual link is marked with red asterisks. Click on that link to check that the link goes to the correct page. Repeat this process for all the links in the table. Change-Id: Ifddf7108ed7ef090c4063909fdbd10dac1f2566b Task-number: QTBUG-41850 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Add Q_DECL_RELAXED_CONSTEXPR macroOlivier Goffart2014-10-241-0/+1
|/ | | | | | | | | Expands to constexpr if C++14 relaxed constepxr are supported by the compiler [ChangeLog][QtCore] Added Q_DECL_RELAXED_CONSTEXPR for the corresponding C++14 feature Change-Id: Id6b56b3a17da2ff838c80795e528e1247dc13f63 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move Qt Core examples under a common subdirectoryTopi Reinio2014-10-171-1/+6
| | | | | | | | | | | | | | | | | | Qt Core examples were scattered into several subdirectories under qtbase/examples. This caused an issue with the example manifest file generated by QDoc; it expects to find all examples under a common directory in order to produde correct paths to the example .pro files. Qt Creator will not find the examples without a valid manifest file. This change moves the examples and edits the documentation files accordingly. Task-number: QTBUG-41963 Change-Id: I51d86782e0ba21c5c9bae5f15401ec774abe5cf8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Change documentation links to point to qt.io.Friedemann Kleint2014-10-081-3/+3
| | | | | | Task-number: QTBUG-41798 Change-Id: I3a9edc5798d67da60ed1ea55540e2fcdd2e87371 Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* qdoc: Add an \externalpage for Qt Account Sign-upMartin Smith2014-09-111-0/+5
| | | | | | | | | Currently it is used by the Enginio module, but it will be useful in other modules as well. Change-Id: If8b458bfedb0da0d4b8c14484710c1a2ade502dc Task-number: QTBUG-41254 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: Sync qtcreator.qdoc.Christian Kandeler2014-09-111-1/+1
| | | | | | | A topic URL has changed in the Qt Creator documentation. Change-Id: I3c6b5fbcb670d7a637a309b7a77a3da815a795ca Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* qdoc: Highlight selected section / entry in the documentationTopi Reinio2014-09-052-0/+32
| | | | | | | | | | | | | | | | This commit adds id tags with the anchor reference as the value to html entities for documentation section titles and function signatures, properties etc. for both C++ and QML documentation pages. Together with new CSS rules, we can dynamically highlight the title that the user clicked on. This helps to locate the item of interest on a crowded page or when the page cannot be scrolled down enough to place the selected item on top. Change-Id: I7d1db2ed4e12779e1a9e571996ee65c3befa4e7a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Do not include the external sites by defaultTopi Reinio2014-09-032-2/+3
| | | | | | | | | | | | | | | Move the line that adds the external page definions into its own separate include file. This prevents the files from being included in every Qt documentation module by default, needlessly duplicating the information. Currently only the QtDoc module (and modules that depend on QtDoc) need it. Task-number: QTBUG-41003 Change-Id: Ie2ddd3a645ea731787daacfffb3068cb36c79c9a Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Add CSS rules for subtitlesTopi Reinio2014-08-261-0/+4
| | | | | | | | | | | | | | | In the offline template, the floating elements in the navigation bar interfere with the layout of any elements displayed next to it. In particular, subtitles used for example files and nested class documentation have wrong horizontal position. This change adds CSS for the subtitles to be displayed as block elements, and disallows floating elements on the left side - TOC is still allowed to float on the right side. Task-number: QTBUG-40924 Change-Id: I89be3844985e6cf95263db575768034d9270d140 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qdoc: Fix output of \br commandTopi Reinio2014-08-261-2/+1
| | | | | | | | | | | | | | | | Since the \br was promoted from a macro to a QDoc command, its output has been enclosed in extra paragraph end/start tags, adding to the visible vertical space. This change fixes the issue by not closing the paragraph when QDoc encounters a \br command. Also removes the now-obsolete \br and \hr macros, as they are both proper commands. \BR and \HR substitute macros are kept. Task-number: QTBUG-37361 Change-Id: Iabbefb6e79268419792ccba42386f6342ccd175d Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Removed minor version from the doc URL.Jerome Pasion2014-08-151-1/+1
| | | | | | | | | | | -The online URL doesn't use the minor version anymore and this makes the non-Qt projects depend on the existence of redirects. Change-Id: I5b2bef16957ca307060600b7bf25eb1d55f2c998 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Add Qt 5 URL in qtbase/doc/globalJerome Pasion2014-07-041-0/+2
| | | | | | | | -individual Qt 5 modules have the same URL and it can be inherited from doc/global Change-Id: Ie53fe7509a4f906740512e290e263d34ba3f2ee6 Reviewed-by: Martin Smith <martin.smith@digia.com>
* QDoc: Introduce a variable to set table of contents depth.Jerome Pasion2014-06-111-0/+2
| | | | | | | | | | | | | | | | | | | | -"HTML.tocdepth" variable controls depth value. -setting to "0" disables table of contents. -sections 3 and 4 usually don't have descriptive titles to warrant their listing in the table of contents. -table width and CSS (online and offline) don't support wide entries. -Config class' getInt() function now returns -1 if a variable is not set. -for Qt 5 and projects which use html-config.qdocconf, tocdepth is set to "2". -added variable documentation. Task-number: QTBUG-38967 Change-Id: Ibd612f5b846ecb9c4b575e7ac11605c6efd2b77c Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-131-5/+8
|\ | | | | | | | | | | | | Conflicts: src/gui/kernel/qguiapplication.cpp Change-Id: Ibe75603dc8a51769db6550ea3f07bc8d19b0be85