Get mythbrowser to compile in Qt5 (won't do much).

MythTV · May 21, 2013 · 8d7a29a · 8d7a29a
1 parent 98cfe05
commit 8d7a29a
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/mythplugins/mythbrowser/mythbrowser/webpage.cpp b/mythplugins/mythbrowser/mythbrowser/webpage.cpp
@@ -7,7 +7,7 @@
 
 // myth
 #include "mythlogging.h"
-#include "libmythui/mythmainwindow.h"
+#include "mythmainwindow.h"
 
 // mythbrowser
 #include "mythbrowser.h"

diff --git a/mythtv/libs/libmythui/mythuiwebbrowser.h b/mythtv/libs/libmythui/mythuiwebbrowser.h
@@ -7,6 +7,7 @@
 #include "mythuiexp.h"
 
 #if QT_VERSION >= 0x050000
+#include <QIcon>
 class MUI_PUBLIC MythUIWebBrowser : public MythUIType
 {
   Q_OBJECT
@@ -15,11 +16,26 @@ class MUI_PUBLIC MythUIWebBrowser : public MythUIType
     MythUIWebBrowser(MythUIType *parent, const QString &name) :
     MythUIType(parent, name) {}
     ~MythUIWebBrowser() {}
-    void SetHtml(const QString &, const QUrl &baseUrl = QUrl()) {}
+    void SetHtml(const QString &, const QUrl &baseUrl = QUrl())
+        { (void) baseUrl; }
     void SetZoom(float) {}
     float GetZoom(void) { return 1.0; }
     void ZoomIn(void) {}
     void ZoomOut(void) {}
+
+    void Init(void) {}
+    void SetActive(bool) {}
+    void LoadPage(QUrl) {}
+    void SetDefaultSaveDirectory(const QString &) {}
+    void SetDefaultSaveFilename(const QString &) {}
+    bool CanGoForward(void) { return false; }
+    bool CanGoBack(void) { return false; }
+    void Back(void) {}
+    void Forward(void) {}
+    QIcon GetIcon(void) { return QIcon(); }
+    QUrl GetUrl(void) { return QUrl("http://example.com"); }
+    QString GetTitle(void) { return QString(); }
+    QVariant evaluateJavaScript(const QString&) { return QVariant(); }
 };
 #warning MythUIWebBrowser has not yet been ported to Qt5
 #else