diff options
| author | Tor Arne Vestbø <vestbo@webkit.org> | 2012-06-04 10:24:38 +0000 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-06-13 17:22:03 +0200 |
| commit | b211c645d8ab690f713515dfdc84d80b11c27d2c (patch) | |
| tree | 3d93ec6f6d8bbdf9eb0abe6c304160452b251311 /Source/WebKit/qt/Api | |
| parent | 0001dcd3a2d67fe8832562746a293754a9a8d7a0 (diff) | |
| download | qtwebkit-b211c645d8ab690f713515dfdc84d80b11c27d2c.tar.gz | |
Don't use WebKit HAVE() macro in public Qt headers
Reviewed by Kenneth Rohde Christiansen.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@119381 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Diffstat (limited to 'Source/WebKit/qt/Api')
| -rw-r--r-- | Source/WebKit/qt/Api/qgraphicswebview.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebframe_p.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebpage.h | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/Api/qwebview.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit/qt/Api/qgraphicswebview.h b/Source/WebKit/qt/Api/qgraphicswebview.h index c7ca44aad..15fe087d6 100644 --- a/Source/WebKit/qt/Api/qgraphicswebview.h +++ b/Source/WebKit/qt/Api/qgraphicswebview.h @@ -23,7 +23,7 @@ #include "qwebkitglobal.h" #include "qwebpage.h" #include <QtCore/qurl.h> -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <QtWidgets/qgraphicswidget.h> #else #include <QtGui/qgraphicswidget.h> diff --git a/Source/WebKit/qt/Api/qwebframe_p.h b/Source/WebKit/qt/Api/qwebframe_p.h index 82fd92033..f0de3ba53 100644 --- a/Source/WebKit/qt/Api/qwebframe_p.h +++ b/Source/WebKit/qt/Api/qwebframe_p.h @@ -30,7 +30,7 @@ #include "PlatformString.h" #if ENABLE(ORIENTATION_EVENTS) #include "qorientationsensor.h" -#if !(defined(HAVE_QT5) && HAVE_QT5) +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) using QTM_NAMESPACE::QOrientationSensor; #endif #endif // ENABLE(ORIENTATION_EVENTS). diff --git a/Source/WebKit/qt/Api/qwebpage.h b/Source/WebKit/qt/Api/qwebpage.h index fce68a8c4..0bf35e247 100644 --- a/Source/WebKit/qt/Api/qwebpage.h +++ b/Source/WebKit/qt/Api/qwebpage.h @@ -26,7 +26,7 @@ #include <QtCore/qobject.h> #include <QtCore/qurl.h> -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <QtWidgets/qwidget.h> #else #include <QtGui/qwidget.h> diff --git a/Source/WebKit/qt/Api/qwebview.h b/Source/WebKit/qt/Api/qwebview.h index c31aa355b..90d0a8e3b 100644 --- a/Source/WebKit/qt/Api/qwebview.h +++ b/Source/WebKit/qt/Api/qwebview.h @@ -23,7 +23,7 @@ #include "qwebkitglobal.h" #include "qwebpage.h" -#if defined(HAVE_QT5) && HAVE_QT5 +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) #include <QtWidgets/qwidget.h> #else #include <QtGui/qwidget.h> |