summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2425-19/+84
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2425-19/+84
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| | * Merge remote branch 'origin/master'Thiago Macieira2010-02-2326-394/+288
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| | * \ Merge remote branch 'origin/master'Thiago Macieira2010-02-2046-579/+911
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| | * | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1925-18/+83
| | | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-239-50/+329
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | Doc fixAlan Alpert2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | Remove stray '>'
| * | | | Add missing NOTIFY signals to positioners, particles and webviewJoona Petrell2010-02-236-42/+161
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-231-3/+0
| |\ \ \ \
| | * | | | QmlExpression API reviewAaron Kennedy2010-02-231-3/+0
| | | | | |
| * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-231-2/+1
| |/ / / / | | | | | | | | | | | | | | | Task-number: QT-2538
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-231-1/+1
| |\ \ \ \
| * | | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-232-4/+168
| | |_|_|/ | |/| | | | | | | | | | | | | Task-number: QT-2777
* | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-231-6/+0
| |/ / / |/| | | | | | | | | | | Task-number: QT-2798
* | | | Better support modelData for object list models.Michael Brasser2010-02-231-1/+1
|/ / / | | | | | | | | | modelData will now correctly return the actual object.
* | | Make uncached text painting work for richtext too.Martin Jones2010-02-232-3/+12
| | |
* | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2214-265/+136
| | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
* | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-228-113/+114
| | |
* | | Fix compile error on SolarisAaron Kennedy2010-02-225-14/+27
| |/ |/| | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
* | Revert "Speed up QmlGraphicsItem::setParentItem."Bjørn Erik Nilsen2010-02-191-5/+1
| | | | | | | | | | | | | | | | | | This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85. This change introduced some regression due to itemChange notifications not being delivered as expected (reported by Warwick). We have to find another solution, unfortunately. However, the performance penalty isn't that big so we can live with it for now.
* | Fix "AnimatedImage ignores Anchors setting"Michael Brasser2010-02-191-0/+1
| | | | | | | | Task-number: QTBUG-8343
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1883-83/+87
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1681-81/+85
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * Fix copyright year.Jason McDonald2010-02-1681-81/+81
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * doc: Fixed some qdoc errors.Martin Smith2010-02-161-0/+4
| | |
* | | Doc: onExited, onEntered only work when button pressed or hoverEnabledMartin Jones2010-02-181-0/+16
| | | | | | | | | | | | Task-number: QTBUG-8305
* | | Ensure visibleIndex and currentIndex are updated on itemsMoved().Martin Jones2010-02-181-2/+25
| | |
* | | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.
* | | Fix typo in docsAlan Alpert2010-02-171-1/+1
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1746-566/+862
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits) Add missing NOTIFY signals to various QML item class properties Fix currentIndex after itemsMoved() qmlviewer: build on symbian Revert "Replace QList<>* support with QmlListProperty" Declare QmlXmlListModelRole meta type before any code uses it. Make compile on Symbian (call Q_DECLARE_METATYPE earlier) Conditionally link webkit on wince Revert "Run dos2unix on these files." Expose LayoutItem documentation Fix palette on the N900 Fix QTBUG-8090, improve original patch effectiveness. Replace QList<>* support with QmlListProperty Run dos2unix on these files. Remove standalone QmlDebugger. It is now only available through the Mobility 404 Fix crash in QmlMetaProperty that could occur when using value-type QML binding optimizer crash QML binding optimizer crash Fix crash in QML binding optimizer Don't delete binding directly ...
| * | Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-1710-17/+74
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | Fix currentIndex after itemsMoved()Martin Jones2010-02-171-8/+46
| | | | | | | | | | | | | | | | | | Ensure fixupPosition() positions properly for StrictlyEnforceRange highlight mode. Update visibleIndex after itemsMoved().
| * | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-176-11/+12
| | | | | | | | | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-0/+7
| |\ \
| | * | Expose LayoutItem documentationAlan Alpert2010-02-161-0/+7
| | | | | | | | | | | | | | | | Also made it slightly more verbose.
| * | | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-166-12/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-161-4/+0
| |\ \
| | * | transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-4/+0
| | | |
| * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-163-7/+7
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-163-4/+10
| |\ \
| | * \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-152-2/+6
| | |\ \
| | | * | Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | | | | | | | | | | | | | | | | | | | This commit should make declarative compile against 4.6.2 again.
| | * | | Fix TextInput keypad navigationAlan Alpert2010-02-151-2/+4
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Was accidentally ignoring key movements even when an existing selection meant that pressing right/left would do something. Task-number: QT-2944
| * | | Ensure new WebView windows are notified correctly. Improve test.Warwick Allison2010-02-151-1/+2
| |/ / | | | | | | | | | | | | Change 282a46ab5edafa7b82e9c58658143cb979db2d85 prevents itemChange() notification. That seems wrong, but this change is a work-around.
| * | Fix compile with -no-webkitWarwick Allison2010-02-153-1/+8
| | |
| * | Fix buildWarwick Allison2010-02-153-6/+0
| | | | | | | | | | | | Remove unneeded .moc imports resulting from moved classes.
| * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-1439-521/+711
| |/ | | | | | | | | | | construction. Task-number: QT-2798
* | Prepare translations of the declarative module.Friedemann Kleint2010-02-151-13/+13
|/ | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* Fix scrolling backwards when pathItemCount != model.countAlan Alpert2010-02-121-2/+7
| | | | | | | | | Also fixes -Scrolling backwards when model.count != 0 mod pathItemCount -A minor typo in a comment Task-number: QTBUG-6865 Reviewed-by: Martin Jones
* Fix warningsAaron Kennedy2010-02-121-3/+0
|
generated by cgit v0.12 at 2025-03-11 06:57:07 (GMT)