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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/scripttools/debugging/qscriptdebugger.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/scripttools/debugging/qscriptdebugger.cpp b/src/scripttools/debugging/qscriptdebugger.cpp index 6a23bd1..c09e494 100644 --- a/src/scripttools/debugging/qscriptdebugger.cpp +++ b/src/scripttools/debugging/qscriptdebugger.cpp @@ -1927,6 +1927,7 @@ QMenu *QScriptDebugger::createStandardMenu(QWidget *widgetParent, QObject *actio return menu; } +#ifndef QT_NO_TOOLBAR QToolBar *QScriptDebugger::createStandardToolBar(QWidget *widgetParent, QObject *actionParent) { QToolBar *tb = new QToolBar(widgetParent); @@ -1942,6 +1943,7 @@ QToolBar *QScriptDebugger::createStandardToolBar(QWidget *widgetParent, QObject tb->addAction(action(FindInScriptAction, actionParent)); return tb; } +#endif bool QScriptDebugger::isInteractive() const { |