Title: [93783] trunk/Source/WebKit/qt
- Revision
- 93783
- Author
- [email protected]
- Date
- 2011-08-25 07:59:11 -0700 (Thu, 25 Aug 2011)
Log Message
Unreviewed QtWebKit.pro fix for when building inside Qt
Patch by Simo Fält <[email protected]>
The QtWebKit version was being overwritten by a global Qt version when
QtWebKit was built inside Qt. Fixed by moving the version
definition after the inclusion of qbase.pri.
* QtWebKit.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebview.cpp (93782 => 93783)
--- trunk/Source/WebKit/qt/Api/qwebview.cpp 2011-08-25 14:37:21 UTC (rev 93782)
+++ trunk/Source/WebKit/qt/Api/qwebview.cpp 2011-08-25 14:59:11 UTC (rev 93783)
@@ -428,7 +428,8 @@
*/
void QWebView::load(const QUrl &url)
{
- page()->mainFrame()->load(url);
+ if (url.isValid() && !url.scheme().isEmpty())
+ page()->mainFrame()->load(url);
}
/*!
@@ -473,7 +474,10 @@
*/
void QWebView::setHtml(const QString &html, const QUrl &baseUrl)
{
- page()->mainFrame()->setHtml(html, baseUrl);
+ if (baseUrl.isValid() && !baseUrl.scheme().isEmpty())
+ page()->mainFrame()->setHtml(html, baseUrl);
+ else
+ page()->mainFrame()->setHtml(html, QUrl());
}
/*!
@@ -489,7 +493,10 @@
*/
void QWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
{
- page()->mainFrame()->setContent(data, mimeType, baseUrl);
+ if (baseUrl.isValid() && !baseUrl.scheme().isEmpty())
+ page()->mainFrame()->setContent(data, mimeType, baseUrl);
+ else
+ page()->mainFrame()->setContent(data, mimeType, QUrl());
}
/*!
@@ -546,7 +553,8 @@
void QWebView::setUrl(const QUrl &url)
{
- page()->mainFrame()->setUrl(url);
+ if (url.isValid() && !url.scheme().isEmpty())
+ page()->mainFrame()->setUrl(url);
}
QUrl QWebView::url() const
Modified: trunk/Source/WebKit/qt/ChangeLog (93782 => 93783)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-25 14:37:21 UTC (rev 93782)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-25 14:59:11 UTC (rev 93783)
@@ -1,3 +1,15 @@
+2011-08-25 Ademar de Souza Reis Jr. <[email protected]>
+
+ Unreviewed QtWebKit.pro fix for when building inside Qt
+
+ Patch by Simo Fält <[email protected]>
+
+ The QtWebKit version was being overwritten by a global Qt version when
+ QtWebKit was built inside Qt. Fixed by moving the version
+ definition after the inclusion of qbase.pri.
+
+ * QtWebKit.pro:
+
2011-08-23 Tor Arne Vestbø <[email protected]>
[Qt] Fix build on Lion
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (93782 => 93783)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-25 14:37:21 UTC (rev 93782)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-25 14:59:11 UTC (rev 93783)
@@ -51,10 +51,6 @@
contains(DEFINES, ENABLE_WEBGL=1)|contains(CONFIG, texmap): LIBS += $$QMAKE_LIBS_OPENGL
}
-moduleFile=$$PWD/qt_webkit_version.pri
-isEmpty(QT_BUILD_TREE):include($$moduleFile)
-VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
-
include_webinspector: RESOURCES += $$SOURCE_DIR/WebCore/inspector/front-end/WebKit.qrc $$WC_GENERATED_SOURCES_DIR/InspectorBackendStub.qrc
# Extract sources to build from the generator definitions
@@ -96,6 +92,9 @@
symbian: TARGET =$$TARGET$${QT_LIBINFIX}
}
+moduleFile=$$PWD/qt_webkit_version.pri
+isEmpty(QT_BUILD_TREE):include($$moduleFile)
+VERSION = $${QT_WEBKIT_MAJOR_VERSION}.$${QT_WEBKIT_MINOR_VERSION}.$${QT_WEBKIT_PATCH_VERSION}
symbian {
TARGET.EPOCALLOWDLLDATA=1
@@ -158,7 +157,7 @@
$$SOURCE_DIR/WebCore/plugins/symbian/npinterface.h
}
-!static: DEFINES += QT_MAKEDLL
+!static: DEFINES += QT_MAKEDLL QT_SHARED
SOURCES += \
$$PWD/Api/qwebframe.cpp \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
