diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-09-29 10:56:05 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-09-29 10:56:05 (GMT) |
| commit | 17c17adbd706d32723ecedeb207c7e467f9fa8eb (patch) | |
| tree | 22d6d314dc7320d0b728578a734d636a1d74d9ae /src/scripttools/debugging/qscriptdebugger_p.h | |
| parent | 1ff83d2b44fe07d1bc6b243fad270dfa7d860dc7 (diff) | |
| parent | dcd185e58face87105f484e98ecb195af0790a22 (diff) | |
| download | Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.zip Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.tar.gz Qt-17c17adbd706d32723ecedeb207c7e467f9fa8eb.tar.bz2 | |
Merge commit 'qt/4.6' into mmfphonon
Diffstat (limited to 'src/scripttools/debugging/qscriptdebugger_p.h')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebugger_p.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger_p.h b/src/scripttools/debugging/qscriptdebugger_p.h index 57758de..08e9a99 100644 --- a/src/scripttools/debugging/qscriptdebugger_p.h +++ b/src/scripttools/debugging/qscriptdebugger_p.h @@ -71,7 +71,9 @@ class QScriptDebuggerWidgetFactoryInterface; class QAction; class QEvent; class QMenu; +#ifndef QT_NO_TOOLBAR class QToolBar; +#endif class QScriptDebuggerPrivate; class Q_AUTOTEST_EXPORT QScriptDebugger : public QObject @@ -168,8 +170,9 @@ public: QAction *clearErrorLogAction(QObject *parent) const; QMenu *createStandardMenu(QWidget *widgetParent, QObject *actionParent); +#ifndef QT_NO_TOOLBAR QToolBar *createStandardToolBar(QWidget *widgetParent, QObject *actionParent); - +#endif bool eventFilter(QObject *, QEvent *e); bool isInteractive() const; |