Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Be consistent in conversion from string (eg. color, int rounding). | Warwick Allison | 2010-05-20 | 1 | -11/+14 |
| | | | | | Task-number: QTBUG-10820 Reviewed-by: Michael Brasser | ||||
* | Simplify code to make next change clearer. | Warwick Allison | 2010-05-20 | 1 | -14/+9 |
| | |||||
* | Stop warnings. | Warwick Allison | 2010-05-20 | 2 | -11/+11 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 2 | -8/+24 |
|\ | |||||
| * | Stop highlight animators for highlightFollowsCurrentItem: false | Martin Jones | 2010-05-20 | 2 | -8/+24 |
| | | | | | | | | Task-number: QTBUG-10803 | ||||
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-20 | 5 | -18/+21 |
|\ \ | |/ | |||||
| * | Rename Component::errorsString() -> errorString() (and also for | Bea Lam | 2010-05-20 | 3 | -7/+10 |
| | | | | | | | | QDeclarativeComponent) | ||||
| * | Fixes for docs, example code | Bea Lam | 2010-05-20 | 2 | -11/+11 |
| | | |||||
* | | Ensure valuetype enums can be assigned from JS | Aaron Kennedy | 2010-05-20 | 1 | -0/+2 |
|/ | | | | QTBUG-10830 | ||||
* | Add return value for resolveTypeInNamespace | Aaron Kennedy | 2010-05-20 | 2 | -3/+3 |
| | |||||
* | Missing break | Aaron Kennedy | 2010-05-20 | 1 | -0/+1 |
| | |||||
* | Search for QML import libraries also in application directory | Kai Koehne | 2010-05-19 | 2 | -8/+16 |
| | | | | | | | | Add QCoreApplication::applicationLibraryPath again to the list of directories to search for possible QML plugins. Task-number: QTBUG-10771 Reviewed-by: mae | ||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Bea Lam | 2010-05-19 | 10 | -171/+334 |
|\ | | | | | | | | | | | Conflicts: doc/src/snippets/declarative/listview/highlight.qml doc/src/snippets/declarative/listview/listview.qml | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-19 | 2 | -157/+234 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-19 | 1 | -156/+233 |
| | |\ | |||||
| | | * | Introduce a threaded interpreter for QML binding bytecode | Aaron Kennedy | 2010-05-19 | 1 | -156/+233 |
| | | | | | | | | | | | | | | | | Reviewed-by: Roberto Raggi | ||||
| | * | | Don't crash if the target parent is destroyed. | Martin Jones | 2010-05-19 | 1 | -1/+1 |
| | |/ | | | | | | | | | | Task-number: QTBUG-10755 | ||||
| * | | Disable mouse-based selection in TextInput/TextEdit | Warwick Allison | 2010-05-19 | 6 | -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 Jones | 2010-05-19 | 1 | -2/+6 |
| | | | | | | | | | | | | This ensures focus is restored to the correct item. Task-number: QTBUG-10787 | ||||
| * | Renaming "Qml Launcher" back to "QML Viewer" | Kai Koehne | 2010-05-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Change the official name of the qml executable back to "Qt QML Viewer" - the original name before it got renamed to "QML Runtime" and then "QML Launcher". Also, the new Mac OS X bundle name is "QMLViewer" (without a space to ease command line use). | ||||
* | | Doc improvements | Bea Lam | 2010-05-19 | 4 | -131/+152 |
|/ | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-05-18 | 22 | -127/+270 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (22 commits) Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. Documentation git ignore stuff Test Qt.labs.folderlistmodel plugin Fix naming. Sometimes you own QNetworkReply, sometimes you don't. Rename files; fix test. Add parent parameter to QDeclarativeExpression constructor. Round correctly in binding optimizer Don't disable SmoothPixmapTransform in qDrawBorderPixmap() Photoviewer example fixes. Port from QListModelInterface to QAbstractListModel. Use QDeclarativeScriptString for ParentChange. Set raster + gl viewport as the default for OS X. Move stuff from QML viewer to plugins. ... | ||||
| * | Regression fix for Loader anchors not working | Joona Petrell | 2010-05-18 | 1 | -0/+1 |
| | | | | | | | | | | Task-number: QTBUG-10766 Reviewed-by: Yann Bodson | ||||
| * | Make Qt.include() work for js files that have '.pragma library' | Bea Lam | 2010-05-18 | 1 | -0/+3 |
| | | |||||
| * | doc fix | Bea Lam | 2010-05-18 | 1 | -2/+2 |
| | | |||||
| * | Prevent assignment of values (string, number, bool) to signal handlers. | Michael Brasser | 2010-05-18 | 1 | -0/+3 |
| | | | | | | | | | | Task-number: QTBUG-10764 Reviewed-by: Aaron Kennedy | ||||
| * | Make sure strings are escaped when returned via asScript. | Michael Brasser | 2010-05-18 | 3 | -25/+70 |
| | | | | | | | | Makes 273024e58d90bb9b3a5da0161f884f1af22d75df more correct. | ||||
| * | Sometimes you own QNetworkReply, sometimes you don't. | Aaron Kennedy | 2010-05-18 | 1 | -1/+1 |
| | | | | | | | | God bless QNetworkAccessManager | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-18 | 13 | -25/+32 |
| |\ | |||||
| | * | Add parent parameter to QDeclarativeExpression constructor. | Michael Brasser | 2010-05-18 | 13 | -25/+32 |
| | | | | | | | | | | | | Also rearrange the parameter order to be more clear. | ||||
| * | | Round correctly in binding optimizer | Aaron Kennedy | 2010-05-18 | 1 | -1/+1 |
| |/ | | | | | | | QTBUG-9538 | ||||
| * | Use QDeclarativeScriptString for ParentChange. | Michael Brasser | 2010-05-18 | 3 | -73/+157 |
| | | | | | | | | | | | | | | So that scope resolution is correct, e.g. "width: parent.width-10;" in a ParentChange works correctly. Task-number: QTBUG-10675 | ||||
* | | Compile fixes. | ck | 2010-05-17 | 1 | -0/+1 |
|/ | |||||
* | Move Q_ENUMS to start of class declaration | Aaron Kennedy | 2010-05-17 | 2 | -3/+3 |
| | |||||
* | Restructure QDeclarativeAbstractBinding destructor | Aaron Kennedy | 2010-05-17 | 1 | -2/+4 |
| | |||||
* | Don't call pure virtual method in ~QDeclarativeAbstractBinding() | Aaron Kennedy | 2010-05-17 | 1 | -1/+1 |
| | |||||
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Aaron Kennedy | 2010-05-17 | 11 | -78/+287 |
|\ | |||||
| * | Focus should be applied to focus scopes all the way up the chain, not | Bea Lam | 2010-05-17 | 2 | -6/+2 |
| | | | | | | | | just to the closest focus scope parent. | ||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Warwick Allison | 2010-05-17 | 10 | -75/+264 |
| |\ | |||||
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-17 | 10 | -17/+15 |
| | |\ | |||||
| | * | | Don't crash due to recursive positioning. | Martin Jones | 2010-05-17 | 2 | -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.7 | Martin Jones | 2010-05-16 | 30 | -47/+553 |
| | |\ \ | |||||
| | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7 | Martin Jones | 2010-05-14 | 6 | -16/+18 |
| | |\ \ \ | |||||
| | * | | | | Add a "priority" property to Keys and KeyNavigation | Martin Jones | 2010-05-14 | 7 | -45/+222 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows intercepting keys before or after normal item key processing. Task-number: QTBUG-10467 | ||||
| * | | | | | Fix doc for status, add Image::onLoaded. | Warwick Allison | 2010-05-17 | 2 | -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 | ||||
* | | | | | | Check for acquireReg() failure | Aaron Kennedy | 2010-05-17 | 1 | -0/+27 |
| |_|_|_|/ |/| | | | | | | | | | | | | | | QTBUG-10696 | ||||
* | | | | | ListModel::get() shouldn't print warnings for invalid indices since it | Bea Lam | 2010-05-17 | 1 | -4/+1 |
| | | | | | | | | | | | | | | | | | | | | returns undefined items for these cases anywyay. | ||||
* | | | | | Add \brief to TextInput | Bea Lam | 2010-05-17 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Restructure the examples. They are now organized into various | Bea Lam | 2010-05-16 | 8 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 fix | Bea Lam | 2010-05-16 | 1 | -0/+1 |
| |_|/ |/| | |