diff options
| author | Keith Isdale <keith.isdale@nokia.com> | 2009-08-31 04:01:05 (GMT) |
|---|---|---|
| committer | Keith Isdale <keith.isdale@nokia.com> | 2009-08-31 04:01:05 (GMT) |
| commit | f392f0c53eac312c150e7277fd6a0e97c659b05d (patch) | |
| tree | 96d6825c6b21c894fa347498d56a12c29ef8ed99 /src/gui | |
| parent | 3b74c6350ab789c31a938df0807c8c9399bc4fcb (diff) | |
| parent | b42b00a36b5b48bffcbccc9b1c7ecafa89b4e18e (diff) | |
| download | Qt-f392f0c53eac312c150e7277fd6a0e97c659b05d.zip Qt-f392f0c53eac312c150e7277fd6a0e97c659b05d.tar.gz Qt-f392f0c53eac312c150e7277fd6a0e97c659b05d.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/widgets/qtabbar.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index bd45379..bdc804c 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1844,7 +1844,8 @@ void QTabBarPrivate::_q_moveTabFinished(int index) Q_Q(QTabBar); bool cleanup = (pressedIndex == index) || (pressedIndex == -1) || !validIndex(index); if (animations.isEmpty() && cleanup) { - movingTab->setVisible(false); // We might not get a mouse release + if (movingTab) + movingTab->setVisible(false); // We might not get a mouse release for (int i = 0; i < tabList.count(); ++i) { tabList[i].dragOffset = 0; } |