summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Active window focus gain should not open virtual keypadJoona Petrell2010-05-283-2/+5
| | | | | Task-number: Reviewed-by: Martin Jones
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-288-49/+271
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-2712-77/+303
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2711-77/+301
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2720-158/+500
| | | |\
| | | * | Improve QML framerate debuggingAaron Kennedy2010-05-276-49/+265
| | | | |
| | * | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-05-2717-137/+467
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | | | | | * \ \ \ 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
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Use QElapsedTimer rather than QTime::elapsed()Martin Jones2010-05-286-42/+58
| |_|_|_|_|_|_|_|/ |/| | | | | | | |
* | | | | | | | | 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-2617-137/+467
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Doc fixes, improvementsBea Lam2010-05-261-58/+44
| | | | | | | | |
| * | | | | | | | Allow js files with '.pragma library' to be used from WorkerScriptBea Lam2010-05-261-0/+1
| | | | | | | | |
| * | | | | | | | Add more examples of XPath expressions to XmlRole.Bea Lam2010-05-261-10/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10852
| * | | | | | | | 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-2610-46/+294
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | * | | | | | | Replace QTime with QElapsedTimerAaron Kennedy2010-05-261-2/+2
| | | | | | | | |
| | * | | | | | | 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
| |/ / / / / /
* | | | | | | Remove deprecated Flickable::overshoot property.Martin Jones2010-05-262-24/+0
|/ / / / / /
* | | | | | Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-253-2/+3
| | | | | |
* | | | | | Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
|/ / / / / | | | | | | | | | | | | | | | Task-number: QTBUG-10969
* | | | | Revert "Reading/writing a non-existent property throws an exception"Aaron Kennedy2010-05-254-14/+26
| | | | | | | | | | | | | | | | | | | | This reverts commit 2b3e7706f4459569520c77b9fb3ff2bc006e60f1.
* | | | | Revert "Always pass context to QObject script class"Aaron Kennedy2010-05-254-9/+6
| | | | | | | | | | | | | | | | | | | | This reverts commit d982ded10a3dd5219ae40a5a3574b63ac7bdda3f.
* | | | | Always pass context to QObject script classAaron Kennedy2010-05-254-6/+9
| | | | | | | | | | | | | | | | | | | | QTBUG-10659
* | | | | Reading/writing a non-existent property throws an exceptionAaron Kennedy2010-05-254-26/+14
| | | | | | | | | | | | | | | | | | | | QTBUG-10659
* | | | | DocAaron Kennedy2010-05-251-2/+2
| | | | |
* | | | | 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
|/ / / /
* | | | Added autotest for Component.createObject() without Qt.createComponent()Alan Alpert2010-05-242-5/+9
|/ / / | | | | | | | | | | | | | | | Also augmented the docs for both functions a little. Task-number: QTBUG-10926
* | | Compiler warningAaron Kennedy2010-05-241-1/+1
| | | | | | | | | | | | QTBUG-10816
* | | Remove incorrect ASSERTAaron Kennedy2010-05-241-3/+1
| | | | | | | | | | | | QTBUG-10832
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-242-1/+18
|\ \ \
| * | | Don't crash when assigning a Behavior to a grouped property.Michael Brasser2010-05-242-1/+18
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10799 Reviewed-by: Aaron Kennedy
* | | | Be slightly more verbose on assigning undefined in binding.Warwick Allison2010-05-241-1/+3
|/ / / | | | | | | | | | Task-number: QTBUG-10303
* | | 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-2411-92/+42
|\ \
| * | Move copies of toLocalFileOrQrc() to QDeclarativeEnginePrivateBea Lam2010-05-2410-94/+34
| | |
| * | Allow resource files to be loaded in WorkerScriptBea Lam2010-05-241-3/+11
| | |
| * | Component::createObject() don't attempt to set parent of null objectMartin Jones2010-05-241-4/+6
| | | | | | | | | | | | | | | Don't try to set graphics item parent on an object that is not a QGraphicsItem
* | | Fix TextEdit alignment.Warwick Allison2010-05-242-19/+30
|/ / | | | | | | | | | | | | Vertical never worked. Horizontal broke at 633b4b0655bf47b6f5100ee9a6c2f692b0aeb081. Task-number: QTBUG-10895
* | Ensure QML Global Qt object functions appear in the documentation indexWarwick Allison2010-05-212-3/+305
| | | | | | | | | | | | | | | | Also moves documentation of Qt global object to alongside code. Docs are slightly misleading because they say "Qt::argb" etc. when "Qt.argb" would be clearer. Downgrades QTBUG-7725 from P2 to P4 as remaining functions are standard webJS. Task-number: QTBUG-7725