diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2010-03-23 11:29:00 (GMT) |
|---|---|---|
| committer | Alan Alpert <alan.alpert@nokia.com> | 2010-03-23 11:29:00 (GMT) |
| commit | 56939d84ed5303dbc1b3926d1d5ae50d6512961e (patch) | |
| tree | 84d3ed8ca7dacd6f57598c118e8972f592abf08a /src/gui/itemviews/qabstractitemview.cpp | |
| parent | 90e401d350a75dfa365a8f3090514a2741f7bef6 (diff) | |
| parent | 99788a16e70a36f5d1b525414829040aa808908a (diff) | |
| download | Qt-56939d84ed5303dbc1b3926d1d5ae50d6512961e.zip Qt-56939d84ed5303dbc1b3926d1d5ae50d6512961e.tar.gz Qt-56939d84ed5303dbc1b3926d1d5ae50d6512961e.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
Diffstat (limited to 'src/gui/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 0f99949..a4722f7 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -104,7 +104,7 @@ QAbstractItemViewPrivate::QAbstractItemViewPrivate() horizontalScrollMode(QAbstractItemView::ScrollPerItem), currentIndexSet(false), wrapItemText(false), - delayedPendingLayout(false) + delayedPendingLayout(true) { } @@ -131,8 +131,6 @@ void QAbstractItemViewPrivate::init() viewport->setBackgroundRole(QPalette::Base); - doDelayedItemsLayout(); - q->setAttribute(Qt::WA_InputMethodEnabled); #ifdef QT_SOFTKEYS_ENABLED |