diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-04-30 08:43:57 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-04-30 08:43:57 (GMT) |
| commit | 5d9fd03a7263523f0b2d830a450328b58e50e1bb (patch) | |
| tree | bbd6a7a36830fafb574cda0f3ad9079c5e5a2674 /tools | |
| parent | 4b51c3a7c0875d23cda1d377e2f8faaf3c4b2396 (diff) | |
| parent | c01d4f630187602b8c69e7f20c2b3edc4151e226 (diff) | |
| download | Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.zip Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.tar.gz Qt-5d9fd03a7263523f0b2d830a450328b58e50e1bb.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/lib/shared/filterwidget.cpp | 5 | ||||
| -rw-r--r-- | tools/designer/src/lib/shared/filterwidget_p.h | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/designer/src/lib/shared/filterwidget.cpp b/tools/designer/src/lib/shared/filterwidget.cpp index 07af901..9363b7c 100644 --- a/tools/designer/src/lib/shared/filterwidget.cpp +++ b/tools/designer/src/lib/shared/filterwidget.cpp @@ -209,10 +209,9 @@ QString FilterWidget::text() const void FilterWidget::checkButton(const QString &text) { - static QString oldtext; - if (oldtext.isEmpty() || text.isEmpty()) + if (m_oldText.isEmpty() || text.isEmpty()) m_button->animateShow(!m_editor->text().isEmpty()); - oldtext = text; + m_oldText = text; } void FilterWidget::reset() diff --git a/tools/designer/src/lib/shared/filterwidget_p.h b/tools/designer/src/lib/shared/filterwidget_p.h index 423b30e..8ca2073 100644 --- a/tools/designer/src/lib/shared/filterwidget_p.h +++ b/tools/designer/src/lib/shared/filterwidget_p.h @@ -142,6 +142,7 @@ private: HintLineEdit *m_editor; IconButton *m_button; int m_buttonwidth; + QString m_oldText; }; } // namespace qdesigner_internal |