Changeset 846 for trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h

Timestamp:

May 5, 2011, 5:36:53 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h (modified) (4 diffs)

trunk/src/3rdparty/webkit/WebKit/qt/Api/qwebframe.h

@@ -27 +27 @@
 #include <QtGui/qicon.h>
 #include <QtScript/qscriptengine.h>
-#if QT_VERSION >= 0x040400
 #include <QtNetwork/qnetworkaccessmanager.h>
-#endif
 #include "qwebkitglobal.h"
 
@@ -124 +122 @@
 
     void load(const QUrl &url);
-#if QT_VERSION < 0x040400
-    void load(const QWebNetworkRequest &request);
-#else
     void load(const QNetworkRequest &request,
               QNetworkAccessManager::Operation operation = QNetworkAccessManager::GetOperation,
               const QByteArray &body = QByteArray());
-#endif
     void setHtml(const QString &html, const QUrl &baseUrl = QUrl());
     void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl());
@@ -166 +160 @@
     void setScrollPosition(const QPoint &pos);
 
+
+
     enum RenderLayer {
         ContentsLayer = 0x10,
@@ -223 +219 @@
     void loadFinished(bool ok);
 
+
+
 private:
+
     friend class QWebPage;
     friend class QWebPagePrivate;