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-06-29124-726/+2366
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (54 commits) update qml.qch to version 4.7 Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes ...
| * update qml.qch to version 4.7mae2010-06-291-2/+2
| | | | | | | | | | | | | | This fixes a version clash when both qt.qch and qml.qch are loaded into Qt Creator Done-with: Daniel Molkentin
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29123-724/+2364
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (53 commits) Undefined is undefined, and now qml warns about it Fix so window will resize with the root object (broken by Avoid duplicate code for testing initial sizes Remove an unnecessary connect() in TextInput Ensure micro focus is updated in TextEdit and TextInput Fix flow layout not taking into account whether it's width and height are implicit or not. Avoid binding loop. Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support ...
| | * Undefined is undefined, and now qml warns about itmae2010-06-291-3/+3
| | |
| | * Fix so window will resize with the root object (broken byBea Lam2010-06-291-0/+1
| | | | | | | | | | | | 156cabe79a64ffca8d6e1a2df99f35b413a48a39)
| | * Avoid duplicate code for testing initial sizesBea Lam2010-06-291-21/+15
| | |
| | * Remove an unnecessary connect() in TextInputMartin Jones2010-06-291-3/+1
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2966-401/+810
| | |\
| | | * Fix flow layout not taking into account whether it's width and height are ↵Joona Petrell2010-06-293-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | implicit or not. Task-number: QTBUG-11778 Reviewed-by: Martin Jones
| | | * Avoid binding loop.Yann Bodson2010-06-291-1/+2
| | | |
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-29115-687/+2289
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (46 commits) Ensure Loader item change listener is removed when Loader is destroyed Adapt all qmlviewer testcases to the code changes in the actual viewer. Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support Make the QML viewer usable on the N900 Test QTBUG-11222 Test ListElement type via type system, not string comparison. Test only on X11, not only on Linux (which includes embedded). Handle enums in method arguments in the same way as QtScript Allow custom parsers to handle attached properties Allow components to be created from .pragma library JS files ...
| | * | | Ensure micro focus is updated in TextEdit and TextInputMartin Jones2010-06-294-9/+14
| | | |/ | | |/| | | | | | | | | Task-number: QTBUG-11552
| | * | Ensure Loader item change listener is removed when Loader is destroyedMartin Jones2010-06-292-6/+13
| | | | | | | | | | | | | | | | Task-number: QTBUG-11771
| | * | Adapt all qmlviewer testcases to the code changes in the actual viewer.Robert Griebl2010-06-284-25/+22
| | | | | | | | | | | | | | | | (currently tested on Linux only)
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-28114-671/+2269
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (44 commits) Stop QMLLauncher from crashing on exit on Mac when quitting app via the VisualDataModel hasModelChildren role shadowed user roles. Allow positioning of ListView items width sub-pixel precision. Examples clean up Docs Improve appearance when scaling Tweak Qt Demo Behaviour forget to rename the moc include when renaming deviceorientation_maemo.cpp fix namespace macros fix QML Viewer resize modes forgot to cleanup the code a bit after adding Maemo5 support Make the QML viewer usable on the N900 Test QTBUG-11222 Test ListElement type via type system, not string comparison. Test only on X11, not only on Linux (which includes embedded). Handle enums in method arguments in the same way as QtScript Allow custom parsers to handle attached properties Allow components to be created from .pragma library JS files Fix assert Disallow global object properties as property names ...
| | | * | Stop QMLLauncher from crashing on exit on Mac when quitting app via theBea Lam2010-06-282-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | menu. This sets the QGraphicsView::viewport() to 0 on exit to avoid "QGLContext::makeCurrent: Cannot make invalid context current" errors on exit, and deletes the logger window on exit so it does not receive error messages after the app is closed. The QGLContext errors appeared after 6d4e14ef0437ce8f73bddbcb267cf5ef708fbdec.
| | | * | VisualDataModel hasModelChildren role shadowed user roles.Martin Jones2010-06-281-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: BAUHAUS-773
| | | * | Allow positioning of ListView items width sub-pixel precision.Martin Jones2010-06-281-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Which makes having delegates with integer sizes more important, but allows proper animation of delegate size. Task-number: QTBUG-11738
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-2811-19/+33
| | | |\ \
| | | | * | Examples clean upBea Lam2010-06-288-13/+15
| | | | | |
| | | | * | DocsBea Lam2010-06-282-0/+7
| | | | | |
| | | | * | Improve appearance when scalingBea Lam2010-06-281-6/+11
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-06-2838-578/+1113
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeglobalscriptclass.cpp
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-06-28114-758/+2621
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-2585-380/+1446
| | | | |\ \ \
| | | | | * | | forget to rename the moc include when renaming deviceorientation_maemo.cppRobert Griebl2010-06-251-1/+1
| | | | | | | |
| | | | | * | | fix namespace macrosRobert Griebl2010-06-251-1/+3
| | | | | | | |
| | | | | * | | fix QML Viewer resize modesRobert Griebl2010-06-252-5/+8
| | | | | | | |
| | | | | * | | forgot to cleanup the code a bit after adding Maemo5 supportRobert Griebl2010-06-253-19/+10
| | | | | | | |
| | | | | * | | Make the QML viewer usable on the N900Robert Griebl2010-06-2513-199/+909
| | | | | | | |
| | | | | * | | Test QTBUG-11222Warwick Allison2010-06-251-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11222
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-06-2523-21/+157
| | | | | |\ \ \
| | | | | | * | | Handle enums in method arguments in the same way as QtScriptAaron Kennedy2010-06-254-1/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QML will now invoke methods with enums as arguments, in the same fashion as QtScript. QTBUG-11313
| | | | | | * | | Allow custom parsers to handle attached propertiesAaron Kennedy2010-06-254-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11283
| | | | | | * | | Allow components to be created from .pragma library JS filesAaron Kennedy2010-06-256-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11507
| | | | | | * | | Fix assertAaron Kennedy2010-06-254-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11600
| | | | | | * | | Disallow global object properties as property namesAaron Kennedy2010-06-257-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11605
| | | | | | * | | Reading a property that doesn't exist throws a ReferenceError testAaron Kennedy2010-06-252-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-11606
| | | | | * | | | Test ListElement type via type system, not string comparison.Warwick Allison2010-06-256-3/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-11222 Reviewed-by: Aaron Kennedy
| | | | | * | | | Test only on X11, not only on Linux (which includes embedded).Warwick Allison2010-06-252-4/+4
| | | | | |/ / /
| | | | | * | | Force font selection (and so ensure visual test passes).Warwick Allison2010-06-2522-4/+14
| | | | | | | |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2459-411/+1040
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix import path in cppextensions declarative example. Update tests following QDeclarativeFlickable::viewport() -> contentIem() Prevent value source animations from being registered to start twice. Make compile. More script benchmarking. Expose the Flickable's internal contentItem Script benchmarking. Update lupdate to recognize concatenated text in QML files. Ensure sourcesize is in pixmap cache key. Use ugly but reliable bitmaps fonts in test. doc: note that calling methods before component completion may have no effect Fix unstable qdeclarativeviewer tests Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | | | * | | | | Tweak Qt Demo BehaviourAlan Alpert2010-06-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't close on right click inside the demo.
| | | | * | | | | Stop other mouse buttons propagatingAlan Alpert2010-06-241-0/+1
| | | | | | | | |
| | | | * | | | | Expand on warning messageAlan Alpert2010-06-241-1/+1
| | | | | | | | |
| | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-241675-46144/+35320
| | | | |\ \ \ \ \ | | | | | | |/ / / | | | | | |/| | |
| | | | | * | | | Fix import path in cppextensions declarative example.Christian Kamm2010-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Erik Verbruggen
| | | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-06-2458-410/+1039
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Update tests following QDeclarativeFlickable::viewport() -> contentIem() Prevent value source animations from being registered to start twice. Make compile. More script benchmarking. Expose the Flickable's internal contentItem Script benchmarking. Update lupdate to recognize concatenated text in QML files. Ensure sourcesize is in pixmap cache key. Use ugly but reliable bitmaps fonts in test. doc: note that calling methods before component completion may have no effect Fix unstable qdeclarativeviewer tests Use Pen with Qt::MiterJoin when drawing Rectangles with gradients Update screenshot Fix and better test Text / TextEdit alignments. Ensure the view is correctly positioned at component complete. Support for non-literal plural arguments to qsTr() in lupdate (QML). References to undefined variables throws a ReferenceError
| | | | * | \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-06-22159-673/+1282
| | | | |\ \ \ \ \ \
| | | | * | | | | | | Check for main.qml firstAlan Alpert2010-06-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On case insensitive platforms, it would accidently pick up internal components sometimes if you check the other way around. Task-number: QTBUG-11566
generated by cgit v0.12 at 2025-02-03 03:17:21 (GMT)