diff options
Diffstat (limited to 'Source/WebKit/qt/Api/qwebframe.h')
| -rw-r--r-- | Source/WebKit/qt/Api/qwebframe.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Source/WebKit/qt/Api/qwebframe.h b/Source/WebKit/qt/Api/qwebframe.h index 6d486d50e..ca96661e3 100644 --- a/Source/WebKit/qt/Api/qwebframe.h +++ b/Source/WebKit/qt/Api/qwebframe.h @@ -28,10 +28,6 @@ #include <QtNetwork/qnetworkaccessmanager.h> #include "qwebkitglobal.h" -#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) -#include <QtScript/qscriptengine.h> -#endif - QT_BEGIN_NAMESPACE class QRect; class QPoint; @@ -124,13 +120,11 @@ private: ~QWebFrame(); public: -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) enum ValueOwnership { QtOwnership, ScriptOwnership, AutoOwnership }; -#endif QWebPage *page() const; @@ -139,11 +133,7 @@ public: void setHtml(const QString &html, const QUrl &baseUrl = QUrl()); void setContent(const QByteArray &data, const QString &mimeType = QString(), const QUrl &baseUrl = QUrl()); -#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) void addToJavaScriptWindowObject(const QString &name, QObject *object, ValueOwnership ownership = QtOwnership); -#else - void addToJavaScriptWindowObject(const QString &name, QObject *object, QScriptEngine::ValueOwnership ownership = QScriptEngine::QtOwnership); -#endif QString toHtml() const; QString toPlainText() const; QString renderTreeDump() const; |