summaryrefslogtreecommitdiffstats
path: root/doc/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-229-42/+294
|\ | | | | | | | | | | | | | | Conflicts: doc/src/declarative/declarativeui.qdoc doc/src/declarative/dynamicobjects.qdoc doc/src/declarative/elements.qdoc doc/src/examples/qml-examples.qdoc
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-215-5/+207
| |\ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: fixes/improvements for new QML right-to-left docs Fix license headers in example code Write Qt Quick 1.1 right-to-left documentation and examples Doc fix - QtQuick 1.1 scheduling
| | * fixes/improvements for new QML right-to-left docsBea Lam2011-03-213-49/+58
| | | | | | | | | | | | Clarify some of the docs and fix some broken doc links.
| | * Write Qt Quick 1.1 right-to-left documentation and examplesJoona Petrell2011-03-183-3/+196
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11042 Reviewed-by: Martin Jones Change-Id: I6319992dec52a4d9252c2df39801ebe6a7dee75d
| | * Doc fix - QtQuick 1.1 schedulingBea Lam2011-03-181-1/+1
| | | | | | | | | | | | Change-Id: If19934bf378e5fbc6cb1dce1df2164905e97f0ed
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-171-0/+11
| |\ \ | | |/ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: QDeclarativeView flickers when composited on MeeGo Re-enable lineHeight tests.
| | * QDeclarativeView flickers when composited on MeeGoMartin Jones2011-03-171-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | Set Qt::WA_OpaquePaintEvent and Qt::WA_NoSystemBackground for QDeclarativeView on meego. Change-Id: I301d2381ae831485d205ff42b0c15b3fa7a73424 Task-number: QTBUG-17173 Reviewed-by: Michael Brasser
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-111-5/+37
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update QML "What's New" docs. Don't reveal TextInput text on refocus in PasswordEchoOnEdit mode. Fix ListView boundary extents for RTL layout. Fix compiler warning.
| | * Update QML "What's New" docs.Martin Jones2011-03-111-5/+37
| | | | | | | | | | | | Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
| * | 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
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-082-2/+12
|\ \ \
| * | | Added Qt Quick License information.Jerome Pasion2011-03-032-2/+12
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17879 Reviewed-by: David Boddie
* | | | Doc: Fixed QML snippet highlighting by creating a complete code snippet.David Boddie2011-03-031-4/+1
|/ / /
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-013-6/+8
|\ \ \
| * | | Fixed broken link.Jerome Pasion2011-03-012-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| * | | Edited sentences in QML Views documentation.Jerome Pasion2011-03-011-3/+4
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
* | | | Doc: Fixed qdoc warnings.David Boddie2011-03-012-57/+45
|/ / /
* | | Merge commit 'refs/merge-requests/1113' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-281-3/+3
|\ \ \ | |/ / | | | | | | | | | | | | | | | merge-requests/1113 Conflicts: doc/src/development/qmake-manual.qdoc
| * | spelling fixes in extending.qdocDavid Fries2011-02-251-3/+3
| |/ | | | | | | | | Merge-request: 1103 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Merge commit 'refs/merge-requests/1108' of git://gitorious.org/qt/qt into ↵David Boddie2011-02-232-164/+208
|\ \ | |/ | | | | | | | | | | merge-requests/1108 Conflicts: doc/src/declarative/basictypes.qdoc
| * 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 'mimir' into 4.7David Boddie2011-02-233-9/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qdeclarativemodels.qdoc doc/src/index.qdoc doc/src/template/style/style.css tools/qdoc3/atom.h tools/qdoc3/doc.cpp tools/qdoc3/doc/qdoc-manual.qdoc tools/qdoc3/doc/qdoc-manual.qdocconf
| * | | qdoc: Removed some uses of \raw an d \endraw.Martin Smith2011-01-201-3/+0
| | | | | | | | | | | | | | | | 8 instances of raw-html remain.
| * | | qdoc: Fixed some validation errors in the DITA filesMartin Smith2011-01-192-6/+6
| | | | | | | | | | | | | | | | 11 instances of raw-html remain.
| * | | Merge branch '4.7' into mimirDavid Boddie2010-12-155-23/+112
| |\ \ \
* | | | | Removed GestureArea link from the elements page.Jerome Pasion2011-02-211-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional merge conflicts fix. Reviewed-by: David Boddie
* | | | | Doc: Fixed links and whitespace.David Boddie2011-02-1717-53/+51
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/jpasions-qt-doc-team-qtquick ↵David Boddie2011-02-1729-1766/+819
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7 Conflicts: doc/src/declarative/extending.qdoc doc/src/external-resources.qdoc doc/src/overviews.qdoc src/declarative/util/qdeclarativeview.cpp
| * | | | | Adding snippet code to coding article.Jerome Pasion2011-02-171-36/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Wrote an overview for the WebKit QML module.Jerome Pasion2011-02-171-11/+19
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Removed section names and added a link to Qt Quick page.Jerome Pasion2011-02-1712-105/+76
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Added a qdoc keywordJerome Pasion2011-02-161-1/+1
| | | | | |
| * | | | | Removed links to unfinished documentation.Jerome Pasion2011-02-161-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Re-wrote QML Views overview page. Created new snippets and images.Jerome Pasion2011-02-161-48/+56
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Added new snippet code.Jerome Pasion2011-02-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Resized image and took out extra lines.Jerome Pasion2011-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Re-wrote Qt Quick intro. Deleted unused snippets and images.Jerome Pasion2011-02-153-632/+110
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Edited section titles and added links to relevant sections.Jerome Pasion2011-02-152-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Shuffled navigation and modified next/previous links.Jerome Pasion2011-02-158-41/+18
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071
| * | | | | Removed unused snippet code. Changed reference to snippet.Jerome Pasion2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-16071