@@ -80,9 +80,10 @@ QList<WebPageLinkedResource> WebPage::linkedResources(const QString &relation) { QList<WebPageLinkedResource> resources; -#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) - QUrl baseUrl = mainFrame()->baseUrl(); + QString baseUrlString = mainFrame()->evaluateJavaScript(QLatin1String("document.baseURI")).toString(); + QUrl baseUrl = QUrl::fromEncoded(baseUrlString.toUtf8()); +#if QT_VERSION >= 0x040600 || defined(WEBKIT_TRUNK) QList<QWebElement> linkElements = mainFrame()->findAllElements(QLatin1String("html > head > link")); foreach (const QWebElement &linkElement, linkElements) { @@ -105,9 +106,6 @@ QList<WebPageLinkedResource> WebPage::linkedResources(const QString &relation) resources.append(resource); } #else - QString baseUrlString = mainFrame()->evaluateJavaScript(QLatin1String("document.baseURI")).toString(); - QUrl baseUrl = QUrl::fromEncoded(baseUrlString.toUtf8()); - QFile file(QLatin1String(":fetchLinks.js")); if (!file.open(QFile::ReadOnly)) return resources; src/webpage.cpp 13ef6f1c4a98e3c6907b81a5e61c2f840a3acc2c Jakub Wieczorek faw217@gmail.com http://github.com/Arora/arora/commit/ef65a82ffc131ea4ecf3b85329e30f5b3ef5855f ef65a82ffc131ea4ecf3b85329e30f5b3ef5855f 2009-07-02T12:55:22-07:00 2009-07-02T12:51:13-07:00 Fix build with Qt 4.6. The QtWebKit snapshot from 4.6 doesn't have the baseUrl() API yet. 2d21a0553da9203ccd17756ddab3953d327f3a6b Jakub Wieczorek faw217@gmail.com