summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-276-28/+38
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-275-28/+36
| |\ | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Improve QML framerate debugging If a pathview delegate changes size, reposition center on path Remove deprecated Flickable::overshoot property. Don't display unnecessary copyright headers in doc
| | * If a pathview delegate changes size, reposition center on pathMartin Jones2010-05-273-4/+36
| | | | | | | | | | | | Task-number: QTBUG-11006
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-2613-67/+397
| | |\
| | * | Remove deprecated Flickable::overshoot property.Martin Jones2010-05-262-24/+0
| | | |
| * | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2713-67/+397
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: doc/src/declarative/advtutorial.qdoc
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-261-0/+2
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits) Fix build when snap functionality is not available. Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags ...
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-251-0/+2
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) Dont crash when assigning the same input context twice. Fixed a typo in variable name in qlocale data generator. Fix for Norwegian and Korean languages on symbian. Remove unused function in QDBusConnectionPrivate Doc: Fixing bugs in HTML generator Updating 4.7.0 change log. Doc: Correcting style to class lists qdoc: Improved class index page. Added MSVC 2010 project files to .gitignore Fix architecture detection on GNU/Hurd. Revert "tst_bic: make it possible to test for cross-compilation" fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-241-0/+2
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-241-0/+2
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (39 commits) fix typo in documentation Improve Bearer Management related documentation in QNetworkAccessManager Compile with QT_NO_ACTION. Unbreak compilation outside Mac QDBusAbstractInterface: don't set lastError outside the object's own thread tst_bic: make it possible to test for cross-compilation Remove Q_PACKED from QChar and QLocale::Data. QDebug operator for QFlags Removing unneeded qDebug statement. Fixing incorrect addition of public API symbols. Removal erroneous inclusion of new Public API in qmacstyle. Doc: design changes qdoc: Fixed html error, but the problem is still there. qdoc: Changed number of columns to 1. Oila! Doc: Changes to the HTMLGenerator, style and js remove dead code that will never get called. add bytes and activeTime to corelwan. Fix formating of license header. fix irix build clarify wording of warning message ...
| | | | | * | Compile with QT_NO_ACTION.Tasuku Suzuki2010-05-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 643 Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
* | | | | | | Improve gradient docsAlan Alpert2010-05-261-0/+4
| |_|_|_|_|/ |/| | | | |
* | | | | | Open input panel on press if TextInput or TextEdit are already focused but ↵Joona Petrell2010-05-262-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | panel has been closed Task-number: Reviewed-by: Martin Jones
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-269-44/+292
|\ \ \ \ \ \
| * | | | | | Fix horizontal/verticalCenter anchors bug.Yann Bodson2010-05-262-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10999 Reviewed-by: Michael Brasser
| * | | | | | Add a way to control when software input panels are shown in TextInput and ↵Joona Petrell2010-05-266-21/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TextEdit elements Task-number: QTBUG-10841 Reviewed-by: Warwick Allison
| * | | | | | Fix Gradient doc snippet.Yann Bodson2010-05-261-5/+1
| |/ / / / /
* | | | | | Fix TextEdit clipping when not wrapped. Rename most-useful-wrap-mode to "Wrap".Warwick Allison2010-05-266-23/+95
|/ / / / /
* | | | | Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-252-2/+2
| | | | |
* | | | | Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
|/ / / / | | | | | | | | | | | | Task-number: QTBUG-10969
* | | | Example of a simple TextEditor look-and-feel.Warwick Allison2010-05-252-6/+19
| | | | | | | | | | | | | | | | Task-number: QTBUG-10940
* | | | Fix TextEdit implicit height.Warwick Allison2010-05-241-1/+1
|/ / /
* | | Don't polish QDeclarativeItems.Warwick Allison2010-05-241-1/+7
|/ / | | | | | | | | | | | | | | Avoids unnecessary processing and assumptions we would not want to preserve in the future. Task-number: QTBUG-10217 Reviewed-by: Martin Jones
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-242-22/+4
|\ \
| * | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-242-22/+4
| |/
* | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
|/ | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-205-21/+39
|\ | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| * Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | | | | | | Task-number: QTBUG-10765
| * Stop warnings.Warwick Allison2010-05-201-1/+1
| |
| * Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-202-8/+24
| | | | | | | | Task-number: QTBUG-10803
| * Fixes for docs, example codeBea Lam2010-05-202-11/+11
| |
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-1910-143/+247
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-197-12/+98
| |\ | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/listview/highlight.qml doc/src/snippets/declarative/listview/listview.qml
| | * Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-196-10/+92
| | | | | | | | | | | | | | | | | | | | | | | | Can still be turned back on, if people only want to target platforms where the behaviour is acceptable. Task-number: QTBUG-10684 Reviewed-by: Michael Brasser
| | * When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | | | | | | | | | | | | | | | | This ensures focus is restored to the correct item. Task-number: QTBUG-10787
| * | Doc improvementsBea Lam2010-05-193-131/+149
| |/
* | Update old keyword in docsAlan Alpert2010-05-191-1/+1
|/
* Regression fix for Loader anchors not workingJoona Petrell2010-05-181-0/+1
| | | | | Task-number: QTBUG-10766 Reviewed-by: Yann Bodson
* Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-181-3/+3
| | | | Also rearrange the parameter order to be more clear.
* Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
|
* Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | | | just to the closest focus scope parent.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-179-71/+263
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-175-5/+6
| |\
| | * Add \brief to TextInputBea Lam2010-05-171-1/+1
| | |
| * | Don't crash due to recursive positioning.Martin Jones2010-05-172-25/+40
| | | | | | | | | | | | | | | | | | 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-162-2/+2
| |\ \
| * | | Add a "priority" property to Keys and KeyNavigationMartin Jones2010-05-147-45/+222
| | | | | | | | | | | | | | | | | | | | | | | | Allows intercepting keys before or after normal item key processing. Task-number: QTBUG-10467
* | | | Fix doc for status, add Image::onLoaded.Warwick Allison2010-05-172-2/+23
| |_|/ |/| | | | | | | | | | | | | | | | | | | | 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
* | | Restructure the examples. They are now organized into variousBea Lam2010-05-163-4/+4
| | | | | | | | | | | | | | | | | | 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).
* | | Doc fixBea Lam2010-05-161-0/+1
| |/ |/|
generated by cgit v0.12 at 2025-01-01 02:13:13 (GMT)