summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix and test remote root component with qmldir-specified content.Warwick Allison2010-04-131-0/+4
| | | | 6ed43975f6733265b8b91b00a9a212076d896ef9 was not correct fix (just invalidated the test)
* doc fixesYann Bodson2010-04-121-5/+15
|
* More error output for QML_IMPORT_TRACE=1mae2010-04-121-0/+9
|
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-12100-1354/+2243
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Fix declarative examples autotest, avoid using native separators Doc: update Rectangle smooth painting screenshot. Add some TextInput properties and methods Remove GraphicsObjectContainer from the documentation. import Qt 4.6 -> import Qt 4.7 Move documentation code to snippet. Test fix. Fix test Fix test on QWS. Fix PathView crash. Make bindings dump more useful Improve font value type documentation. coding conventions Doc fixes Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-121-0/+1
| |\
| | * Doc: update Rectangle smooth painting screenshot.Yann Bodson2010-04-121-0/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-04-12154-1949/+3538
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/graphicsitems/qdeclarativetextinput_p.h
| | * Move documentation code to snippet.Yann Bodson2010-04-121-41/+15
| | |
| | * Fix PathView crash.Michael Brasser2010-04-121-1/+1
| | | | | | | | | | | | Task-number: QTBUG-9753
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1221-522/+1455
| | |\
| | | * Improve font value type documentation.Yann Bodson2010-04-123-5/+316
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-04-1218-517/+1128
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/javascriptblocks.qdoc
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1299-1258/+1733
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (130 commits) Warning Read Maemo orientation at startup Exclude gestures from examples autotest Exclude proxywidgets from examples autotest Fix crash on QScriptProgram destruction doc fixes Start documenting coding conventions Adds missing qml file to qdeclarativeflipable autotest Revert "Better reporting of extension plugin loading errors." Doc Fix graphicswidget auto-test. Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. ...
| | | * | | Doc fixesBea Lam2010-04-121-0/+15
| | | | | |
| | * | | | Make bindings dump more usefulAaron Kennedy2010-04-121-46/+69
| | | |_|/ | | |/| |
| | * | | Fix crash on QScriptProgram destructionAaron Kennedy2010-04-121-0/+4
| | |/ /
| | * | Revert "Better reporting of extension plugin loading errors."Aaron Kennedy2010-04-121-23/+7
| | | | | | | | | | | | | | | | This reverts commit e0dcdbd2984299665b9b784b201289219b9978d3.
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-1098-1264/+1751
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (119 commits) Add Mac OS X bundle description for qml runtime Cleanup Disallow writes to read-only value type properties Allow undefined to be assigned to QVariant properties Add a Qt.isQtObject() method Fix crash in QML library imports Remove QT_VERSION checks in QML List properties aren't read-only Small doc fix. Make sure WorkerScript thread is stopped on deletion. This also fixes Release ListModel's worker agent on deletion. Doc fixes Fix example Example code style improvements Enable other wrapping modes. TextEdit::wrap changed to TextEdit::wrapMode enumeration Remove use of obsolete "Script" element. unwarn Replace "var" with "variant" in tests Fix test after deletion of GraphicsObjectContainer. ...
| | | * | CleanupAaron Kennedy2010-04-092-88/+95
| | | | |
| | | * | Disallow writes to read-only value type propertiesAaron Kennedy2010-04-091-0/+4
| | | | | | | | | | | | | | | | | | | | QTBUG-9685
| | | * | Allow undefined to be assigned to QVariant propertiesAaron Kennedy2010-04-092-0/+6
| | | | | | | | | | | | | | | | | | | | QTBUG-9704
| | | * | Add a Qt.isQtObject() methodAaron Kennedy2010-04-092-0/+10
| | | | | | | | | | | | | | | | | | | | QTBUG-9705
| | | * | Fix crash in QML library importsAaron Kennedy2010-04-091-0/+1
| | | | | | | | | | | | | | | | | | | | QTBUG-9705
| | | * | Remove QT_VERSION checks in QMLAaron Kennedy2010-04-098-56/+0
| | | | | | | | | | | | | | | | | | | | We only support Qt 4.7 now.
| | | * | List properties aren't read-onlyAaron Kennedy2010-04-091-1/+2
| | | | |
| | | * | Small doc fix.Martin Jones2010-04-092-7/+7
| | | | |
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-1/+16
| | | |\ \
| | | | * | Make sure WorkerScript thread is stopped on deletion. This also fixesBea Lam2010-04-091-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | the leaking of the worker agent in ListModel.
| | | | * | Release ListModel's worker agent on deletion.Bea Lam2010-04-092-1/+3
| | | | | |
| | | * | | Enable other wrapping modes.Martin Jones2010-04-094-15/+18
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WrapAnywhere - Text can be wrapped at any point on a line, even if it occurs in the middle of a word. WrapAtWordBoundaryOrAnywhere - If possible, wrapping occurs at a word boundary; otherwise it will occur at the appropriate point on the line, even in the middle of a word.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-091-1/+1
| | | |\ \
| | | | * | unwarnWarwick Allison2010-04-091-1/+1
| | | | | |
| | | * | | TextEdit::wrap changed to TextEdit::wrapMode enumerationMartin Jones2010-04-095-26/+57
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0916-578/+54
| | | |\ \ \ | | | | |/ /
| | | | * | Fix url resolution in PropertyChanges.Michael Brasser2010-04-093-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure bindings in PropertyChanges resolve urls correctly. Also refactor the code so that PropertyChanges will always use the standard url resolution support provided by QDeclarativeProperty. Task-number: QTBUG-9571
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-091-7/+23
| | | | |\ \
| | | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0912-560/+100
| | | | | |\ \
| | | | | * | | Better reporting of extension plugin loading errors.Warwick Allison2010-04-091-7/+23
| | | | | | | |
| | | | * | | | Use variant instead of var in QMLAaron Kennedy2010-04-093-21/+10
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QML "var"s are not the same as JavaScript vars - they are QVariants instead. However, as they behave in a similar enough fashion to native JavaScript it can be confusing to developers when they are called "var".
| | | | * | | Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-099-541/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit deletes the uneeded classes/declarations since we have now an inline support for QGraphicsObject based classes. QGraphicsLayout bindings works the same way because the layout property has been added to QGraphicsWidget. The only feature that is missing for now (because of the deletion of GraphicsObjectContainer) is the anchoring support. We will probably take a look on how to support this feature properly with no wrapper. Task-number:QTBUG-9456 Reviewed-by:Michael Brasser
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-093-19/+97
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Make the TextInput element nicer. It has scrolling.Alexis Menard2010-04-093-19/+97
| | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The TextInput has support for scrolling now so it's quite usable. You can deactivate the auto scrolling with a property if you want to do crazy animation while scrolling. This commit also fixed several bugs with the current implementation especially regarding aligments : selection was broken, moving the cursor also -> fixed. I have also added a tiny fix when the TextInput lost the focus -> the selection is cleared. Task-number:QT-2745 Reviewed-by:Michael Brasser
| | | * | | Ensure GridView content position is stable when moving items.Martin Jones2010-04-091-0/+2
| | | |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-9697
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0829-173/+381
| | | |\ \
| | | | * | Tune plugin import mechanismmae2010-04-083-35/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In shadow build environments, we cannot enforce that shared library objects for plugins are located in the same directory as the qmldir file. This makes it hard for Creator to support mixed projects (qml/c++). In order to gain more flexibility, the patch introduces a pluginPathList to QDeclarativeEngine, which completes the existing importsPathList. The pluginPathList defaults to ["."], which indicates the directory where the qmldir file is located in. The qml viewer tool gains a command line option -P to add to the pluginPathList. For consistency, the -L option ("Library") has been renamed to -I ("Import"). QDeclarativeEngine::importExtension() has been renamed to QDeclarativeEngine::importPlugin(). The documentation has been adjusted accordingly. Done with erikv. Reviewed-by: erikv
| | | | * | Fix compile warningsmae2010-04-082-2/+2
| | | | | |
| | | | * | Enable setting the imports directory via qt.confKai Koehne2010-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9701
| | | | * | Don't crash when QML engine is deletedAaron Kennedy2010-04-081-3/+2
| | | | | |
| | | | * | Fix crash on null object assignmentAaron Kennedy2010-04-081-1/+2
| | | | | |
| | | | * | Make string -> int conversion consistent in bindingsAaron Kennedy2010-04-081-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-9538