[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdevplatform/frameworks] /: Fix build
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-18 22:31:46
Message-ID: E1WFtCc-0008B6-FI () scm ! kde ! org
[Download RAW message or body]

Git commit 81f91ab349503fa5f09cc36af60dd154d1f24a29 by Alex Merry.
Committed on 18/02/2014 at 22:30.
Pushed by alexmerry into branch 'frameworks'.

Fix build

Missing include for i18n in grepoutputview.cpp, and override for a
method not actually in the parent class (which is now QQuickView rather
than QGraphicsView) in assistantpopup.cpp.

M  +1    -0    plugins/grepview/grepoutputview.cpp
M  +2    -0    shell/assistantpopup.cpp
M  +2    -0    shell/assistantpopup.h

http://commits.kde.org/kdevplatform/81f91ab349503fa5f09cc36af60dd154d1f24a29

diff --git a/plugins/grepview/grepoutputview.cpp b/plugins/grepview/grepout=
putview.cpp
index 9b3522f..8552ffa 100644
--- a/plugins/grepview/grepoutputview.cpp
+++ b/plugins/grepview/grepoutputview.cpp
@@ -23,6 +23,7 @@
 #include <KMessageBox>
 #include <KColorScheme>
 #include <kdebug.h>
+#include <klocalizedstring.h>
 #include <QMenu>
 =

 #include <interfaces/icore.h>
diff --git a/shell/assistantpopup.cpp b/shell/assistantpopup.cpp
index 95bd979..6e5ddc2 100644
--- a/shell/assistantpopup.cpp
+++ b/shell/assistantpopup.cpp
@@ -82,6 +82,7 @@ AssistantPopup::AssistantPopup(KTextEditor::View* parent,=
 const IAssistant::Ptr&
     m_view->installEventFilter(this);
 }
 =

+#if 0
 bool AssistantPopup::viewportEvent(QEvent *event)
 {
     // For some reason, QGraphicsView posts a WindowActivate event
@@ -93,6 +94,7 @@ bool AssistantPopup::viewportEvent(QEvent *event)
     }
     return QGraphicsView::viewportEvent(event);
 }
+#endif
 =

 AssistantPopupConfig::AssistantPopupConfig(QObject *parent): QObject(paren=
t)
 {
diff --git a/shell/assistantpopup.h b/shell/assistantpopup.h
index 7775a93..e4a5621 100644
--- a/shell/assistantpopup.h
+++ b/shell/assistantpopup.h
@@ -103,7 +103,9 @@ public:
      */
     AssistantPopup(KTextEditor::View* widget, const KDevelop::IAssistant::=
Ptr& assistant);
     KDevelop::IAssistant::Ptr assistant() const;
+#if 0
     virtual bool viewportEvent(QEvent *event);
+#endif
 =

 public slots:
     void executeHideAction();
[prev in list] [next in list] [prev in thread] [next in thread]