summaryrefslogtreecommitdiffstats
path: root/doc
Commit message (Collapse)AuthorAgeFilesLines
* Add qdoc ignore tag for new QtPositioning API.Alex Blasche2013-09-021-0/+1
| | | | | | Change-Id: If725ac4e523d56a8dc274f8d6b53c0c34064ca06 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qdoc: Enable support for rvalue references in function signaturesTopi Reinio2013-08-301-1/+2
| | | | | | | | | | | | | | | qdoc interprets the double-ampersand in function parameters using rvalue references (e.g. 'Type &&other') incorrectly as a logical AND operator, resulting in a syntax error. This change works around the issue by treating '&' the same as '*', and defining Q_COMPILER_RVALUE_REFS for qdoc. Task-number: QTBUG-32675 Change-Id: I499611f16f22c33ff5b878da0cd59d67ddf53d72 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Changed CSS text-align from "justify" to "left".Jerome Pasion2013-08-282-3/+3
| | | | | | | | | | | | | | | -Documentation looks weird when viewed in a narrow window because much of the text are long. -Qt Project's CSS uses "left". -This change affects any documentation which uses the global templates. Change-Id: I8605a191904cb727b4818d8a1abf127ce2e45eb9 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* qdoc: Fix the qdoc \include commandMartin Smith2013-08-221-2/+0
| | | | | | | | | | | | | | | | qdoc's \include command now works as expected. This command is only for including a file that contains qdoc comments that contain qdoc commands to be processed by qdoc. The file to be included should have the .qdocinc suffix, although qdoc will accept any suffix now. The file must be in one of the directories specified by the sourcedirs variable in the qdocconf file. Task-number: QTBUG-33046 Change-Id: I45ea08932b4218aae369469968117fb5132f764b Reviewed-by: Alex Blasche <alexander.blasche@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-212-1/+5
|\ | | | | | | | | | | | | | | | | Conflicts: qmake/doc/src/qmake-manual.qdoc src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/src.pro Change-Id: I0a560826c420e46988da3776bd8f9160c365459a
| * Doc: Updated the tagged examples list for AndroidVenu2013-08-141-1/+0
| | | | | | | | | | | | | | | | | | Removed the Boxes example from the list as it requires OpenGL. Task-number: QTBUG-32953 Change-Id: Ieb186afde0a87b12d7ab48037b31ae5895740d60 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| * Doc: Adding link to Qt for BlackBerry wiki as external pageJerome Pasion2013-08-141-0/+5
| | | | | | | | | | Change-Id: I6a93c7b55a90c8616ec67a5cc9b510cc876ed7e2 Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-08-141-0/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a
| * Doc: Re-highlight Tweet Search demoTopi Reinio2013-07-291-0/+1
| | | | | | | | | | | | | | | | | | The Qt Quick demo Tweet Search works again, add it back as one of the highlighted examples. Task-number: QTBUG-31745 Change-Id: I4fc7d1a836159e9bb54fcd9e1a9c2760d97aa80a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | Doc: ignore "Q_NORETURN" in function signatures.David Faure2013-08-131-0/+1
| | | | | | | | | | | | | | | | | | | | Needed by the upcoming function Q_NORETURN void QCommandLineParser::showHelp(int exitCode) Change-Id: Ie8550d2d0eff9eb20e629eef4952fa2b0b10f873 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Add the RFC2822Date formatKevin Ottens2013-07-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | QDateTime can now be converted to strings compliant to RFC 2822. Additionally, it supports RFC 850 and RFC 1036 during parsing. By having them all together, all type of dates found in exchanged messages on the internet (including USENET) get supported. Change-Id: I771066c23f409d20b31b7d802f37852ea68ca2a0 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Doc: Edited CSS files in doc/global/templateJerome Pasion2013-07-232-1159/+1342
| | | | | | | | | | | | | | | | -edited style convention for readability (as opposed to file size) -removed extra CSS rule which does nothing Change-Id: Ica9cbdf0c63bae87a8446afcbc22f74403e3247e Reviewed-by: Martin Smith <martin.smith@digia.com>
* | doc: Added Q_REQUIRED_RESULT to ignored tokensMartin Smith2013-07-231-0/+1
| | | | | | | | | | | | | | | | | | This macro is apparently knew. It was unknown to qdoc. Now qdoc knows to ignore it. Task-number: QTBUG-32344 Change-Id: Id4455ad2329aeb2d2f8cacef99cdd1ff2a72321c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'stable' into devSergio Ahumada2013-07-111-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/json/qjsonwriter.cpp src/corelib/kernel/qeventdispatcher_blackberry.cpp src/plugins/platforms/cocoa/qcocoacolordialoghelper.mm Change-Id: I24df576c4cbd18fa51b03122f71e32bb83b9028f
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-281-1/+1
| |\ | | | | | | | | | Change-Id: I53112e20a65b7d706755b4a22622979f3b91a2c2
| | * Doc: Fixed link to "Downloads" page.Jerome Pasion2013-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | -previous link does not exist Change-Id: I86cb6311145cdcb0ebccd3e141d1e413744d585a Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-271-2/+100
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/create_cmake.prf Change-Id: I94aea83b83833395d5db399209e0e51b92ef23b5
| * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-201-2/+100
| |\ \ | | |/ | | | | | | Change-Id: I94bb158562ae6b80a87b40139d7302ea7b9b9aa8
| | * Tagged all those examples that work on an Android deviceVenu2013-06-191-1/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change enables the developers to list all the tagged examples on the Qt Creator welcome screen using the "android" tag. Task-number: QTBUG-30173 Change-Id: Ic09183eb441497506b2d35f0d83ecd5d73d724f5 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * Doc: Remove Tweet Search demo from the list of highlighted examplesTopi Reinio2013-06-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't highlight the example until it's updated to use a new version of the Twitter API. Task-number: QTBUG-31745 Change-Id: If7f9ac3391c549f48cfebcdbe6bdcd12eb4a3e13 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | 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: Remove applicationicon and orientation examples from QtWidgetsTopi Reinio2013-05-082-0/+0
| | | | | | | | | These two widget-based, mobile-targeted examples are obsolete, defunct, and/or serve no purpose in Qt 5. Task-number: QTBUG-31023 Change-Id: Ie5732734bb2547b1ea701d7b3c8dcd806362de09 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>
* Whitespace cleanup: remove trailing whitespaceAxel Waggershauser2013-03-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Remove all trailing whitespace from the following list of files: *.cpp *.h *.conf *.qdoc *.pro *.pri *.mm *.rc *.pl *.qps *.xpm *.txt *README excluding 3rdparty, test-data and auto generated code. Note A): the only non 3rdparty c++-files that still have trailing whitespace after this change are: * src/corelib/codecs/cp949codetbl_p.h * src/corelib/codecs/qjpunicode.cpp * src/corelib/codecs/qbig5codec.cpp * src/corelib/xml/qxmlstream_p.h * src/tools/qdoc/qmlparser/qqmljsgrammar.cpp * src/tools/uic/ui4.cpp * tests/auto/other/qtokenautomaton/tokenizers/* * tests/benchmarks/corelib/tools/qstring/data.cpp * util/lexgen/tokenizer.cpp Note B): in about 30 files some overlapping 'leading tab' and 'TAB character in non-leading whitespace' issues have been fixed to make the sanity bot happy. Plus some general ws-fixes here and there as asked for during review. Change-Id: Ia713113c34d82442d6ce4d93d8b1cf545075d11d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-062-0/+0
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/platforms/qnx/qqnxscreen.cpp src/plugins/platforms/windows/qwindowsdialoghelpers.cpp Change-Id: Ib64f21c077b54f2291d19187590bfe869b98477a
| * Doc: fixed snippet issues with customcompleter.qdocNico Vertriest2013-03-052-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Edited customcompleter.qdoc (paths snippets + ingroup statement) Moved customcompleter.qdoc to widgets/tools/customcompleter/doc/src Moved png files to doc/qtwidgets/images Task-number: QTBUG-29101 Change-Id: Iab66f178b92321257c4eb0e4e9704bb1e3043ef6 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* | 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>
* | 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>