summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1714-88/+432
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-17401-429/+495
| |\
| | * ListModel::get() shouldn't print warnings for invalid indices since itBea Lam2010-05-172-14/+5
| | | | | | | | | | | | returns undefined items for these cases anywyay.
| | * Add \brief to TextInputBea Lam2010-05-171-1/+1
| | |
| * | Don't crash due to recursive positioning.Martin Jones2010-05-173-27/+65
| | | | | | | | | | | | | | | | | | Also extend positioner anchor check to include fill and centerIn. Task-number: QTBUG-10731
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-16306-3218/+6499
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-146-16/+18
| |\ \ \
| * | | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-149-46/+361
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows intercepting keys before or after normal item key processing. Task-number: QTBUG-10467
* | | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-173-5/+29
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | statusChanged is NOT emitted for local files, nor should it be (they are loaded synchronously, so status is *initially* Ready). Add onLoaded signal that *is* emitted. Reviewed-by: Michael Brasser
* | | | Add missing .proBea Lam2010-05-171-0/+5
| | | |
* | | | Restructure the examples. They are now organized into variousBea Lam2010-05-16396-413/+483
| | | | | | | | | | | | | | | | | | | | | | | | subdirectories to make it easier to locate examples for certain features (e.g. animation) and to distinguish between different types of examples (e.g. very basic examples vs complex demo-like examples).
* | | | graphicsWidgets doc example was previously removedBea Lam2010-05-161-1/+0
| | | |
* | | | Doc fixBea Lam2010-05-161-0/+1
| |_|/ |/| |
* | | Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
| | | | | | | | | | | | | | | | | | QtXml is not required by QtSvg, QtWebKit or QtDeclarative. And QtDeclarative doesn't link to QtWebKit anymore (imports do). But it does link to QtOpenGL.
* | | QtDeclarative doesn't use QtXml, so don't link to it or require others toThiago Macieira2010-05-141-2/+2
| | |
* | | Add new logo for QML Launcher (Mac OS X)Kai Koehne2010-05-143-0/+3
| | |
* | | Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-1412-46/+50
| | | | | | | | | | | | | | | | | | | | | | | | The qml executable was first referred to as QML Viewer, then QML Runtime ... however, the latter one caused much confusion (see old version of qmlruntime.qdoc). Doc changes reviewed by Leena Miettinen.
* | | Remove skins from qml launcher.Kai Koehne2010-05-144-271/+2
| | |
* | | Fix compilation of QtDeclarative module (gcc)Kai Koehne2010-05-141-1/+1
| | | | | | | | | | | | Broke with commit 645b9ee9dd6
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-14152-970/+1938
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Qt.include() support in worker scripts Only add "include" property in non-workerscript threads Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89 Reduce the chance of AnchorAnimation animating geometry changes it Add Qt.include() method for scoped inclusion of JavaScript files Fix crash in ParentAnimation. Revert "Fix crash in ParentAnimation." Symbian build fix to declarative auto and benchmark tests Revert "Use raster graphicssystem for qml.app on OS X." Fix crash in ParentAnimation. Minor declarative webview tweaks Removed dependency of QDeclarativeWebView to private Qt (Declarative) API Note that you need to unset a flag to create a visual item Follow-up on Flickable changes. ListModel::get() should return undefined if bad index specified Add an example spinner. Fix crash on remote content. Dates and variants are not considered nested objects
| * | | Qt.include() support in worker scriptsAaron Kennedy2010-05-144-1/+69
| | | |
| * | | Only add "include" property in non-workerscript threadsAaron Kennedy2010-05-141-1/+2
| | | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-141-4/+8
| |\ \ \
| | * | | Reduce the chance of AnchorAnimation animating geometry changes itMichael Brasser2010-05-141-4/+8
| | | | | | | | | | | | | | | | | | | | isn't responsible for.
| * | | | Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89Aaron Kennedy2010-05-1410-12/+182
| |/ / / | | | | | | | | | | | | Grrr
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-14166-1265/+1890
| |\ \ \ | | | |/ | | |/|
| | * | Fix crash in ParentAnimation.Michael Brasser2010-05-146-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | copyOriginals plays with the order of the revertList, which messes up the assumptions of ParentAnimation. The full fix will require some rearchitecting of how the states and transitions handle "related" actions, but for now this fixes the crash. Reverting to the base state has also been fixed. Task-number: QTBUG-10671, QTBUG-10676
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-05-1475-120/+529
| | |\ \ | | | |/
| | | * Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-1475-120/+529
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9491 Reviewed-by: Martin Jones
| | * | Revert "Fix crash in ParentAnimation."Michael Brasser2010-05-141-9/+8
| | |/ | | | | | | | | | This reverts commit 8f800ea5611be333ae15f932dfea50bc80852c03.
| | * Revert "Use raster graphicssystem for qml.app on OS X."Michael Brasser2010-05-141-1/+1
| | | | | | | | | | | | This reverts commit d412a77d1e9a1c6810e10dfa4a0a35a81391cf29.
| | * Fix crash in ParentAnimation.Michael Brasser2010-05-141-8/+9
| | | | | | | | | | | | | | | | | | When rolling-back a parent change, the actions are in reverse order. Task-number: QTBUG-10671
| | * Minor declarative webview tweaksAlan Alpert2010-05-1323-575/+235
| | | | | | | | | | | | | | | | | | | | | Added a comment to the class docs, and cleaned up the visual tests a little. However the visual tests are old and text heavy, and since we never seem to check them we might wait on updating them for a little longer.
| | * Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-133-185/+113
| | | | | | | | | | | | | | | Exchanged the use of QDeclarativePaintedItem with the use of QGraphicsWebView and its tiled backing store.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-13151-596/+1602
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1318-63/+245
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Follow-up on Flickable changes. ListModel::get() should return undefined if bad index specified Add an example spinner. Fix crash on remote content. Dates and variants are not considered nested objects
| | | | * Follow-up on Flickable changes.Yann Bodson2010-05-135-44/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - flicking and moving properties will not be removed - onMovement* and onFlick* signals are back in Reviewed-by: Martin Jones
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1310-6/+125
| | | | |\
| | | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-132-11/+21
| | | | | |\
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-13151-772/+2271
| | | | | |\ \
| | | | | * | | Add an example spinner.Martin Jones2010-05-1310-6/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add missing increment/decrementCurrentIndex() slots to PathView, and tweak the number of points cached along a Path.
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1395-237/+631
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | ListModel::get() should return undefined if bad index specifiedBea Lam2010-05-132-11/+21
| | | | | | |/ | | | | | |/|
| | | | * | | Fix crash on remote content.Warwick Allison2010-05-131-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Breakage was actually quite bad, just hard to reproduce. Task-number: QTBUG-10565
| | * | | | | Note that you need to unset a flag to create a visual itemAlan Alpert2010-05-131-1/+4
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | This needs to be documented as long as its true, or else it's a common source of confusion when writing QML items.
| * | | | | Add Qt.include() method for scoped inclusion of JavaScript filesAaron Kennedy2010-05-1417-0/+540
| | |_|/ / | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1395-226/+611
| |\ \ \ \
| * | | | | Dates and variants are not considered nested objectsAaron Kennedy2010-05-131-1/+2
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-1469-1242/+2000
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits) Avoid running animation when loopCount == 0 Set the pictures for the examples of multitouch Compile fix on Windows. Remove an unnecessary assert. Documentation for the Pad Navigator Example. New Pad Nagivator example implementation. Skip definition of wintab functions in case of QT_NO_TABLETEVENT. Made curve tesselation be dynamically adjusted based on transform. Modified QPainter and QPixmap benchmarks to use raster pixmaps. Stabilize tst_QWidgetAction::visibilityUpdate Fix compiler warning in QT_REQUIRE_VERSION Stabilize tst_QColumnView::parentCurrentIndex Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux Fix typos in Elastic Nodes example documentation. Made paint engine texture drawing work in GL ES 2 and updated docs. Opt out of visual-config size checks with extension Fix off-by-one in text layouts and widget size hints on Mac Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry Mark QFileDialog::Options as a Q_FLAGS fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux ...
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-1369-1242/+2000
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (35 commits) Avoid running animation when loopCount == 0 Set the pictures for the examples of multitouch Compile fix on Windows. Remove an unnecessary assert. Documentation for the Pad Navigator Example. New Pad Nagivator example implementation. Skip definition of wintab functions in case of QT_NO_TABLETEVENT. Made curve tesselation be dynamically adjusted based on transform. Modified QPainter and QPixmap benchmarks to use raster pixmaps. Stabilize tst_QWidgetAction::visibilityUpdate Fix compiler warning in QT_REQUIRE_VERSION Stabilize tst_QColumnView::parentCurrentIndex Really fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux Fix typos in Elastic Nodes example documentation. Made paint engine texture drawing work in GL ES 2 and updated docs. Opt out of visual-config size checks with extension Fix off-by-one in text layouts and widget size hints on Mac Stabilize tst_QDockWidget::taskQTBUG_9758_undockedGeometry Mark QFileDialog::Options as a Q_FLAGS fix tst_QDockWidget::taskQTBUG_9758_undockedGeometry on Linux ...