summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * 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/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-19112-3475/+3352
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Added default countries for Mongolian and Nepali. Updated tst_qlocale autotest. Updated the 4.7.0 change log with my changes. Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) doc: Fixed many broken links. doc: Fixed many broken links. doc: Fixed many broken links. qdoc: Set back to 3 cols for class list; we have a scrollbar now. Fix build on Mac OS X and Windows. Remove obsolete and broken qvfb skins. Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. ...
| | * | Added default countries for Mongolian and Nepali.Denis Dzyubenko2010-05-193-31/+43
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9370 Reviewed-by: trustme
| | * | Updated tst_qlocale autotest.Denis Dzyubenko2010-05-191-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added countries/languages that were added in new cldr and forgotten to be added to the autotest. Reviewed-by: trustme
| | * | Updated the 4.7.0 change log with my changes.Kim Motoyoshi Kalland2010-05-191-0/+16
| | | |
| | * | Merge remote branch 'origin/4.7' into HEADOlivier Goffart2010-05-19517-57904/+15918
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale_symbian.cpp
| | * | | Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration ↵Kent Hansen2010-05-194-6/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to javascriptcore-snapshot-19052010 ( 8039ba79702d6516cf6841c9f15b324ec499bbf3 ) Changes since last update: Mingw-w64 fixes
| | * | | doc: Fixed many broken links.Martin Smith2010-05-196-19/+30
| | | | |
| | * | | doc: Fixed many broken links.Martin Smith2010-05-1920-50/+50
| | | | |
| | * | | doc: Fixed many broken links.Martin Smith2010-05-1911-64/+49
| | | | |
| | * | | qdoc: Set back to 3 cols for class list; we have a scrollbar now.Martin Smith2010-05-191-1/+1
| | | | |
| | * | | Fix build on Mac OS X and Windows.Aaron McCarthy2010-05-194-13/+13
| | | | |
| | * | | Remove obsolete and broken qvfb skins.Jason McDonald2010-05-1925-437/+4
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-1947-2869/+3034
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Only setup ICD test data when ICD is enabled. Doc: Fixed two diagrams and finally committed images for them. Make sure cursorPositionChanged is emitted when doing undo/redo Some more 4.7.0 changes Fix cosmetic issue in designer filter edits Doc: Adding support for IE 6, 7 and 8 doc: Updated the widgets tutorial to work without page links. My 4.7.0 changes Added support for es_419 locale. Added Korean and Nynorsk locales support on Symbian. Gestures in GraphicsView do not require a viewport to subscribe to gestures. Upgraded QLocale to Unicode CLDR 1.8.1 Removed the "maybe" timer from gesturemanager. Fixes a crash and a memory leak in gesturemanager. Embedded changes for 4.7 Added a default value for optimization settings. Update Polish translations
| | | * | | Only setup ICD test data when ICD is enabled.Aaron McCarthy2010-05-193-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes unit test build failures introduced in 90de3e5c903b67b2e5f3d7dc14266fe24f1daa23.
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7David Boddie2010-05-1813-5/+71
| | | |\ \ \
| | | | * | | Make sure cursorPositionChanged is emitted when doing undo/redoThorbjørn Lindeijer2010-05-181-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Done-by: mae Reviewed-by: Thorbjørn Lindeijer
| | | | * | | Some more 4.7.0 changesJens Bache-Wiig2010-05-181-2/+17
| | | | | | |
| | | | * | | Fix cosmetic issue in designer filter editsJens Bache-Wiig2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the icon position similar to Qt Creator and more consistent. Reviewed-by: trustme
| | | | * | | Doc: Adding support for IE 6, 7 and 8Morten Engvoldsen2010-05-1810-2/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing index page bugs
| | | * | | | Doc: Fixed two diagrams and finally committed images for them.David Boddie2010-05-186-70/+68
| | | |/ / / | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-05-1825-2713/+2812
| | | |\ \ \
| | | | * | | My 4.7.0 changesKent Hansen2010-05-181-0/+22
| | | | | | |
| | | | * | | Added support for es_419 locale.Denis Dzyubenko2010-05-187-358/+376
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new country code "419" which stands for "Latin America and the Caribbean". This is the first three-letter country code (from UN M.49). Task-number: QT-3312 Reviewed-by: Thiago Macieira
| | | | * | | Added Korean and Nynorsk locales support on Symbian.Denis Dzyubenko2010-05-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-3368 Task-number: QT-3370 Reviewed-by: Thiago Macieira
generated by cgit v0.12 at 2024-11-17 07:35:16 (GMT)