diff options
| -rw-r--r-- | Source/WebKit/ChangeLog | 8 | ||||
| -rw-r--r-- | Source/WebKit/WebKit.pri | 1 | ||||
| -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 | ||||
| -rw-r--r-- | Source/WebKit/qt/ChangeLog | 11 |
7 files changed, 24 insertions, 4 deletions
diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog index dba2b2546..0453a6fe4 100644 --- a/Source/WebKit/ChangeLog +++ b/Source/WebKit/ChangeLog @@ -1,3 +1,11 @@ +2012-06-04 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + [Qt] Don't use WebKit HAVE() macro in public Qt headers + + Reviewed by Kenneth Rohde Christiansen. + + * WebKit.pri: + 2012-06-01 Christophe Dumez <christophe.dumez@intel.com> [EFL] EFL's LayoutTestController needs to implement deliverWebIntent diff --git a/Source/WebKit/WebKit.pri b/Source/WebKit/WebKit.pri index 05eb09a87..3c0dbdf3d 100644 --- a/Source/WebKit/WebKit.pri +++ b/Source/WebKit/WebKit.pri @@ -18,6 +18,7 @@ SOURCES += \ HEADERS += \ $$PWD/qt/Api/qwebframe.h \ + $$PWD/qt/Api/qwebframe_p.h \ $$PWD/qt/Api/qgraphicswebview.h \ $$PWD/qt/Api/qwebkitglobal.h \ $$PWD/qt/Api/qwebkitplatformplugin.h \ 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> diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog index 417953d1f..d10e9df27 100644 --- a/Source/WebKit/qt/ChangeLog +++ b/Source/WebKit/qt/ChangeLog @@ -1,3 +1,14 @@ +2012-06-04 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + [Qt] Don't use WebKit HAVE() macro in public Qt headers + + Reviewed by Kenneth Rohde Christiansen. + + * Api/qgraphicswebview.h: + * Api/qwebframe_p.h: + * Api/qwebpage.h: + * Api/qwebview.h: + 2012-06-13 Simon Hausmann <simon.hausmann@nokia.com> [Qt] Remove dependency to QtScript for the Qt 5 build |