diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:37:43 +0200 |
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2010-08-21 01:37:43 +0200 |
| commit | 5227ba5c53fd1a82fe5d369c2a29b2ad32641f5c (patch) | |
| tree | b60cce6a11e0d53c2ad65befae0005bb9747f142 /src/mainwindow.h | |
| parent | Merge commit 'refs/merge-requests/182' of git://gitorious.org/rekonq/mainline... (diff) | |
| parent | Useless include (diff) | |
| download | rekonq-5227ba5c53fd1a82fe5d369c2a29b2ad32641f5c.tar.xz | |
Merge commit 'refs/merge-requests/183' of git://gitorious.org/rekonq/mainline into m183
Conflicts:
src/mainwindow.h
Diffstat (limited to 'src/mainwindow.h')
| -rw-r--r-- | src/mainwindow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mainwindow.h b/src/mainwindow.h index eeb58171..3aa57f5c 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -167,7 +167,8 @@ private slots: void enableNetworkAnalysis(bool); void initBookmarkBar(); - + void initToolsMenu(); + private: MainView *m_view; FindBar *m_findBar; @@ -188,6 +189,8 @@ private: KPassivePopup *m_popup; QTimer *m_hidePopup; + + KActionMenu *m_toolsMenu; }; #endif // MAINWINDOW_H |