summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Update copyright year to 2011.Jason McDonald2011-01-1039-38/+38
| | | | Reviewed-by: Trust Me
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-01-062-88/+138
|\
| * Update docs - calling overloaded functions from QML is now supportedBea Lam2011-01-061-5/+8
| |
| * Doc fixes for introduction page and Item docsBea Lam2011-01-061-83/+130
| | | | | | | | | | | | | | Moved 'Identity' and 'Property Change Signals' sections from Item docs to the intro page, which previously had a section on ids but this has been moved out of the 'Properties' section since an id isn't an ordinary property.
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-237-347/+276
|\ \ | |/ | | | | | | | | Conflicts: src/s60main/newallocator_hook.cpp tools/runonphone/serenum_unix.cpp
| * Document the 'variant' basic typeBea Lam2010-12-222-12/+87
| | | | | | | | | | | | | | | | | | This includes documentation on restrictions and considerations when storing a JavaScript object with this type, since such properties only hold a copy of the object's values and not the actual object. Task-number: QTBUG-16196 Reviewed-by: Michael Brasser
| * Add double type to QML Basic Types docsBea Lam2010-12-221-0/+20
| |
| * Remove redundant docsBea Lam2010-12-221-81/+0
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-12-214-254/+169
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: (29 commits) Doc: Added a missing license header. doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable doc: Replaced some \raw and \endraw uses with \table and \endtable Doc: Added a note about the Public Suffix List. Doc: Fixed doc bug in Diagram Scene example doc: Removed some empty \row commands from a table. Doc: Added link to QML Basic Types in main Qt Quick page. Doc: Added missing What's New information for Qt 4.6 and 4.7. Doc: Fixed incorrect case in a page file name. Doc: Added a link to the QML Basic Types page. Doc: Removed duplicate external page reference. Doc: Fixed a link to the correct searchPaths() function. Doc: Added documentation about the use of null custom title bar widgets. Doc: Added a missing external page reference. Fixed the QML Focus document. Fixed snippets, images, and formatting. Added QML coding convention for "private" properties. Fixed link to qtestlib-tools by adding link to qt-webpages.qdoc. Some whitespace fixes. Fixed a bug by changing the id name to lower case. ...
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-133-21/+109
| | |\
| | * \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-091-2/+2
| | |\ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7Jerome Pasion2010-12-081-0/+1
| | |\ \ \
| | | * | | Doc: Added a link to the QML Basic Types page.David Boddie2010-12-071-0/+1
| | | | | |
| | * | | | Doc: Added link to QML Basic Types in main Qt Quick page.Jerome Pasion2010-12-081-0/+1
| | |/ / / | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Fixed the QML Focus document. Fixed snippets, images, and formatting.Jerome Pasion2010-12-061-219/+120
| | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | | Added QML coding convention for "private" properties.Jerome Pasion2010-12-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private properties start with two underscores. __property Reviewed-by: David Boddie
| | * | | Some whitespace fixes.Jerome Pasion2010-12-061-32/+32
| | | | |
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-202-1/+5
|\ \ \ \ \ | |/ / / /
| * | | | Update docs on importing javascript filesBea Lam2010-12-202-1/+5
| | | | |
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.pro src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/plugins/phonon/mmf/mmf.pro src/s60installs/s60installs.pro tests/auto/qapplication/test/test.pro tests/auto/qgraphicsview/tst_qgraphicsview.cpp
| * | | | Doc: typo fixed in doc/src/declarative/extending.qdocJoerg Bornemann2010-12-161-1/+1
| | |_|/ | |/| | | | | | | | | | Reviewed-by: TrustMe
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-134-23/+111
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure src/gui/graphicsview/qgraphicslayout.cpp src/gui/text/qfontengine_s60.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
| * | | Improvements to anchoring docsBea Lam2010-12-091-17/+49
| | | | | | | | | | | | | | | | | | | | Make it clear that anchor margins only apply to anchors. Also document that anchor and absolute positioning cannot be mixed.
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-12-092-4/+60
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QtGui bwins def file for QTBUG-15615 highlightFollowsCurrentItem: false was not always honored ListView: Fix calculation of currentItem position when out of view. Update QtGui def files Fix openDatabaseSync() to not create unused directory Document support for QVariantList and QVariantMap type conversion Some doc clarification for components and javascript integration Cursor shouldn't blink while dragging cursor position Qt.include() docs weren't being picked up by qdoc Doc: make it clear that "z" affects sibling stacking order.
| | * | Document support for QVariantList and QVariantMap type conversionBea Lam2010-12-061-1/+33
| | | |
| | * | Some doc clarification for components and javascript integrationBea Lam2010-12-061-3/+2
| | | |
| | * | Qt.include() docs weren't being picked up by qdocBea Lam2010-12-061-0/+25
| | |/ | | | | | | | | | | | | | | | | | | This moves the Qt.include() docs to qdeclarativeengine.cpp and also documents it in the "Integrating JavaScript" page. Task-number: QTBUG-15855
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-039-315/+342
| |\ \ | | |/
| * | Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-12-011-5/+5
| |\ \
| * \ \ Merge branch '4.7-upstream' into 4.7-waterThierry Bastian2010-11-303-1/+23
| |\ \ \
| * | | | Fix documentation for QML extended typesCaio Marcelo de Oliveira Filho2010-11-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the documentation for QML extended types, one should use 'qmlRegisterExtendedType' instead of 'qmlRegisterType'. Reviewed-by: Leonardo Sobral Cunha <leo.cunha@nokia.com>
* | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-0612-321/+370
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure qmake/generators/win32/msbuild_objectmodel.cpp src/gui/image/qpnghandler.cpp src/network/access/qnetworkaccessdatabackend.cpp src/opengl/qgl_x11egl.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * | | | Add 'Writing New Components' docs, and document the connect() function.Bea Lam2010-12-039-315/+342
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The 'Writing QML Components' is mainly a restructuring of the 'Extending types from QML' page. It also documents the signal connect() function that was previously undocumented. Task-number: QTBUG-15718, QTBUG-15138
| * | | Fix license header.Jason McDonald2010-12-011-5/+5
| | |/ | |/|
| * | Document which header to include for qmlRegister functions.Martin Jones2010-11-302-0/+18
| | | | | | | | | | | | | | | Task-number: QTBUG-15630 Reviewed-by: Bea Lam
| * | Fix id documentationBea Lam2010-11-301-1/+1
| | | | | | | | | | | | Task-number: QTBUG-15604
| * | Link to List Properties docs from QML Intro pageBea Lam2010-11-301-0/+4
| |/ | | | | | | Task-number: QTBUG-15606
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-258-18/+518
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Fix incorrect example for Qt.rgba()Bea Lam2010-11-241-1/+1
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/doc-staging into 4.7-integrationQt Continuous Integration System2010-11-227-16/+515
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/doc-staging: Doc: Documented that border width does not affect rectangle geometry. Doc: Minor fixes to style. Doc: Updated the DirectFB documentation to reflect version changes. Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt Quick Doc: Correcting references to Qt Declarative module. doc: Stated that the destructor does not call close().
| | * Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-172-6/+6
| | |\
| | * | Doc: correcting heading - Beginning Qt Quick - into - Intro to Qt QuickMorten Engvoldsen2010-11-153-2/+501
| | | |
| | * | Doc: Correcting references to Qt Declarative module.Morten Engvoldsen2010-11-155-14/+14
| | | |
| * | | DocAaron Kennedy2010-11-221-1/+2
| | |/ | |/| | | | | | | Task-number: QTBUG-15456
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-192-6/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * | Fix license text.Jason McDonald2010-11-171-5/+5
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | Doc: fix a typo in QML/Qt UI integrationPierre Rossi2010-11-161-1/+1
| |/ | | | | | | Reviewed-by: Geir Vattekar
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-126-173/+684
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-11-095-171/+580
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (32 commits) Fix Text::elide docs. Fix Rectangle painting at small sizes. Fix QML ecmascript autotest. Fix QtQuick import. Export QDeclarativeDebugHelper on Symbian for QTBUG-13762 Don't use stdint.h in our headers since it is a C99 header. Text alignment is broken with multi-line text and implicit size. Update QtOpenVg def files for bug QT-3589 Image bounding rect should always include the area being painted Fix minehunt.pro (minehunt is no longer a plugin) Don't allow flagging of flipped tiles in Minehunt Remove Snake demo from QtDemo Fix samegame text input focus Whitespace fixes Update visual tests for Mac. Run all QML visual tests now. Make qmlvisual tests more stable Add documentation about script evaluation context and allowed types Maintain passing visualtests on X11 Fix errors in example code. Also reverts the example code to the old ...
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-11-044-170/+575
| | |\