summaryrefslogtreecommitdiffstats
path: root/src/doc
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Change instances of 'OS X' to 'macOS'5.6.2Topi Reinio2016-08-155-6/+6
| | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the Mac platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: Iec248314791d9dbb1ab11959121376265cefd7fc Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* qtquick1 doc: Fixed format error in PNG image's gAMA chunk.Edward Welbourne2016-04-111-0/+0
| | | | | | | | | | | Ran pngcrush -ow -brute -rem allb -reduce src/doc/src/declarative/pics/BorderImage.png to eliminate warning identify: Ignoring gAMA chunk with gamma=0 `src/doc/src/declarative/pics/BorderImage.png' @ warning/png.c/MagickPNGWarningHandler/1671. from ImageMagick's identify command. Change-Id: Iecf185c9400add0b4ea64b3c7397f79d12e7268b Reviewed-by: Topi Reiniƶ <topi.reinio@theqtcompany.com>
* Doc: Replace Mac OS X with OS XNico Vertriest2015-07-164-4/+4
| | | | | | Task-number: QTBUG-40759 Change-Id: I1c05a2d07f38da1129bc127fd17c15f843b16bda Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-171-1/+0
|\ | | | | | | Change-Id: I9c521184dcdc023bdaecf6643bb6c60cc1a80a9f
| * Doc: Removing url variable from qdocconf file.v5.4.2Sergio Ahumada2015-03-061-1/+0
| | | | | | | | | | | | | | | | -url inherited from the url variable set in qtbase/doc/global Change-Id: I448ea5484c6956c6231e7a6ff93e29157e527755 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
* | Update copyright headersAntti Kokko2015-02-23272-1218/+1218
|/ | | | | | | | | 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. Change-Id: I9e68d256991ef7325c29c38ce9c007506ce6b150 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Merge remote-tracking branch 'origin/stable' into devSergio Ahumada2014-03-113-3/+3
|\ | | | | | | Change-Id: I09ce9ad6e50bdb6034717d45ad73b4d21474a6e2
| * Fix typos in comments and documentationSergio Ahumada2014-03-053-3/+3
| | | | | | | | | | Change-Id: Ie7c4d63d632bf32ee583ddcd807252225ddde3fd Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | whitespace fixesOswald Buddenhagen2014-02-2036-91/+91
|/ | | | | | | | remove trailing spaces & expand tabs Change-Id: Ia088c8cc8a83d068f6e2ec84903b5220cd3411f1 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: several updates to the module page.Jerome Pasion2013-08-061-2/+3
| | | | | | | | | | | | | 1)Setting \qtvariable in module page. \qtvariable indicates the QT variable needed in .pro files. 2)WS fixes. Qt Quick 1 is deprecated but it is still nice to update the module page. Change-Id: I5358a03566589a6910469c0bbd4a717e90be1c34 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Keyboard input documentation: an event accepted does NOT bubble upJeremy Katz2013-07-311-2/+2
| | | | | | | | Add missing negation for the code snippet demonstrating accepting a key event Change-Id: Ia4c1cc4f207df9fb6e041ff088c6da2a63cd47b9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-185-13/+14
|\ | | | | | | Change-Id: I4fd7f5c1096b0460bd23e2831e6207d63c2b69e3
| * Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-154-7/+8
| | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: I3661a893a9413a0b137e236083cc9ac5677ffecb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | | | | | | Change-Id: Ic87c7fdecbe3c5431d38b228e186237ccd2aed3b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Merge branch 'release' into stableSergio Ahumada2013-01-311-1/+1
| |\ | | | | | | | | | Change-Id: Ied6e28f0e7e3dceccdbbe878dfab8f88c64e32d8
| | * doc: Fix namespace version to 5.0.1 for qhp documentationv5.0.1Sergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: I995109869294f3106046a8fd8299b6300b4c567f Reviewed-by: hjk <qthjk@ovi.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-17272-276/+276
|\| | | | | | | | | | | Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
| * | Doc: Remove duplicate consecutive wordsTopi Reinio2013-01-114-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Grepping through qdoc files, 'the the' appears in a few places. Also one instance of 'centre' replaced by 'center'. Change-Id: If978895c470ff02a0fe0c164aec421943deb24d3 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10272-272/+272
| |/ | | | | | | | | | | Change-Id: I0281c3f6c10bb7c57f0e470306f38e96badf997b Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* / Merge branch 'stable' into devFrederik Gladhorn2013-01-171-0/+15
|/ | | | | | | | Conflicts: sync.profile tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp Change-Id: I3620d15b4163fec420d18f6be50cae1635b99a2f
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | Change-Id: I925fc622998c0ea7e8b045b70e0145a9bbd29459 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Add qtdeclarative.qdocconf to get a example_manifest.xmlhjk2012-12-11554-0/+29547
Change-Id: I52b87947559c10d3e60af81fe8d4f3189dd1614e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>