summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2011-1/+81
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make dynamicscene example embeddeable in another graphics scene Some minor example fixes
| * Make dynamicscene example embeddeable in another graphics sceneAlan Alpert2010-05-201-1/+1
| |
| * Some minor example fixesAlan Alpert2010-05-2010-0/+80
| | | | | | | | | | | | -dial moved to dial-example so the dirname is the same as the qml name -added rssnews to .pro so it can be installed -added some README files like the other dirs
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2013-13/+64
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update docs with correct property name Fix incorrect merge Work around rendering bug in Rectangle. Remove warnings. Test e75088323ae15604139ddfd66b85cc3b8d43abeb Add XmlListModel::errorString() Fix dynamicscene example Update old keyword in docs
| * Update docs with correct property nameAlan Alpert2010-05-201-1/+1
| |
| * Fix incorrect mergeAlan Alpert2010-05-201-1/+1
| | | | | | | | Didn't actually notice the name change of that function
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-20210-3892/+4443
| |\ | | | | | | | | | | | | Conflicts: examples/declarative/toys/dynamicscene/qml/itemCreation.js
| | * Work around rendering bug in Rectangle.Michael Brasser2010-05-201-1/+3
| | | | | | | | | | | | Task-number: QTBUG-10765
| | * Remove warnings.Warwick Allison2010-05-202-3/+0
| | | | | | | | | | | | Task-number: QTBUG-10816
| | * Test e75088323ae15604139ddfd66b85cc3b8d43abebWarwick Allison2010-05-202-0/+6
| | | | | | | | | | | | Task-number: QTBUG-10820
| | * Add XmlListModel::errorString()Bea Lam2010-05-203-2/+37
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-195-9/+27
| |\ \
| * | | Fix dynamicscene exampleAlan Alpert2010-05-193-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In all the renaming (presumably) the moon broke, now fixed. Also made it slightly smaller, to be friendlier to desktop systems with small screens (and the fixed size qtdemo)
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-19590-58544/+17061
| |\ \ \
| * | | | Update old keyword in docsAlan Alpert2010-05-191-1/+1
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-20179-992/+3327
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) Be consistent in conversion from string (eg. color, int rounding). Simplify code to make next change clearer. Stop warnings. Improve error messages when tests fail. Stop highlight animators for highlightFollowsCurrentItem: false Ensure valuetype enums can be assigned from JS Improve testcase Rename Component::errorsString() -> errorString() (and also for Fixes for docs, example code Make test more stable Autotest (XFAIL) for QTBUG-10822 Add return value for resolveTypeInNamespace Fix test Fix test. Missed files. Missing break Create overview page for examples for Extending QML in C++ Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer ...
| * | | | Be consistent in conversion from string (eg. color, int rounding).Warwick Allison2010-05-201-11/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10820 Reviewed-by: Michael Brasser
| * | | | Simplify code to make next change clearer.Warwick Allison2010-05-201-14/+9
| | | | |
| * | | | Stop warnings.Warwick Allison2010-05-202-11/+11
| | | | |
| * | | | Improve error messages when tests fail.Warwick Allison2010-05-201-14/+15
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-206-8/+178
| |\ \ \ \
| | * | | | Stop highlight animators for highlightFollowsCurrentItem: falseMartin Jones2010-05-206-8/+178
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10803
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-2021-93/+192
| |\ \ \ \ \ | | |/ / / /
| | * | | | Rename Component::errorsString() -> errorString() (and also forBea Lam2010-05-2012-22/+24
| | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeComponent)
| | * | | | Fixes for docs, example codeBea Lam2010-05-209-71/+168
| | | | | |
| * | | | | Ensure valuetype enums can be assigned from JSAaron Kennedy2010-05-202-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | QTBUG-10830
| * | | | | Improve testcaseAaron Kennedy2010-05-202-1/+11
| |/ / / / | | | | | | | | | | | | | | | | | | | | As the default was AllUppercase, the tests weren't actually testing anything other than that assigning enums had no errors
| * | | | Make test more stableAaron Kennedy2010-05-201-2/+3
| | | | |
| * | | | Autotest (XFAIL) for QTBUG-10822Aaron Kennedy2010-05-202-0/+22
| | | | |
| * | | | Add return value for resolveTypeInNamespaceAaron Kennedy2010-05-202-3/+3
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-203-0/+21
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-201-0/+1
| | |\ \ \ \
| | * | | | | Fix test. Missed files.Warwick Allison2010-05-203-0/+21
| | | | | | |
| * | | | | | Fix testAaron Kennedy2010-05-201-1/+0
| | |/ / / / | |/| | | |
| * | | | | Missing breakAaron Kennedy2010-05-201-0/+1
| |/ / / /
| * | | | Create overview page for examples for Extending QML in C++Bea Lam2010-05-203-4/+27
| | | | | | | | | | | | | | | | | | | | Task-number: QT-3365 QT-3366
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| |\ \ \ \ |/ / / / / | | | | _ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, 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. ...
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-19148-860/+2840
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (37 commits) Search for QML import libraries also in application directory Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, 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. ...
| | * | Search for QML import libraries also in application directoryKai Koehne2010-05-192-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-integrationQt Continuous Integration System2010-05-19146-852/+2824
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (36 commits) Doc improvements Disable mouse-based selection in TextInput/TextEdit Rename qml executable to qmlviewer Don't crash if the target parent is destroyed. Introduce a threaded interpreter for QML binding bytecode Bug moved. doc doc Remove image example (covered in class docs) When changing Loader source, remove old item from scene immediately. Add missing .qmlproject files Fix folderlistmodel with qt namespace Renaming "Qml Launcher" back to "QML Viewer" Rename some examples: proxyviewer -> networkaccessmanagerfactory, 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. ...
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-1927-211/+698
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.7Warwick Allison2010-05-195-163/+242
| | | | |\ \
| | | | | * | Rename qml executable to qmlviewerKai Koehne2010-05-193-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the name of the 'qml' executable back to qmlviewer (QMLViewer on mac).
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-199-162/+439
| | | | | |\ \
| | | | | | * | Introduce a threaded interpreter for QML binding bytecodeAaron Kennedy2010-05-191-156/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Roberto Raggi
| | | | | * | | Don't crash if the target parent is destroyed.Martin Jones2010-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10755
| | | | * | | | Disable mouse-based selection in TextInput/TextEditWarwick Allison2010-05-197-10/+137
| | | | | |/ / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * | | Bug moved.Warwick Allison2010-05-191-1/+1
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1979-127/+349
| | | | |\ \ \ | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/imports/folderlistmodel/qdeclarativefolderlistmodel.cpp src/imports/folderlistmodel/qdeclarativefolderlistmodel.h
| | | | | * | When changing Loader source, remove old item from scene immediately.Martin Jones2010-05-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures focus is restored to the correct item. Task-number: QTBUG-10787
generated by cgit v0.12 at 2025-01-10 12:34:24 (GMT)