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-03-0592-2420/+3396
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML Minor perf improvement when running QML script blocks Fix qdeclarative{audio,video} tests. Don't assume documents are in UTF-8. Add basic support for explicit newParent in ParentAnimation. Delete uninspiring example. Fix compiler warning on RVCT Use new enum syntax for value types. Expect fail in currentIndex test for now. Allow unquoted enum syntax for value types More declarative examples cleanup. Improve declarative tabs example. Fix test leaks Use _data() for some tests Add missing NOTIFYs to timer, xmllistmodel, xmlrole Document new ParentChange properties. declarative examples cleanup Fix test Update QmlChanges.txt ...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0592-2420/+3396
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (25 commits) optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML Minor perf improvement when running QML script blocks Fix qdeclarative{audio,video} tests. Don't assume documents are in UTF-8. Add basic support for explicit newParent in ParentAnimation. Delete uninspiring example. Fix compiler warning on RVCT Use new enum syntax for value types. Expect fail in currentIndex test for now. Allow unquoted enum syntax for value types More declarative examples cleanup. Improve declarative tabs example. Fix test leaks Use _data() for some tests Add missing NOTIFYs to timer, xmllistmodel, xmlrole Document new ParentChange properties. declarative examples cleanup Fix test Update QmlChanges.txt ...
| | * optimize dynamic call-by-name awaymae2010-03-052-9/+15
| | | | | | | | | | | | Reviewed-by: Roberto Raggi
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0590-2411/+3381
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits) Add support for QtScript connect/disconnect syntax in QML Minor perf improvement when running QML script blocks Fix qdeclarative{audio,video} tests. Don't assume documents are in UTF-8. Add basic support for explicit newParent in ParentAnimation. Delete uninspiring example. Fix compiler warning on RVCT Use new enum syntax for value types. Expect fail in currentIndex test for now. Allow unquoted enum syntax for value types More declarative examples cleanup. Improve declarative tabs example. Fix test leaks Use _data() for some tests Add missing NOTIFYs to timer, xmllistmodel, xmlrole Document new ParentChange properties. declarative examples cleanup Fix test Update QmlChanges.txt ParentAnimation docs + test. ...
| | | * Add support for QtScript connect/disconnect syntax in QMLAaron Kennedy2010-03-0513-0/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This support was accidentally removed as a consequence of 4a665ff5da05860f5eb46e3982ef3d8163a6cf59. QTBUG-8001
| | | * Minor perf improvement when running QML script blocksAaron Kennedy2010-03-051-2/+3
| | | | | | | | | | | | | | | | | | | | There is no need to capture a property access if a binding is not being evaluated.
| | | * Fix qdeclarative{audio,video} tests.Justin McPherson2010-03-054-14/+14
| | | | | | | | | | | | | | | | Location of declarative modules moved.
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0529-1672/+1990
| | | |\
| | | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-03-0569-935/+1115
| | | | |\
| | | | | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05194-2509/+2363
| | | | | |\
| | | | | * | Fix testBea Lam2010-03-051-7/+11
| | | | | | |
| | | | * | | Add basic support for explicit newParent in ParentAnimation.Michael Brasser2010-03-052-7/+57
| | | | | | |
| | | | * | | Document new ParentChange properties.Michael Brasser2010-03-051-6/+16
| | | | | | |
| | | | * | | Update QmlChanges.txtMichael Brasser2010-03-051-0/+2
| | | | | | |
| | | | * | | ParentAnimation docs + test.Michael Brasser2010-03-0510-0/+1785
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8612
| | | | * | | Remove NumberFormatter and DateTimeFormatter.Michael Brasser2010-03-0514-1642/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Functions have been added to QML's global Qt object for date/time formatting. Number formatting will not be supported for 4.7. Task-number: QT-2821
| | | | * | | RotationAnimation docs + test.Michael Brasser2010-03-044-10/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8613
| | | * | | | Don't assume documents are in UTF-8.Bea Lam2010-03-054-3/+69
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Task-number: QTBUG-7719
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-05211-2184/+2133
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeitem/tst_qdeclarativeitem.cpp
| | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-051-148/+173
| | | | |\ \ \
| | | | | * | | Fix compiler warning on RVCTAaron Kennedy2010-03-051-148/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Anonymous structures in unions cause warnings on this compiler. QTBUG-8738
| | | | * | | | Delete uninspiring example.Yann Bodson2010-03-051-46/+0
| | | | | | | |
| | | | * | | | Use new enum syntax for value types.Yann Bodson2010-03-051-11/+11
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0526-78/+340
| | | | |\ \ \
| | | | | * | | Allow unquoted enum syntax for value typesAaron Kennedy2010-03-0514-8/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-5424
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-057-17/+167
| | | | | |\ \ \
| | | | | | * | | Add missing NOTIFYs to timer, xmllistmodel, xmlroleJoona Petrell2010-03-057-17/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: akennedy
| | | | | * | | | More declarative examples cleanup.Yann Bodson2010-03-053-20/+24
| | | | | | | | |
| | | | | * | | | Improve declarative tabs example.Yann Bodson2010-03-052-33/+60
| | | | | |/ / /
| | | | * | | | Expect fail in currentIndex test for now.Martin Jones2010-03-051-26/+20
| | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-0525-199/+219
| | | | |\ \ \
| | | | * | | | declarative examples cleanupYann Bodson2010-03-057-40/+12
| | | | | | | |
| | | * | | | | Fix test leaksBea Lam2010-03-052-0/+12
| | | | | | | |
| | | * | | | | Use _data() for some testsBea Lam2010-03-051-377/+158
| | | | | | | |
| | | * | | | | Add mapFromItem() and mapToItem() in QDeclarativeItem.Bea Lam2010-03-044-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2385
| | | * | | | | Removed unused variableBea Lam2010-03-041-1/+0
| | | | | | | |
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-057-200/+87
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl API Make QEgl::createSurface store the surface in the pixmapdata too Make QEgl::ConfigOptions use QFlags
| * | | | | | | Port QX11GLPixmapData & QX11GLWindowSurface to new QEgl APITom Cooksey2010-03-055-196/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's still just as buggy, but at least it allows us to remove a lot of crud from qgl_x11egl.cpp. Reviewed-By: TrustMe
| * | | | | | | Make QEgl::createSurface store the surface in the pixmapdata tooTom Cooksey2010-03-051-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means the same surface can then later be used to bind the pixmap as a texture using eglBindTexImage2D. Reviewed-By: TrustMe
| * | | | | | | Make QEgl::ConfigOptions use QFlagsTom Cooksey2010-03-051-1/+8
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Trustme
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-057-13/+83
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix for torn off menus that were way too big Compile fix for Windows Mobile and OpenGLES2 Fixed failure to store certain image formats as jpeg Fixa few warnings on mingw Added QImage::bitPlaneCount().
| * | | | | | | Fix for torn off menus that were way too bigThierry Bastian2010-03-051-4/+5
| | | | | | | |
| * | | | | | | Compile fix for Windows Mobile and OpenGLES2ninerider2010-03-051-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native device is now the default screen device.
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-0529-195/+407
| |\ \ \ \ \ \ \
| | * | | | | | | Fixa few warnings on mingwThierry Bastian2010-03-052-1/+7
| | | | | | | | |
| * | | | | | | | Fixed failure to store certain image formats as jpegaavit2010-03-051-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In contrast to other image format handlers, the jpeg handler would not convert a QImage of an "unusual" format to a format it could handle when asked to write it. Now it does. Task-number: QTBUG-7780 Reviewed-by: Trond
| * | | | | | | | Added QImage::bitPlaneCount().aavit2010-03-042-5/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the image format contains unused bits (e.g. Format_RGB32), depth() does not give the true number of bits of color information per pixel. This new function does. Task-number: QTBUG-7982 Reviewed-by: Trond
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-055-6/+10
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-055-6/+10
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix spelling in enumeration. Fixed compiler warning QuickTime movie view output: emit the natural size changes
| * | | | | | | | Fix spelling in enumeration.Justin McPherson2010-03-054-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Dmytro Poplavskiy