summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove code dupliation in fixupX/Y(), flickX/Y()Martin Jones2010-03-087-467/+326
| | | | Also some minor perf improvements by avoiding signal/slot connection
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-0819-27/+128
|\
| * Stop benchmark from crashing.Michael Brasser2010-03-081-0/+2
| |
| * Optimize Rectangle, Image, and Text creation.Michael Brasser2010-03-089-24/+30
| |
| * Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-08324-13604/+27435
| |\
| * | Make test compileBea Lam2010-03-081-3/+3
| | |
* | | Add PathView.isCurrentIndex and PathView.view attached propertiesMartin Jones2010-03-085-76/+235
| |/ |/| | | | | | | | | Adding PathView attached properties to be in line with other views. Task-number: QT-319
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-0792-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 ...
| | * \ 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 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-03-07169-2552/+5003
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (123 commits) Added missing tests to tests/auto/*.pro Compile with DirectFB version >= 1.2.0 && < 1.2.9 QDirectFBPaintEngine optimization Add some warnings when using DISABLE/WARN in DFB Fix build with Mesa 7.8's EGL implementatioon Reset the byte order in the iconv codec after using it. fix "using namespace" recursion crash Fix for QTBUG-6659 Parent window accepts pointer events wrongly If no IAP defined force IAP dialog Fixed key mappings on X11 QDom: prevent infinite loop when cloning a DTD Compile fix for Windows Mobile and OpenGLES2 QPrintPreviewDialog number of pages is partially blocked from view in OSX QS60Style ignores widget palette when drawing highlighted widget text Fix for QTBUG-8762 QApplication::setGraphicsSystem("raster") crashes. Fixed crash at application exit when QProcess was used in Symbian QMessageBox is not stretched to screen width if the content is narrow Wrong dirty region after row selection in right-to-left mode in QTableView Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 ) Tab to space fixes to qdilaog.cpp ...
| * | | | | | | | Added missing tests to tests/auto/*.proRohan McGovern2010-03-074-0/+20
| | | | | | | | |
| * | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-06169-2552/+4983
| |\ \ \ \ \ \ \ \ |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-051-8/+24
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile with DirectFB version >= 1.2.0 && < 1.2.9 QDirectFBPaintEngine optimization Add some warnings when using DISABLE/WARN in DFB
| | * | | | | | | | Compile with DirectFB version >= 1.2.0 && < 1.2.9Anders Bakken2010-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | DSPF_DST was added in 1.2.9, not in 1.2.0 Reviewed-by: muthu <qt-info@nokia.com>