aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/doc
Commit message (Collapse)AuthorAgeFilesLines
...
* Doc: corrected snippet issue by changing extension snippet file.Nico Vertriest2013-04-252-10/+51
| | | | | | | | | | | | Task-number: QTBUG-30746 Changed in deployment.qdoc Deleted example.qrc Created example.qdoc Added license text to example.qdoc Change-Id: I9699dcdb4977506c0a62d1a9e952c98babfaf03d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Expand example (importing multiple modules into 1 namespace)Sze Howe Koh2013-04-251-2/+9
| | | | | | | | | Snippet is for the Qt QML "Import Statements" page. Show how to use the namespace to reference types from different modules Change-Id: I8c49703194a18657439afdef75e47ff7e97be653 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Replace some references to NokiaSze Howe Koh2013-04-242-3/+3
| | | | | | | Link to internal QDoc pages, or to qt-project.org Change-Id: I5d9adae711213873ab57ccfc5bb2d8f74cf5689b Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Un-overload the word "module"Sze Howe Koh2013-04-246-8/+9
| | | | | | | | | | | "The Qt Quick module contains the QtQuick QML module and the Qt Quick C++ module" is an odd way to describe things. The concept of a "QML module" is deeply entrenched so this patch won't touch it, but at least we can get rid of references to "C++ module"s. Change-Id: Ib06f8e3152551901dc6016cb37507cb9608d7863 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Create links to Qt Quick 1Sze Howe Koh2013-04-241-1/+1
| | | | | | | | | | | Point to the porting guide, so that users who search for the old names will be directed to an explanation of the name change. Also made some new links to Qt Quick 2, and changed "favour" -> "favor" (Sanity Bot complained) Change-Id: If30c8d619d8fdb9df72b7b5f3efd356f1e07b23a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 2/2)Sze Howe Koh2013-04-232-3/+3
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: If398304757e0a5106542c09099e1814084e54c5c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Qt Quick: Fix module name format (Pt 1/2)Sze Howe Koh2013-04-2311-25/+25
| | | | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation Attempt to differentiate between the whole module ("Qt Quick") and the QML import ("QtQuick") by encoding the latter with monospace font. There are places in the text where both representations are valid. Change-Id: Id6e157a4191aaa4e23a9cd5c76abfe902fe43d33 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Reinstating \qmlmodule page.Jerome Pasion2013-04-231-0/+53
| | | | | | | Was removed in an earlier commit. Change-Id: I1fdaf6c7e1e522f6ba7e36a20040b8222b1714cc Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Refactored and focused the Qt QML documentation.Jerome Pasion2013-04-2323-263/+201
| | | | | | | | | | | | | | | | | Before it wasn't clear to what the module provided, especially with the coupling of Qt QML and Qt Quick. The doc is centered around these documentation: -QML refernce: the language syntax and the application constructs -JavaScript environment: the environment provided by the module -Integration with C++: more about the engine and the C++ API -QML Types and Classes reference (created by \qmlmodule and \module) The distinction are made in the directory and the section titles in the Qt QML landing page. Change-Id: I033bfcbf8368b94ffa5ee4b1225bee74347f53eb Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Qt QML: Fix module name formatSze Howe Koh2013-04-194-10/+10
| | | | | | | | | | Follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation QtQml -> Qt QML Change-Id: I45ca4496a02214feab48707b026c6bec085df138 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Reassigned types and pages to their correct modules.Jerome Pasion2013-04-174-7/+3
| | | | | | | | | | | | 1)Moved classes and basic types to \module QtQml 2. -QQml* classes are in QtQml 2 for 5.1 2)Removed \inqmlmodule commands in overviews and tutorials. -Only QML API should have \inqmlmodule commands because they are added to the auto generated list of types. Change-Id: I9aa3ca8062fa9fed76734885829879122841b119 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Add required include statement for qmlRegisterSingletonType docsTopi Reinio2013-04-161-5/+7
| | | | | | | | | Adds a missing include for QtQml into QQmlEngine class reference code snippets. Task-number: QTBUG-30642 Change-Id: I2ec10de5b31b4854d5aaea08987b9d75926d2ef4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-032-6/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/qml/xmlhttprequest/doc/src/xmlhttprequest.qdoc examples/quick/accessibility/doc/src/accessibility.qdoc examples/quick/animation/doc/src/animation.qdoc examples/quick/canvas/doc/src/canvas.qdoc examples/quick/draganddrop/doc/src/draganddrop.qdoc examples/quick/imageelements/doc/src/imageelements.qdoc examples/quick/keyinteraction/doc/src/keyinteraction.qdoc examples/quick/localstorage/doc/src/localstorage.qdoc examples/quick/mousearea/doc/src/mousearea.qdoc examples/quick/particles/affectors/doc/src/affectors.qdoc examples/quick/particles/customparticle/doc/src/customparticle.qdoc examples/quick/particles/emitters/doc/src/emitters.qdoc examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc examples/quick/particles/system/doc/src/system.qdoc examples/quick/positioners/doc/src/positioners.qdoc examples/quick/righttoleft/doc/src/righttoleft.qdoc examples/quick/scenegraph/customgeometry/doc/src/customgeometry.qdoc examples/quick/scenegraph/openglunderqml/doc/src/openglunderqml.qdoc examples/quick/scenegraph/simplematerial/doc/src/simplematerial.qdoc examples/quick/threading/doc/src/threading.qdoc examples/quick/touchinteraction/doc/src/touchinteraction.qdoc examples/quick/views/doc/src/views.qdoc Change-Id: Idf7bb76c82acacf86b19a9f4633c3cbf4ae1a9a0
| * Fix duplicate examples for qml/quick modulesKai Koehne2013-03-212-7/+9
| | | | | | | | | | | | Task-number: QTBUG-30233 Change-Id: Ic0a6d9112dbf8903d68f571e0ac853d89ff31ebe Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Doc: Fix some titles and linksSze Howe Koh2013-03-305-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make page titles follow the conventions at http://qt-project.org/wiki/Spelling_Module_Names_in_Qt_Documentation. Make class/type list titles follow the "<Qt Module> C++ Classes" and "<Qt Module> QML Types" formats. Links are updated accordingly, along with broken links found during this sweep. Some inline links also have their surrounding text modified, to improve flow. Change-Id: I0ed7788caa250085d7ea0080a77d8a2655debf39 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Update module "Qt Declarative" -> "Qt Quick"Sze Howe Koh2013-03-301-1/+1
| | | | | | | | | | | | | | | | Also update examples/README to show the relationship between Qt Quick and Qt QML. Change-Id: I4e50d9f0ddb1ac25ccdfed09f579f76a375b14fe Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Doc: Fixed some uses of terminolgies in qdoc files.Jerome Pasion2013-03-2610-32/+31
| | | | | | | | | | | | | | | | | | | | | | -"element" -> "type" or "object" (not in all cases where this change applies) -some instances of QtQuick. It should be "Qt Quick". -only in qdoc files. Examples and source code changes will be done later. Task-number: QTBUG-30180 Change-Id: Ie587461a138e97606f761ad1e90909c91b479303 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-141-4/+3
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qml/debugger/qv8profilerservice/qv8profilerservice.pro Change-Id: I2fd99ed8bd03302b9bbf31e6f21990f6455c4f1c
| * | Doc: Changed section title in whatsnew.qdocJerome Pasion2013-03-131-4/+3
| |/ | | | | | | | | | | | | | | | | - "Qt 5.0" is the name of the main landing page, which causes link conflicts in Qt QML module. Change-Id: I2becb864873ea3784eb4fece3ebcbe64e0a00cba Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2013-02-191-2/+2
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-181-2/+2
| |\| | | | | | | | | | Change-Id: I33db683ebf12248b2ed14eeaf65c4bcade14bfbf
| | * Doc: Removed reference to deprecated \badcode command.Jerome Pasion2013-02-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | QDoc doesn't differentiate between \badcode and \code. They both look the same in the output. Change-Id: Ia0580f7d664ad5e33b48d6511dac7c61349cacce Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | | Add qmlRegisterType for Composite TypesAlan Alpert2013-02-181-0/+17
|/ / | | | | | | | | | | | | | | | | This is equivalent functionality to registering a composite type in a qmldir file, a type name in a versioned module is associated with a given file. This function now allows that to be done easily from C++. Change-Id: I1cf44b92c3ad7fee593f4f84773c35b56253e628 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Add Composite Types to QQmlTypeAlan Alpert2013-02-181-1/+1
| | | | | | | | | | | | | | | | | | When a composite type is loaded from a QML file, it now generates a QQmlType entry in QQmlMetaTypeData. Change-Id: I9b127dff7955456aacb25138fa6ea8efb7bb9221 Reviewed-by: Christopher Adams <chris.adams@jollamobile.com> Reviewed-by: Alan Alpert <aalpert@rim.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-071-6/+6
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: examples/quick/textureprovider/etcprovider.h src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf tests/auto/quick/qquickflickable/tst_qquickflickable.cpp Change-Id: I5027b0ee024e00b9525bd45516b7f401ff7d4ae4
| * substitute fixed version numbers in qdocconf files with variablesOswald Buddenhagen2013-02-061-6/+6
| | | | | | | | | | Change-Id: If28446d2d14dde62ff662ffdd366dc6384c95326 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Add \qmlmodule commands for QtQml and QtQuickAlan Alpert2013-02-061-4/+4
| | | | | | | | | | Change-Id: I07a961bb2c5e39bfef134264e5f24974e1501361 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Merge branch 'stable' into devGunnar Sletta2013-01-17136-192/+192
|\| | | | | | | | | | | | | | | Conflicts: src/qml/doc/qtqml.qdocconf src/quick/doc/qtquick.qdocconf Change-Id: I087fa14720995a5e53c43567dc4a3c29eb9992a9
| * Merge branch 'release' into stableGunnar Sletta2013-01-171-1/+1
| |\ | | | | | | | | | Change-Id: I88ecd5f396ecd9a9c910108d1cca832a3087f1d8
| | * doc: Fix namespace version to 5.0.1 for qhp documentationSergio Ahumada2013-01-121-1/+1
| | | | | | | | | | | | | | | Change-Id: Id101dc3a7ab5d2552531b7ea1819e0f2be725989 Reviewed-by: hjk <qthjk@ovi.com>
| * | Doc: correcting typo "the the"Nico Vertriest2013-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-28756 Spurious repetition of the definite article Doc: corrected trailing space issue. Change-Id: I95c1c5773dc4b25dd0a3625343a67975783435fd Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
| * | Update copyright year in Digia's license headersSergio Ahumada2013-01-10135-135/+135
| | | | | | | | | | | | | | | | | | Change-Id: I6c3bd7bebe3d62d1cfd0fa6334544c9db8398c76 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * | Doc: Updated docs for examples and etcXingtao Zhang2013-01-095-57/+57
| |/ | | | | | | | | | | | | | | | | | | | | | | - Corrected several \snippet paths and \example paths. - Added missing example images. - Marked several commands as code. - Updated the exampledirs variable for qtqml. Done-with: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Task-number: QTBUG-28898 Change-Id: I24aac17821f54de4bd5129c45b5bf96dc0f114b2 Reviewed-by: Liang Qi <liang.qi@digia.com>
* / Bump Qt version to 5.1.0Frederik Gladhorn2013-01-151-5/+5
|/ | | | | Change-Id: I9491f506aca249511c1eb3ad3baf44f4e4e65a9a Reviewed-by: David Faure (KDE) <faure@kde.org>
* Bump Qt version to 5.0.1Sergio Ahumada2012-12-231-4/+4
| | | | | Change-Id: I8cadaec38aff1348c80c552e7fe072b6a7aa31b1 Reviewed-by: Alan Alpert <aalpert@rim.com>
* Doc: Enabling Qt QML linking to Qt Quick.v5.0.0Jerome Pasion2012-12-171-1/+1
| | | | | | | | Allows Qt QML pages to link to Qt Quick. Task-number: QTBUG-28579 Change-Id: I9eafadc5ee14a5588a5863960c4463132b73b287 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Change virtual folders in .qdocconf to qtqml and qtquickhjk2012-12-121-1/+1
| | | | | | | This seems more in line with the rest of the qdocconf files Change-Id: I91999205b0632a2c0e57f428754cf5928a1ea6c7 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* centralize and fixup example sources install targetsOswald Buddenhagen2012-12-101-53/+53
| | | | | | | | follow respective change in qtbase Change-Id: I27502eb7ebea973e19ec5f7c3ec0e2338556f6e0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert (Personal) <416365416c@gmail.com>
* Doc: Fix external referencesv5.0.0-rc1Christian Stenger2012-12-051-0/+2
| | | | | Change-Id: Icf5d6a6bcfe7ef15c6e8e66d94bdd59ae6dbc904 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Avoid duplicating Qt Quick Code SamplesEskil Abrahamsen Blomfeldt2012-12-031-1/+0
| | | | | | | | | We can't include ../../.. in exampledirs, because then qtqml will include all in the whole repository and a bunch of them will be duplicated in qtquick and qtqml. Change-Id: Ib2b9776af0969baceb1e4907c79ce6cecf31f67e Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Edited qdocconfig files to change QCH titles and redirects.Jerome Pasion2012-12-031-9/+7
| | | | | | Task-number: QTBUG-28341 Change-Id: Iba37adc500794f18e90f0a9dd4a765a5c90d5e10 Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
* Docs: Fix some more referencesChristian Stenger2012-12-012-1/+2
| | | | | Change-Id: I9fa1337128d91527056e3bcd26e693a19ab68eff Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Mark scarc resource docs as internal for 5.0Frederik Gladhorn2012-11-282-4/+16
| | | | | | Change-Id: Ic3e235399161dcf0c9a259a5e94b4178d61eb5cb Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* docfix: Move image to correct locationGunnar Sletta2012-11-281-0/+0
| | | | | Change-Id: Id16d52de895bf48e29c565c84c7602318a90a85d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docfix: Move images to correct location and fix bugs in code sample.Gunnar Sletta2012-11-283-2/+2
| | | | | Change-Id: I7ec530f0e1a41051e31517e6fcac5eb691d1795d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove TODO from docs as it doesn't make sense.Gunnar Sletta2012-11-271-4/+0
| | | | | Change-Id: If23707d5778c6f97e9c9565ac1c5e23d5729fdc4 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* docs: Separate qml and c++ examplesFrederik Gladhorn2012-11-231-1/+13
| | | | | Change-Id: I1d9e2e281bff2bb77a8bdf53726d3c452e3fe911 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Doc: Adding "qtgui" to the documentation dependency.Jerome Pasion2012-11-221-1/+1
| | | | | | | | -Qt Quick and Qt QML depend on Qt GUI and its documentation. Change-Id: Icf14107490bf7a884a5e5840d7ec7bdd62e1cf09 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Document importing issues in worker scriptJędrzej Nowacki2012-11-211-0/+1
| | | | | | Task-number: QTBUG-27454 Change-Id: Ia9f384ab92fe0c55d3299d32a3f7faba1446ce35 Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* Merge branch 'newdocs'Eskil Abrahamsen Blomfeldt2012-11-201-1/+0
|\ | | | | | | Change-Id: Idd7a9837e4f6a1358edf9accdcdc3c71822f4c25
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-19 12:54:37 +0000