guessUrlFromString is not in WebKit. Fix build when compiling

against webkit trunk and Qt < 4.6.
gzsombor · Nov 22, 2009 · f67f163 · f67f163
1 parent 25d0013
commit f67f163
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/webview.cpp b/src/webview.cpp
@@ -156,7 +156,7 @@ void WebView::loadSettings()
     m_page->loadSettings();
 }
 
-#if !(QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK))
+#if !(QT_VERSION >= 0x040600)
 #include <qdir.h>
 // DO NOT CHANGE ANYTHING IN THIS FUNCTION
 // You want to change TabWidget::guessUrlFromString()

diff --git a/src/webview.h b/src/webview.h
@@ -84,7 +84,7 @@ class WebView : public QWebView
     WebView(QWidget *parent = 0);
     WebPage *webPage() const { return m_page; }
 
-#if !(QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK))
+#if !(QT_VERSION >= 0x040600)
     static QUrl guessUrlFromString(const QString &url);
 #endif
     void loadSettings();