summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-1739-576/+827
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17258-3490/+6750
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (112 commits) Verbose unexpected errors. One url for an *unqualilfied* import is not special. Fix test failures Optimization: Don't unnecessarily run VMEStack element constructors Optimization: Reduce unnecessary QObject allocations Reset QDeclarativeDeclarativeData::outerContext when the context is removed Simplify QDeclarativeComponent::creationContext() logic Optimization: Use id notifier for QtScript bindings Optimization: Combine QDeclarativeDeclarativeData and QObject allocations Fixes for the module import Fix documentation add alan's tic-tac-toe AI Remove test in .pro file also Remove unneeded #include and add needed header to .pri Add easing changes to QmlChanges.txt Update more animation on property value source docs. Doc fixes. QmlChanges.txt cleanup. Remove WorkerListModel and integrate its functionality into ListModel. Split post alpha API changes into a separate section. ...
| | * Verbose unexpected errors.Warwick Allison2010-03-171-2/+1
| | |
| | * One url for an *unqualilfied* import is not special.Warwick Allison2010-03-171-1/+2
| | | | | | | | | | | | Stops tst_qdeclarativelanguage passing when network transparency breaks.
| | * Fix test failuresAaron Kennedy2010-03-176-6/+11
| | |
| | * Optimization: Don't unnecessarily run VMEStack element constructorsAaron Kennedy2010-03-171-4/+4
| | |
| | * Optimization: Reduce unnecessary QObject allocationsAaron Kennedy2010-03-1731-550/+740
| | |
| | * Reset QDeclarativeDeclarativeData::outerContext when the context is removedAaron Kennedy2010-03-171-0/+1
| | |
| | * Simplify QDeclarativeComponent::creationContext() logicAaron Kennedy2010-03-171-5/+2
| | |
| | * Optimization: Use id notifier for QtScript bindingsAaron Kennedy2010-03-173-5/+33
| | |
| | * Optimization: Combine QDeclarativeDeclarativeData and QObject allocationsAaron Kennedy2010-03-175-5/+30
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-175-15/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix the QPrintDialog showing a popup with nothing. Fix OpenGL2 paint engine compilation issue Speed up various QFontMetrics functions Avoid using uncompatible vertex shader for non-solid brushes
| | * | Fix the QPrintDialog showing a popup with nothing.Alexis Menard2010-03-162-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPrintDialog uses QFileSystemModel with QCompleter. In that case with the 4.7 version of QCompleter it was trying to complete stuff even if the prefix was empty. I also fixed QPrintDialog, it was using QFSCompleter which didn't work in QPrintDialog (QFSCompleter is designed for QFileDialog). Now it uses a regular QCompleter. Task-number:QTBUG-8556 Reviewed-by:trond
| | * | Fix OpenGL2 paint engine compilation issueRhys Weatherley2010-03-161-1/+1
| | | | | | | | | | | | | | | | Reviewed-by: Daniel Pope
| | * | Speed up various QFontMetrics functionsSimon Hausmann2010-03-161-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | Use QStackTextEngine to avoid heap allocations. Reviewed-by: Lars
| | * | Avoid using uncompatible vertex shader for non-solid brushesEskil Abrahamsen Blomfeldt2010-03-161-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The simplified vertex shader for complex geometry is written specifically for solid brushes and needs to be disabled when the brush is anything else. This work-around can be removed later when QTBUG-9069 is handled, since that removes the extra requirements on the setPosition() shader. Reviewed-by: tom
* | | | Tests for default count(), get() values should be run on the workerBea Lam2010-03-175-35/+33
| |_|/ |/| | | | | | | | | | | list model instead of being ignored. Also do some cleaning up in the list model.
* | | Fixes for the module importmae2010-03-162-38/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | The change makes import "url" also load plugins. We know must decide on the preferred coding style. Since native types must be registered with a unique uri, we now generate a stable uri from the plugin path and the import paths. This way we do not have to call registerTypes() multiple times.
* | | Fix documentationmae2010-03-162-4/+4
| | |
* | | add alan's tic-tac-toe AImae2010-03-163-7/+151
| | |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-16241-2984/+5781
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (100 commits) Remove test in .pro file also Remove unneeded #include and add needed header to .pri Add easing changes to QmlChanges.txt Update more animation on property value source docs. Doc fixes. QmlChanges.txt cleanup. Remove WorkerListModel and integrate its functionality into ListModel. Split post alpha API changes into a separate section. Optimize drawPixmapFragments for the GL2 paint engine. Optimize QRegion::intersects(QRect). Compile with user defined Qt namespace Fix regression from previous commit Import "content" with as qualifier to support network without qmldir Small fixes to photoviewer demo Little more doc on QabstractItemModel and QML. Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries ...
| * | Remove test in .pro file alsoAlan Alpert2010-03-161-1/+0
| | |
| * | Remove unneeded #include and add needed header to .priMartin Jones2010-03-162-2/+1
| | |
| * | Add easing changes to QmlChanges.txtMartin Jones2010-03-161-0/+8
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1620-1220/+1549
| |\ \
| | * | Doc fixes.Bea Lam2010-03-162-28/+27
| | | |
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-03-16631-7320/+14860
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
| | * | | Remove WorkerListModel and integrate its functionality into ListModel.Bea Lam2010-03-1619-1220/+1551
| | | | | | | | | | | | | | | | | | | | Task-number: QT-2829
| * | | | Update more animation on property value source docs.Martin Jones2010-03-163-17/+19
| | | | |
| * | | | QmlChanges.txt cleanup.Martin Jones2010-03-161-23/+26
| | |/ / | |/| |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-16207-1517/+2539
| |\ \ \
| | * | | Optimize drawPixmapFragments for the GL2 paint engine.Michael Brasser2010-03-152-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In this case, we don't need QGL2PEXVertexArray to keep track of min and max information. Reviewed-by: Samuel
| | * | | Optimize QRegion::intersects(QRect).Michael Brasser2010-03-152-16/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Further optimize for the common case where numRects == 1. Benchmarks included. Reviewed-by: Samuel
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15217-1679/+4055
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (89 commits) Compile with user defined Qt namespace Fix regression from previous commit Import "content" with as qualifier to support network without qmldir Small fixes to photoviewer demo Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code ...
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15217-1679/+4055
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (89 commits) Compile with user defined Qt namespace Fix regression from previous commit Import "content" with as qualifier to support network without qmldir Small fixes to photoviewer demo Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code ...
| | | | * | | Compile with user defined Qt namespaceRoberto Raggi2010-03-151-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect the forward declaration of qstrtod with a QT_BEGIN/END namespace
| | | | * | | Fix regression from previous commitmae2010-03-153-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support quoted imports without qualitifier id but with qmldir. This makes it possible again to launch the flickr demo from a remote site.
| | | | * | | Import "content" with as qualifier to support network without qmldirmae2010-03-151-5/+5
| | | | | | |
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-15215-1681/+4042
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (86 commits) Small fixes to photoviewer demo Fix benchmark. Add basic QUrl benchmarks. Add busy indicator to photoviewer demo Set maximumExtents correctly for highlightRangeMode: StrictlyEnforceRange fix installation of imports libraries QDeclarative::isWritable optimization. Make easing docs more consistent with other grouped property docs. Make the loader a focusscope. Fix typo. Use reliable local server for HTTP testing. Fix installation of imports libraries Change PathView offset property to use range 0 - 1.0 Tweak benchmark Optimization: Use linked list for context children Add new declarative photoviewer demo Remove dead code Make QML the object allocator more flexible Fix crash on 32-bit platforms Enable GL samplebuffers by default on Mac OS X ...
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-0/+252
| | | | | |\ \ \
| | | | | * | | | Small fixes to photoviewer demoYann Bodson2010-03-152-12/+14
| | | | | | | | |
| * | | | | | | | Split post alpha API changes into a separate section.Martin Jones2010-03-161-21/+27
| | | | | | | | |
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-158-2/+270
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Fix benchmark.Michael Brasser2010-03-151-0/+1
| | | | | | | | |
| | * | | | | | | Add basic QUrl benchmarks.Michael Brasser2010-03-152-0/+251
| | | |_|_|/ / / | | |/| | | | |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-151-2/+2
| | |\ \ \ \ \ \
| | * | | | | | | Add busy indicator to photoviewer demoYann Bodson2010-03-155-2/+18
| | | | | | | | |
| * | | | | | | | Little more doc on QabstractItemModel and QML.Martin Jones2010-03-152-5/+21
| | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1527-165/+228
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-153-9/+20
| | |\ \ \ \ \ \
generated by cgit v0.12 at 2025-08-18 11:34:36 (GMT)