summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-022-2/+2
|\ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make the TextInput cursorRectangle relative to the item. Don't assert if font engine creates new glyphs Doc: remove experimental GestureArea from contents and add PinchArea Add QML file for TextEdit positionAt test. Don't return positions within preedit text from positionAt(). Add an is input method composing property to TextEdit and TextInput.
| * Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-022-2/+2
| | | | | | | | | | Change-Id: I5eb6d2826f673c7067fde1447f25d3fc97b5aa5e Reviewed-by: Bea Lam
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-282-32/+37
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel test - set folder to one containing files. Drag over bounds errors when ListView has variable height content FolderListModel emitted incorrect rowsRemoved range causing crash. fix/improve docs for new QtQuick 1.1 attributes Fix test instability. Document BorderImage::asynchronous Ensure layout is updated when section property changes. QDeclarativeDebug: Export needed symbols on Symbian Add a 'CursorPosition' parameter to TextInput.positionAt(). Fix qmlviewer compilation on old Symbian platforms
| * fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-282-32/+37
| | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
* | spelling fixes in extending.qdocDavid Fries2011-02-251-3/+3
|/ | | | | Merge-request: 1103 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-101-69/+118
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update modules-related tests and docs CLeanup registers after AddString
| * Update modules-related tests and docsBea Lam2011-02-101-69/+118
| | | | | | | | | | | | | | Added tests for remote imports and fixed/improved examples and text in the docs. Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-091-99/+84
|\ \ | |/ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix auto test failure. PathView regression: dragging the path didn't update currentIndex Fix docs for variant and list basic types Add test for importing plugins that contain QML files Call onAdd() for first items added to ListView and GridView Use same values for Text.lineHeightMode and QTextBlock::lineHeightMode from master. Don't clear pre-edit text when a graphics items loses focus.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2011-02-091-0/+9
| |\ | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativemoduleplugin/qdeclarativemoduleplugin.pro Change-Id: I8da521f05ebc266d91caa582852155b571d5cc63
| * | Fix docs for variant and list basic typesBea Lam2011-02-091-99/+84
| | | | | | | | | | | | | | | | | | | | | | | | Make it clear that QML properties never store JavaScript object data, and that inefficient serialization must be performed when JavaScript objects are copied to QML properties. Task-number: QTBUG-16624
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-081-0/+9
|\ \ \ | | |/ | |/| | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Support seperate versions of installed modules
| * | Support seperate versions of installed modulesmae2011-02-081-0/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML supports versioned types in modules. There's a version major and a version minor. This makes it possible to have a module com.organisation.fancycomponents with version 1.0, and later you could ship a new module com.organisation.fancycomponents which contains a more recent version 1.1 or 2.0 AND also the old versions to keep old code running. This is good. The problem is that this is difficult with certain QA procedures. It's hard to verify that a new module is indeed 100% compatible with the previous versions. The change extends the import mechanism by adding optional versioning to the component patch. With the patch, you can add a new module com.organisation.fancycomponents.2.0 which will be loaded when the QML file specifies "import com.organisation.fancycomponents 2.0". The patch works as follows: if you try to load com.organisation.fancycomponents in version 2.0, the engine first looks for com/organisation/fancycomponents.2.0, then for com/organisation/fancycomponents.2 then for com.organisation/fancycomponents. Reviewed-by: Aaron Kennedy Task-number: QTBUG-16455
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into ↵Qt Continuous Integration System2011-02-0420-252/+311
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits) Doc: Fixed a reference to the wrong image. Fixed a bug that caused marked up inline text to be truncated. Doc: Renamed an image to ensure that it does not clash with another. Doc: Fixed QML, unindented snippet. Doc: Removed unnecessary HTML entity from the title. Doc: Fixed broken links to the old Symbian Foundation Wiki. Doc: Updated the copyright statements in the templates. Doc: Fixing typo Replace all occurances of "Qt 4.7" with "QtQuick 1.0" Doc: Adjusted the font sizes for the offline documentation. Doc: Added a missing style sheet to the qhp manifest. Doc: Fixed the qthelp namespace for the Qt documentation. Doc: including missing pages in overviews. Doc: Fixed typo in QCoreApplication docs Fixed whitespace. Avoid hard-coding product names in page titles. Doc: Unindented a code snippet. Doc: Fixed confusing wording of a sentence. Doc: Fixed a broken link. Doc: Updated the information about commercial editions of Qt. ...
| * Merge branch 'qdoc-simplified' into 4.7David Boddie2011-01-271-1/+1
| |\
| | * Doc: Unindented a code snippet.David Boddie2011-01-271-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-01-262-0/+12
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-263-4/+4
| |\ \ \
| | * | | doc: Fixed a missing * in the docs for QML_DECLARE_TYPEThorbjørn Lindeijer2011-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's actually equivalant to Q_DECLARE_METATYPE(TYPE *). This explains why it works on classes that use Q_DISABLE_COPY. Reviewed-by: David Boddie <david.boddie@nokia.com>
| | * | | Doc: Fixing typoMorten Engvoldsen2011-01-251-1/+1
| | | | |
| | * | | Doc: fixing bugs and typos based on feedbackMorten Engvoldsen2011-01-252-2/+2
| | | | |
| * | | | Doc: Fixed qdoc warnings about broken links.David Boddie2011-01-262-7/+6
| | | | |
| * | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-261-1/+1
| | | | |
| * | | | Doc: Fixed broken QML code snippets.David Boddie2011-01-251-8/+9
| | |_|/ | |/| |
| * | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-243-18/+21
| | | |
| * | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-2140-354/+494
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/util/qdeclarativeanimation.cpp
| | * | | Doc: Fixed qdoc warnings caused by invalid/incomplete QML snippets.David Boddie2011-01-175-16/+35
| | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-01-141-113/+156
| | |\ \
| | | * | Changed the QML Elements page groupings.Jerome Pasion2011-01-141-113/+156
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071 Reviewed-by: David Boddie
| | * | | Merge branch '4.7' of ../qt into 4.7David Boddie2011-01-1340-218/+292
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativeintro.qdoc doc/src/declarative/qdeclarativereference.qdoc doc/src/snippets/declarative/focus/focusColumn.qml tools/qdoc3/apigenerator.cpp tools/qdoc3/apigenerator.h tools/qdoc3/archiveextractor.cpp tools/qdoc3/bookgenerator.cpp tools/qdoc3/bookgenerator.h tools/qdoc3/ccodeparser.cpp tools/qdoc3/command.cpp tools/qdoc3/command.h tools/qdoc3/cpptoqsconverter.cpp tools/qdoc3/dcfsection.cpp tools/qdoc3/dcfsection.h tools/qdoc3/jambiapiparser.cpp tools/qdoc3/jambiapiparser.h tools/qdoc3/javacodemarker.cpp tools/qdoc3/javacodemarker.h tools/qdoc3/javadocgenerator.cpp tools/qdoc3/javadocgenerator.h tools/qdoc3/linguistgenerator.cpp tools/qdoc3/linguistgenerator.h tools/qdoc3/loutgenerator.h tools/qdoc3/mangenerator.cpp tools/qdoc3/mangenerator.h tools/qdoc3/polyarchiveextractor.cpp tools/qdoc3/polyarchiveextractor.h tools/qdoc3/polyuncompressor.cpp tools/qdoc3/polyuncompressor.h tools/qdoc3/qsakernelparser.cpp tools/qdoc3/qscodemarker.cpp tools/qdoc3/qscodemarker.h tools/qdoc3/qscodeparser.cpp tools/qdoc3/qscodeparser.h tools/qdoc3/sgmlgenerator.cpp tools/qdoc3/sgmlgenerator.h tools/qdoc3/test/qt-html-templates.qdocconf tools/qdoc3/uncompressor.cpp tools/qdoc3/webxmlgenerator.cpp tools/qdoc3/webxmlgenerator.h
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-12-214-5/+5
| | |\ \ \
| | | * | | Doc: Changed a page title.David Boddie2010-12-214-5/+5
| | | | | |
| | * | | | Doc: Fixed QML syntax in quoted code snippets.David Boddie2010-12-211-1/+1
| | |/ / /
| | * | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-202-1/+5
| | |\ \ \
| | * \ \ \ Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-171-1/+1
| | |\ \ \ \
| * | | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-211-21/+16
| |/ / / / /
| * | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2010-12-155-23/+112
| |\ \ \ \ \
| * | | | | | Doc: Used div elements for floats, updated the style sheet.David Boddie2010-12-142-7/+19
| | | | | | |
| * | | | | | Doc: Changed floating images to use the new float qdoc macros.David Boddie2010-12-132-19/+7
| | | | | | |
| * | | | | | Doc: Fixed non-well-formed XHTML.David Boddie2010-12-131-14/+14
| | | | | | |
| * | | | | | Doc: Temporarily used \qml...\endqml markup for the QML introduction.David Boddie2010-12-091-43/+32
| | | | | | |
* | | | | | | Move Qt.application docs into Qt global object pageBea Lam2011-02-021-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was documented as a separate 'Application' element Reviewed-by: Martin Jones
* | | | | | | update What's New for QtQuick 1.1 and AnimatedImage docsBea Lam2011-02-021-4/+14
| | | | | | |
* | | | | | | Update Docs, Examples and Demos for new CreateObject overloadableChristopher Ham2011-01-281-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dynamic object in Docs explains QScriptValue argument. SameGame and Dynamic scene now make use of overloadable. Task-number: QTBUG-13087 Reviewed-by: Bea Lam
* | | | | | | Allow property bindings to be easily created from JavaScriptBea Lam2011-01-272-51/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Properties can now be assigned a function that returns the binding value. Task-number: QTBUG-14964 Reviewed-by: Aaron Kennedy
* | | | | | | Add list of new properties/methods in QtQuick 1.1Martin Jones2011-01-241-1/+97
| | | | | | |
* | | | | | | Add a layout direction example to positionersJoona Petrell2011-01-191-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Alan Alpert
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-1939-38/+50
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fix doc typoAlan Alpert2011-01-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tidy up that section a little, while I'm at it.
| * | | | | | Document centerIn and fill in the anchors docsAlan Alpert2011-01-131-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16467
| * | | | | | Document level of support for QGraphicsObject propertiesAlan Alpert2011-01-131-0/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the context of QML, they are not officially supported as public API unless otherwise documented in QDeclarativeItem. This commit mentions that somewhere. Task-number: QTBUG-15797 Reviewed-by: Martin Jones