Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix example | Bea Lam | 2010-04-09 | 1 | -7/+15 |
| | | | | Task-number: QTBUG-8514 | ||||
* | Example code style improvements | Bea Lam | 2010-04-09 | 7 | -206/+195 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-09 | 5 | -47/+40 |
|\ | |||||
| * | Remove use of obsolete "Script" element. | Warwick Allison | 2010-04-09 | 4 | -46/+39 |
| | | |||||
| * | unwarn | Warwick Allison | 2010-04-09 | 1 | -1/+1 |
| | | |||||
* | | TextEdit::wrap changed to TextEdit::wrapMode enumeration | Martin Jones | 2010-04-09 | 10 | -35/+66 |
| | | |||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-09 | 116 | -919/+444 |
|\ \ | |/ | |||||
| * | Replace "var" with "variant" in tests | Aaron Kennedy | 2010-04-09 | 2 | -11/+11 |
| | | |||||
| * | Fix test after deletion of GraphicsObjectContainer. | Alexis Menard | 2010-04-09 | 1 | -23/+20 |
| | | | | | | | | Reviewed-by:TrustMe | ||||
| * | Text.wrap is deprecated | Yann Bodson | 2010-04-09 | 2 | -17/+18 |
| | | |||||
| * | Fix url resolution in PropertyChanges. | Michael Brasser | 2010-04-09 | 7 | -9/+85 |
| | | | | | | | | | | | | | | | | 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.7 | Aaron Kennedy | 2010-04-09 | 2 | -7/+31 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-09 | 27 | -714/+262 |
| | |\ | |||||
| | * | | Better reporting of extension plugin loading errors. | Warwick Allison | 2010-04-09 | 1 | -7/+23 |
| | | | | |||||
| | * | | self-doc | Warwick Allison | 2010-04-09 | 1 | -0/+8 |
| | | | | |||||
| * | | | Replace "property var " with "property variant " in QML code | Aaron Kennedy | 2010-04-09 | 75 | -127/+127 |
| | | | | |||||
| * | | | Use variant instead of var in QML | Aaron Kennedy | 2010-04-09 | 5 | -30/+11 |
| | |/ | |/| | | | | | | | | | | | | | 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 Menard | 2010-04-09 | 10 | -561/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | Straighten board lines | Bea Lam | 2010-04-09 | 1 | -0/+0 |
| | | | |||||
| * | | More tutorial improvments | Bea Lam | 2010-04-09 | 9 | -131/+121 |
| | | | |||||
| * | | Doc fixes | Bea Lam | 2010-04-09 | 3 | -3/+2 |
| | | | |||||
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-09 | 5 | -19/+123 |
|\ \ \ | |/ / | |||||
| * | | Make the TextInput element nicer. It has scrolling. | Alexis Menard | 2010-04-09 | 4 | -19/+121 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-09 | 80 | -328/+877 |
| |\ | |||||
| * | | Verbose failure output | Warwick Allison | 2010-04-09 | 1 | -0/+2 |
| | | | |||||
* | | | Ensure GridView content position is stable when moving items. | Martin Jones | 2010-04-09 | 2 | -0/+7 |
| |/ |/| | | | | | Task-number: QTBUG-9697 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-04-08 | 108 | -552/+1308 |
|\ \ | |||||
| * | | Update visual test. | Michael Brasser | 2010-04-08 | 9 | -4/+4 |
| | | | | | | | | | | | | We've updated our handling of drag threshold in MouseArea. | ||||
| * | | Fix test. | Michael Brasser | 2010-04-08 | 1 | -1/+1 |
| | | | |||||
| * | | Update test following property name change. | Michael Brasser | 2010-04-08 | 3 | -5/+5 |
| | | | |||||
| * | | Tune plugin import mechanism | mae | 2010-04-08 | 7 | -54/+175 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 warnings | mae | 2010-04-08 | 2 | -2/+2 |
| | | | |||||
| * | | Enable setting the imports directory via qt.conf | Kai Koehne | 2010-04-08 | 2 | -0/+5 |
| | | | | | | | | | | | | Task-number: QTBUG-9701 | ||||
| * | | Warn if the minehunt C++ plugin is not compiled. | Yann Bodson | 2010-04-08 | 1 | -0/+7 |
| | | | |||||
| * | | Add tab navigation to twitter example authentication screen. | Yann Bodson | 2010-04-08 | 1 | -5/+8 |
| | | | |||||
| * | | Don't crash when QML engine is deleted | Aaron Kennedy | 2010-04-08 | 3 | -3/+36 |
| | | | |||||
| * | | Fix crash on null object assignment | Aaron Kennedy | 2010-04-08 | 3 | -1/+25 |
| | | | |||||
| * | | Fix call to saveHighScores() and restore game timer. | Bea Lam | 2010-04-08 | 3 | -6/+4 |
| | | | |||||
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-04-08 | 301 | -1013/+2210 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/tutorials/samegame/samegame4/content/samegame.js | ||||
| | * | | Make string -> int conversion consistent in bindings | Aaron Kennedy | 2010-04-08 | 5 | -0/+115 |
| | | | | | | | | | | | | | | | | QTBUG-9538 | ||||
| | * | | Improve static assignment to QVariant's in the int and double case | Aaron Kennedy | 2010-04-08 | 8 | -7/+110 |
| | | | | |||||
| | * | | Fix warning in declarative/examples/velocity | Leonardo Sobral Cunha | 2010-04-08 | 1 | -2/+6 |
| | | | | |||||
| | * | | Fix samegame4 tutorial code | Leonardo Sobral Cunha | 2010-04-08 | 2 | -12/+3 |
| | | | | |||||
| | * | | Missing file | Yann Bodson | 2010-04-08 | 1 | -0/+0 |
| | | | | |||||
| | * | | Update QmlChanges for SmoothedFollow | Leonardo Sobral Cunha | 2010-04-08 | 1 | -4/+12 |
| | | | | |||||
| | * | | Renamed 'source' property from SpringFollow to 'to' | Leonardo Sobral Cunha | 2010-04-08 | 16 | -56/+64 |
| | |/ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-04-08 | 18 | -96/+232 |
| | |\ | |||||
| | | * | Make script and binding assignments identical for list properties | Aaron Kennedy | 2010-04-08 | 1 | -1/+5 |
| | | | | |||||
| | | * | Fix qdeclarativeecmascript::arrayExpression() test | Aaron Kennedy | 2010-04-08 | 1 | -1/+1 |
| | | | | |||||
| | | * | Cleanup handling of errors in bindings and scripts | Aaron Kennedy | 2010-04-08 | 18 | -96/+228 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML used to silently ignore a log of errors - such as a failed assignment to a QObject property. These errors are now all reported as exceptions in JavaScript. Other questionable activities, like assigning a JavaScript array to a "property var" property which appeared to work, thanks to QtScript's transparent conversion of arrays to a QVariantList, are now blocked entirely. QTBUG-9152 QTBUG-9382 QTBUG-9341 QTBUG-6886 |