Title: [93785] trunk/Source/WebKit/qt
- Revision
- 93785
- Author
- [email protected]
- Date
- 2011-08-25 08:18:16 -0700 (Thu, 25 Aug 2011)
Log Message
Unreviewed, rolling out r93783.
http://trac.webkit.org/changeset/93783
https://bugs.webkit.org/show_bug.cgi?id=66943
Commited wrong stuff by accident. (Requested by ademar on
#webkit).
Patch by Sheriff Bot <[email protected]> on 2011-08-25
* Api/qwebview.cpp:
(QWebView::load):
(QWebView::setHtml):
(QWebView::setContent):
(QWebView::setUrl):
* QtWebKit.pro:
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/Api/qwebview.cpp (93784 => 93785)
--- trunk/Source/WebKit/qt/Api/qwebview.cpp 2011-08-25 15:13:39 UTC (rev 93784)
+++ trunk/Source/WebKit/qt/Api/qwebview.cpp 2011-08-25 15:18:16 UTC (rev 93785)
@@ -428,8 +428,7 @@
*/
void QWebView::load(const QUrl &url)
{
- if (url.isValid() && !url.scheme().isEmpty())
- page()->mainFrame()->load(url);
+ page()->mainFrame()->load(url);
}
/*!
@@ -474,10 +473,7 @@
*/
void QWebView::setHtml(const QString &html, const QUrl &baseUrl)
{
- if (baseUrl.isValid() && !baseUrl.scheme().isEmpty())
- page()->mainFrame()->setHtml(html, baseUrl);
- else
- page()->mainFrame()->setHtml(html, QUrl());
+ page()->mainFrame()->setHtml(html, baseUrl);
}
/*!
@@ -493,10 +489,7 @@
*/
void QWebView::setContent(const QByteArray &data, const QString &mimeType, const QUrl &baseUrl)
{
- if (baseUrl.isValid() && !baseUrl.scheme().isEmpty())
- page()->mainFrame()->setContent(data, mimeType, baseUrl);
- else
- page()->mainFrame()->setContent(data, mimeType, QUrl());
+ page()->mainFrame()->setContent(data, mimeType, baseUrl);
}
/*!
@@ -553,8 +546,7 @@
void QWebView::setUrl(const QUrl &url)
{
- if (url.isValid() && !url.scheme().isEmpty())
- page()->mainFrame()->setUrl(url);
+ page()->mainFrame()->setUrl(url);
}
QUrl QWebView::url() const
Modified: trunk/Source/WebKit/qt/ChangeLog (93784 => 93785)
--- trunk/Source/WebKit/qt/ChangeLog 2011-08-25 15:13:39 UTC (rev 93784)
+++ trunk/Source/WebKit/qt/ChangeLog 2011-08-25 15:18:16 UTC (rev 93785)
@@ -1,3 +1,19 @@
+2011-08-25 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r93783.
+ http://trac.webkit.org/changeset/93783
+ https://bugs.webkit.org/show_bug.cgi?id=66943
+
+ Commited wrong stuff by accident. (Requested by ademar on
+ #webkit).
+
+ * Api/qwebview.cpp:
+ (QWebView::load):
+ (QWebView::setHtml):
+ (QWebView::setContent):
+ (QWebView::setUrl):
+ * QtWebKit.pro:
+
2011-08-25 Ademar de Souza Reis Jr. <[email protected]>
Unreviewed QtWebKit.pro fix for when building inside Qt
Modified: trunk/Source/WebKit/qt/QtWebKit.pro (93784 => 93785)
--- trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-25 15:13:39 UTC (rev 93784)
+++ trunk/Source/WebKit/qt/QtWebKit.pro 2011-08-25 15:18:16 UTC (rev 93785)
@@ -51,6 +51,10 @@
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
@@ -92,9 +96,6 @@
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
@@ -157,7 +158,7 @@
$$SOURCE_DIR/WebCore/plugins/symbian/npinterface.h
}
-!static: DEFINES += QT_MAKEDLL QT_SHARED
+!static: DEFINES += QT_MAKEDLL
SOURCES += \
$$PWD/Api/qwebframe.cpp \
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
