summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-0810-467/+200
|\ | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove duration property from QSoundEffect. Fix effects.pri. Refactor QSoundEffect.
| * Remove duration property from QSoundEffect.Justin McPherson2010-03-088-44/+0
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Fix effects.pri.Justin McPherson2010-03-081-2/+2
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Refactor QSoundEffect.Justin McPherson2010-03-089-440/+217
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-08155-3074/+4257
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (43 commits) clearFocus() before setParentItem(0) on an item with focus. Remove expect fail from ListView currentIndex test fix QDeclarativeItem sceneEvent handling Make the animation property of Behavior deferred. Particles optimization and doc fixes. Add Flipable example. Fix Qt.tint() algorithm Disallow upper case property, signal and method names in QML Remove expected warning Use a better method for installing declarative demos. Fixed declarative examples not being installed. Remove code dupliation in fixupX/Y(), flickX/Y() Add PathView.isCurrentIndex and PathView.view attached properties Stop benchmark from crashing. Optimize Rectangle, Image, and Text creation. Make compile following QDeclarativeMetaProperty renaming Fixed declarative demos not being installed. Make test compile optimize dynamic call-by-name away Add support for QtScript connect/disconnect syntax in QML ...
| * | clearFocus() before setParentItem(0) on an item with focus.Martin Jones2010-03-082-3/+9
| | |
| * | Remove expect fail from ListView currentIndex testMartin Jones2010-03-081-3/+7
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-082-0/+2
| |\ \
| | * | Make the animation property of Behavior deferred.Michael Brasser2010-03-082-0/+2
| | | |
| * | | fix QDeclarativeItem sceneEvent handlingYann Bodson2010-03-081-3/+3
| |/ /
| * | Particles optimization and doc fixes.Michael Brasser2010-03-081-3/+5
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0836-109/+171
| |\ \
| | * | Fix Qt.tint() algorithmAaron Kennedy2010-03-083-13/+9
| | | | | | | | | | | | | | | | QT-2424
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-0823-96/+125
| | |\ \
| | | * | Remove expected warningBea Lam2010-03-082-19/+2
| | | | |
| | | * | Use a better method for installing declarative demos.Rohan McGovern2010-03-087-76/+16
| | | | | | | | | | | | | | | | | | | | Simply copy the demo directories, instead of writing a stub .pro file.
| | | * | Fixed declarative examples not being installed.Rohan McGovern2010-03-0814-1/+107
| | | | |
| | * | | Disallow upper case property, signal and method names in QMLAaron Kennedy2010-03-0810-0/+37
| | |/ / | | | | | | | | | | | | QT-2976
| * | | Add Flipable example.Bea Lam2010-03-084-38/+50
| |/ / | | | | | | | | | Task-number: QT-2824
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-0822-567/+593
| |\ \
| | * | 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
| | | | |
| | * | | 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.7Bea Lam2010-03-088-0/+93
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fixed declarative demos not being installed.Rohan McGovern2010-03-088-0/+93
| | | | |
| * | | | Make compile following QDeclarativeMetaProperty renamingBea Lam2010-03-084-8/+8
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-08324-13604/+27435
| |\ \ \ | | |/ /
| | * | 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 '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>
| | * | | | | | QDirectFBPaintEngine optimizationAnders Bakken2010-03-051-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you call fillRect(QBrush(QColor())); we should short-circuit before falling back to the raster engine. Reviewed-by: muthu <qt-info@nokia.com>
| | * | | | | | Add some warnings when using DISABLE/WARN in DFBAnders Bakken2010-03-051-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you specify an operation that is not recognized in QT_DIRECTFB_WARN_ON_RASTERFALLBACKS or QT_DIRECTFB_DISABLE_RASTERFALLBACKS Reviewed-by: muthu <qt-info@nokia.com>
| * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0515-51/+216
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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 Fixed key mappings on X11 QDom: prevent infinite loop when cloning a DTD QPrintPreviewDialog number of pages is partially blocked from view in OSX Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-0515-51/+216
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: 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 Fixed key mappings on X11 QDom: prevent infinite loop when cloning a DTD QPrintPreviewDialog number of pages is partially blocked from view in OSX Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
| | | * | | | | | Fix build with Mesa 7.8's EGL implementatioonBernhard Rosenkraenzer2010-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this change, when Mesa 7.8 is used, qtextstream.h (included by qdebug.h) complains that it has to be included before any header that defines Status Merge-request: 483 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | | * | | | | | Reset the byte order in the iconv codec after using it.Thiago Macieira2010-03-051-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, if you try run QString(QChar(0xfffe)).toLocal8Bit() iconv will be left in byte-swapping mode. Reviewed-by: Denis Dzyubenko
| | | * | | | | | fix "using namespace" recursion crashOswald Buddenhagen2010-03-053-8/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-8360
| | | * | | | | | Fixed key mappings on X11Denis Dzyubenko2010-03-052-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request #1742 (6c8c1c5322a26d789165783d7df3e29c672690cb) changed the behavior of one of the keys on X11, this fixes it back and documents that on X11 the key binding is a bit weird - XF86XK_MyComputer is mapped to Qt::Key_Launch0, XF86XK_Launch0 is mapped to Qt::Key_Launch3 and so on. Task-number: QTBUG-7063 Reviewed-by: Marius Storm-Olsen
generated by cgit v0.12 at 2025-08-21 16:25:53 (GMT)