diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 20:39:09 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-28 20:39:09 (GMT) |
| commit | 3db151311182b8da820486044f08958a37b0f8e0 (patch) | |
| tree | 74b9c3ef287e80f9b890a6fba5bfaefeee50ea95 /tools/designer/src/lib/shared/qdesigner_toolbar.cpp | |
| parent | 9d636095403f5abecbdff8ffffe658f35ff10001 (diff) | |
| parent | 7d66d263b93164ddc501050d07ddcc198921da8c (diff) | |
| download | Qt-3db151311182b8da820486044f08958a37b0f8e0.zip Qt-3db151311182b8da820486044f08958a37b0f8e0.tar.gz Qt-3db151311182b8da820486044f08958a37b0f8e0.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix source code scanning issues.
Diffstat (limited to 'tools/designer/src/lib/shared/qdesigner_toolbar.cpp')
| -rw-r--r-- | tools/designer/src/lib/shared/qdesigner_toolbar.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp index 1cee074..02a2f6d 100644 --- a/tools/designer/src/lib/shared/qdesigner_toolbar.cpp +++ b/tools/designer/src/lib/shared/qdesigner_toolbar.cpp @@ -440,7 +440,7 @@ QAction *ToolBarEventFilter::actionAt(const QToolBar *tb, const QPoint &pos) return tb->actions().at(index); } -//that's a trick to get acces to the initStyleOption which is a protected member +//that's a trick to get access to the initStyleOption which is a protected member class FriendlyToolBar : public QToolBar { public: friend class ToolBarEventFilter; |