summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1935-292/+384
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeecmascript/testtypes.h
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1817-147/+225
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix bug when resetting QSortFilterProxyModel Fix the QSplitter not showing correctly in QGraphicsView Remove ; after Q_PROPERTY declaration Fix compilation issues of autotest on solaris fix a crash when registering 2 metatype name for the same actual type Fixed problem in painting of QTreeView
| | * Fix bug when resetting QSortFilterProxyModelStephen Kelly2010-03-182-2/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple proxies are connected to one source model which gets reset, the order of execution of the sourceModelAboutToBeReset slots could cause QPersistentModelIndexes to be invalidated in one proxy model before the same slot is executed in the other proxy model. Additionally, the persistent indexes in the QSFPM are invalidated before the persistent indexes in the source model. This patch makes them invalidated afterward now, which makes more sense. Merge-request: 503 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * Fix the QSplitter not showing correctly in QGraphicsViewThierry Bastian2010-03-181-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was due to the usage of mapToGlobal. It is now fixed by making the rubberband child of the window() of the splitter and using mapTo(window()) Task-number: QTBUG-8504 Reviewed-by: gabi
| | * Remove ; after Q_PROPERTY declarationThierry Bastian2010-03-187-90/+90
| | |
| | * Fix compilation issues of autotest on solarisThierry Bastian2010-03-189-13/+13
| | | | | | | | | | | | Task-number: QTBUG-8590
| | * fix a crash when registering 2 metatype name for the same actual typeThierry Bastian2010-03-181-11/+7
| | | | | | | | | | | | Reviewed-by: ogoffart
| | * Fixed problem in painting of QTreeViewThierry Bastian2010-03-181-11/+11
| | | | | | | | | | | | | | | | | | | | | It could beseen that not a full row was updated when moving the mouse from the decoration to its attached item. Reviewed-by: gabi
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-1818-146/+160
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-03-1818-146/+160
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.
| | | * | Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.Andrew den Exter2010-03-1818-146/+160
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
* | | | | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | This qmake script had wrong logic as a result of a bad copy and paste (probably from translations\translations.pro)
* | | | | Disable tests temporarilyBea Lam2010-03-191-0/+3
| | | | |
* | | | | Remove warningsYann Bodson2010-03-182-29/+31
| | | | |
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash ...
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (147 commits) Add missing semicolons. moc was confused and positionViewAtIndex not invokable. Use the correct base URL in resolveUri Remove timing sensitivity. Optimize id checking. Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Don't use QScriptValueIterator to iterate over arrays. Skip test, to be fixed. Only release the binding once we're finished with its memory Make it harder to accidentally delete a binding Adjust test now that redundant contexts are not create due Block modifications to internal QDeclarativeContexts Don't destroy cookie jar until while someone may be using it. Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04. Another fix to find Improve implicit "." import Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash ...
| | * | | Add missing semicolons. moc was confused and positionViewAtIndex not invokable.Yann Bodson2010-03-182-2/+2
| | | | |
| | * | | Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
| | | | |
| | * | | Remove timing sensitivity.Warwick Allison2010-03-181-2/+2
| | | | |
| | * | | Optimize id checking.Warwick Allison2010-03-181-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | id must be lowercase; types and namespaces must be uppercase cannot conflict, so remove check.
| | * | | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
| | | | |
| | * | | Don't use QScriptValueIterator to iterate over arrays.Bea Lam2010-03-181-4/+3
| | | | |
| | * | | Skip test, to be fixed.Bea Lam2010-03-181-0/+2
| | | | |
| | * | | Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
| | | | |
| | * | | Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
| | | | |
| | * | | Adjust test now that redundant contexts are not create dueWarwick Allison2010-03-181-2/+2
| | | | | | | | | | | | | | | | | | | | to commit 26cd94ef47ffc969dc835e98b58eded14e669964.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-1825-62/+73
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-1824-38/+39
| | | |\ \ \
| | | | * | | Fix tests after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Michael Brasser2010-03-1824-38/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The import order has changed, so test files that mirror element names needed to be renamed (or they would resolve as the type).
| | | * | | | Don't destroy cookie jar until while someone may be using it.Martin Jones2010-03-181-24/+34
| | | |/ / /
| | * | | | Block modifications to internal QDeclarativeContextsAaron Kennedy2010-03-182-1/+50
| | |/ / /
| | * | | Another fix to findmae2010-03-171-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Do not try to instantiate types that are explicitely forbidden in the qmldir (because the version does not match).
| | * | | Improve implicit "." importmae2010-03-172-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change moves the implicit "." import to the very end, i.e. the first lookup. It also gets the content of a remote qmldir from the resources.
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-17265-3662/+7109
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (132 commits) Fix auto test Fix type lookup with url Fix default values on Textinput Add an implicit import "." to types loaded from a local url Fix crash Don't use Qt3 support methods. Crash Add/delete albums in photoviewer. Emits itemsRemoved() in QDeclarativeListModel::remove. Readd the itemtree benchmarks for comparison purposes. Allow enum constants as list element properties. Compile Cleanup benchmark a little Really fix warning. Fix warnings. MouseArea works now with any QGraphicsObject Make states test work with smaller font size. Register QGraphicsWidget type. Add ListView and GridView.indexAt() methods to get the index at a point. Tests for default count(), get() values should be run on the worker ...
| | | * | | Fix auto testmae2010-03-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This repairs 9727cb35b30e07d1f72100a39c8d23e438e2746c. The lookup can only happen if we have a file import (and not a library import)
| | | * | | Fix type lookup with urlmae2010-03-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existence of a non-empty qmldir file (e.g. for defining a plugin) should not change the lookup rules for qml files via url
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Alan Alpert2010-03-17493-12162/+25145
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/declarative/util/qdeclarativelistmodel.cpp tools/qml/qml.pro
| | | * | | | Fix default values on TextinputAlan Alpert2010-03-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: BAUHAUS-389
| | | * | | | Add an implicit import "." to types loaded from a local urlmae2010-03-172-4/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This triggers the loading of the qmldir and the import of native types from available plugins. The change puts native types on par with types defined in qml files.
| | | * | | | Fix crashAaron Kennedy2010-03-173-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the notifier gets swapped out during emitting, the endpoint is also invalidated. Thus the "disconnected" writeback must track the endpoint not just the Notifier.
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-176-38/+111
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-172-9/+19
| | | | |\ \ \ \
| | | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Yann Bodson2010-03-1713-155/+179
| | | | |\ \ \ \ \
| | | | * | | | | | Add/delete albums in photoviewer.Yann Bodson2010-03-175-24/+95
| | | | | | | | | |
| | | | * | | | | | Emits itemsRemoved() in QDeclarativeListModel::remove.Yann Bodson2010-03-171-14/+16
| | | | | | | | | |
| | | * | | | | | | Don't use Qt3 support methods.Martin Jones2010-03-171-1/+1
| | | | |_|/ / / / | | | |/| | | | |
| | | * | | | | | CrashAaron Kennedy2010-03-172-9/+19
| | | | |/ / / / | | | |/| | | |
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-171-0/+102
| | | |\ \ \ \ \
| | | | * | | | | Readd the itemtree benchmarks for comparison purposes.Michael Brasser2010-03-171-0/+102
| | | | | | | | |
| | | * | | | | | Allow enum constants as list element properties.Warwick Allison2010-03-176-6/+63
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5974
generated by cgit v0.12 at 2025-09-22 14:27:52 (GMT)