diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 21:28:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-05 21:28:41 (GMT) |
| commit | 941b13d52d975069d10093a873cd3a55bb2fd7dd (patch) | |
| tree | bb66b6379a551808e76de8c936e03bc9432613f5 /src/corelib | |
| parent | 777bf47da36292ffd37ae48a19796aafeb4d922e (diff) | |
| parent | 2bc5d161e6820d459f00ac687ed99830a731cb74 (diff) | |
| download | Qt-941b13d52d975069d10093a873cd3a55bb2fd7dd.zip Qt-941b13d52d975069d10093a873cd3a55bb2fd7dd.tar.gz Qt-941b13d52d975069d10093a873cd3a55bb2fd7dd.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (49 commits)
Fixed qt_x11_wait_for_window_manager
Revert change 34f1758 on non-Synbian platforms
Fixed QGifHandler::loopCount().
Fix tst_QAccessiblity failure.
fix compile error when linuxinput keyboard driver is compiled as plugin
Fixed the context menu test case in the qgraphicsscene autotest.
fix regression from Qt 4.5 wrt missing text pixels in QTabBar
Cleanup after "Changed qgraphicswidget autotest to use qWaitForWindowShown"
Cleanup after "QGraphicsWidget is painted twice on the first show"
Changed qgraphicswidget autotest to use qWaitForWindowShown.
Improved QTest::qWaitForWindowShown on X11.
Stabilize tst_QGraphicsWidget::initialShow2 (new test)
Make sure we define S_IFDIR on Windows
Fix copy/pasto
Crash when closing any top-level widget on Symbian.
Cache the sizes of the images in an animated GIF.
Fix the QAbstractSlider autotest.
Use OpenVG scissor on 90/180/270 rotations and simple clips.
Optimize single-rect IntersectClip in OpenVG using the scissor
QGraphicsWidget is painted twice on the first show.
...
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qabstractitemmodel.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/kernel/qabstractitemmodel.cpp b/src/corelib/kernel/qabstractitemmodel.cpp index dbf422e..36e4af9 100644 --- a/src/corelib/kernel/qabstractitemmodel.cpp +++ b/src/corelib/kernel/qabstractitemmodel.cpp @@ -1006,6 +1006,9 @@ void QAbstractItemModelPrivate::columnsRemoved(const QModelIndex &parent, Returns the child of the model index that is stored in the given \a row and \a column. + \note This function does not work for an invalid model index which is often + used as the root index. + \sa parent(), sibling() */ |