diff options
| author | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
|---|---|---|
| committer | Morten Engvoldsen <morten.engvoldsen@nokia.com> | 2011-02-23 20:32:21 (GMT) |
| commit | c881e33e7e510204fabd061dac08a00b10b432fb (patch) | |
| tree | b5a5210eef8d309a17aca7d20b457879b584913f /tools/qml/loggerwidget.h | |
| parent | 309c48a70b46678ef92da441fcc2dc96ceb8fcf3 (diff) | |
| parent | 3c982b5d214cc7a37ace1d956ac8fb0b9a281722 (diff) | |
| download | Qt-c881e33e7e510204fabd061dac08a00b10b432fb.zip Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.gz Qt-c881e33e7e510204fabd061dac08a00b10b432fb.tar.bz2 | |
Merge branch '4.7' into mimir
Diffstat (limited to 'tools/qml/loggerwidget.h')
| -rw-r--r-- | tools/qml/loggerwidget.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h index 13c319f..a3e8871 100644 --- a/tools/qml/loggerwidget.h +++ b/tools/qml/loggerwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -48,6 +48,7 @@ QT_BEGIN_NAMESPACE class QPlainTextEdit; +class QLabel; class QMenu; class QAction; @@ -66,6 +67,7 @@ public: public slots: void append(const QString &msg); + void updateNoWarningsLabel(); private slots: void warningsPreferenceChanged(QAction *action); @@ -86,7 +88,7 @@ private: QMenu *m_preferencesMenu; QAction *m_showWidgetAction; QPlainTextEdit *m_plainTextEdit; - + QLabel *m_noWarningsLabel; enum ConfigOrigin { CommandLineOrigin, SettingsOrigin }; ConfigOrigin m_visibilityOrigin; Visibility m_visibility; |