summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* 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
| * Improve static assignment to QVariant's in the int and double caseAaron Kennedy2010-04-085-7/+44
| |
| * Update QmlChanges for SmoothedFollowLeonardo Sobral Cunha2010-04-081-4/+12
| |
| * Renamed 'source' property from SpringFollow to 'to'Leonardo Sobral Cunha2010-04-082-26/+35
| |
| * Make script and binding assignments identical for list propertiesAaron Kennedy2010-04-081-1/+5
| |
| * Fix qdeclarativeecmascript::arrayExpression() testAaron Kennedy2010-04-081-1/+1
| |
| * Cleanup handling of errors in bindings and scriptsAaron Kennedy2010-04-0815-96/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-0816-23/+448
| |\
| * | Fix AnimatedImage for remote image test. Fix and test sourceSize property.Warwick Allison2010-04-083-2/+7
| | |
* | | Calculate GridView columns regardless of whether we have a populated modelMartin Jones2010-04-081-1/+1
| | | | | | | | | | | | Task-number: QTBUG-9692
* | | Add highlightMoveDuration to views.Martin Jones2010-04-087-8/+131
| |/ |/| | | | | Task-number: QTBUG-7568
* | Add SmoothedFollow element to qmlLeonardo Sobral Cunha2010-04-084-0/+416
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SmoothedFollow is the same as the old EaseFollow, so it's not an animation, but its main use case is to be used as a property value source to automatically follow the 'to' property, as in the example below. Rectangle { color: "green" width: 60; height: 60; SmoothedFollow on x { to: rect1.x - 5; velocity: 200 } SmoothedFollow on y { to: rect1.y - 5; velocity: 200 } } This element shares the internal implementation with SmoothedAnimation, both providing the same easing function, but with SmoothedFollow it's easier to set a start value to animate intially and then start to follow, while SmoothedAnimation is still convenient for using inside Behaviors and Transitions. Reviewed-by: Michael Brasser
* | Tracking the velocity when restarting SmoothedAnimationLeonardo Sobral Cunha2010-04-081-0/+2
| |
* | Fix doc of qml's SmoothedAnimationLeonardo Sobral Cunha2010-04-081-9/+10
| |
* | Refactor in smoothedanimation, removed unneeded codeLeonardo Sobral Cunha2010-04-082-6/+1
| |
* | Do not create a QScriptValue for an object being deletedAaron Kennedy2010-04-081-0/+3
| |
* | Replace "import Qt 4.6" with "import Qt 4.7"Michael Brasser2010-04-087-7/+7
| |
* | Don't optimized extended type constructionAaron Kennedy2010-04-083-1/+9
|/
* Correctly handle shutdown order in the presence of QWidgetsAaron Kennedy2010-04-081-1/+1
| | | | | The QWidget destructor is largely a copy of the QObject destructor. QML shutdown occurs in a slightly different order in this case.
* Initialize QDeclarativeData even when not using a QDeclarativeEngineAaron Kennedy2010-04-082-5/+14
| | | | Caused crashes in various test cases
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-085-25/+53
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-088-37/+38
| |\
| * | Replace Text::wrap property with Text::wrapMode enumeration.Martin Jones2010-04-085-25/+53
| | | | | | | | | | | | wrap remains for a little while, and will produce a warning.
* | | Fix location of error message.Warwick Allison2010-04-081-2/+2
| |/ |/|
* | Revert "Add QListModelInterface::modelReset() signal and emit this in"Bea Lam2010-04-085-23/+12
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 973cfce37fcdd1ce330f237eaa76930db55a73f6. Need more consideration before adding modelReset(). For example if item insertion/removal is supposed to trigger animations through added/removed signals, they won't be triggered if only the modelReset() signal is emitted. Also if we add modelReset(), it should also be implemented for ListModel to make sure it is implemented by all subclasses of QListModelInterface and to test the impact of this on the view classes.
* | Prevent Behavior from being triggered on initialization.Michael Brasser2010-04-081-12/+10
| | | | | | | | Task-number: QTBUG-6332
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-084-11/+30
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0810-109/+84
| |\
| | * Revert "Support QList<QObject*> properties"Aaron Kennedy2010-04-089-105/+70
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9d9161446bfad883c298d54a122e822c5e273a9c. This was a bad idea. It complicates the "property var" are not really JavaScript var problem. Some of the patch is valid, and it will be applied separately.
| | * Document behavior of conflicting when clauses.Michael Brasser2010-04-081-4/+14
| | | | | | | | | | | | Task-number: QTBUG-9371
| * | Don't emit clicked() after pressAndHold()Martin Jones2010-04-081-1/+1
| |/ | | | | | | Task-number: QTBUG-9676
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-0810-75/+119
| |\
| | * Support QList<QObject*> propertiesAaron Kennedy2010-04-089-70/+105
| | | | | | | | | | | | | | | | | | | | | We already supported returning QList<QObject*> from methods, but there wasn't really much that could be done with the return value. This closes the loop on QList<QObject*> support by allowing them to be properties, and used as models.
| * | Fix setting of pointSize and pixelSize in different items.Martin Jones2010-04-082-6/+15
| | | | | | | | | | | | | | | | | | | | | Also ensure warning is issued regardless of the order both pointSize and pixelSize are set in the same item. Task-number: QTBUG-9665
* | | Give error if attempt to import from a version that is not installed.Warwick Allison2010-04-081-0/+12
| | | | | | | | | | | | | | | | | | (was done for builtins/plugins, but now also for qmldir-specified content) Task-number: QTBUG-9627
* | | Test actual error messages. Fix error messages. Test module-not-available error.Warwick Allison2010-04-081-2/+4
| |/ |/|
* | Update Repeater docs.Michael Brasser2010-04-071-5/+14
|/
* Build on Windows.Martin Jones2010-04-071-1/+6
|
* Make sure Loader doesn't leak when component has errors.Michael Brasser2010-04-071-3/+3
|
* Cleanup (remove QDeclarativeScriptClass)Aaron Kennedy2010-04-0713-142/+34
| | | | | QDeclarativeScriptClass only existed to make compiling against 4.6 and 4.7 easier.
* Disallow nested elements in ListModelAaron Kennedy2010-04-072-1/+9
| | | | QTBUG-6082