diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-07-12 12:35:27 (GMT) |
| commit | 55ff179342bfb67b6f2592d7b1df66e1f3c6a350 (patch) | |
| tree | 266b6e82ae4de9c1eb2f0c2d2c2310f774a55089 /tools/qml/loggerwidget.h | |
| parent | 0713442baa4120050e85c13998797415bb40efce (diff) | |
| parent | e4f5a81869e75a998278c19134f2772fefd998fe (diff) | |
| download | Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.zip Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.gz Qt-55ff179342bfb67b6f2592d7b1df66e1f3c6a350.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'tools/qml/loggerwidget.h')
| -rw-r--r-- | tools/qml/loggerwidget.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/qml/loggerwidget.h b/tools/qml/loggerwidget.h index fd20c41..13c319f 100644 --- a/tools/qml/loggerwidget.h +++ b/tools/qml/loggerwidget.h @@ -42,12 +42,17 @@ #ifndef LOGGERWIDGET_H #define LOGGERWIDGET_H -#include <QPlainTextEdit> +#include <QMainWindow> +#include <QMetaType> QT_BEGIN_NAMESPACE -class LoggerWidget : public QPlainTextEdit { -Q_OBJECT +class QPlainTextEdit; +class QMenu; +class QAction; + +class LoggerWidget : public QMainWindow { + Q_OBJECT public: LoggerWidget(QWidget *parent=0); @@ -80,6 +85,7 @@ private: QMenu *m_preferencesMenu; QAction *m_showWidgetAction; + QPlainTextEdit *m_plainTextEdit; enum ConfigOrigin { CommandLineOrigin, SettingsOrigin }; ConfigOrigin m_visibilityOrigin; |