diff options
| author | Alexis Menard <alexis.menard@openbossa.org> | 2011-06-28 21:13:25 (GMT) |
|---|---|---|
| committer | Andreas Kling <andreas.kling@nokia.com> | 2011-06-28 21:21:58 (GMT) |
| commit | 85ba298af99c42adce62c68fcaef1055ceb228c1 (patch) | |
| tree | 5689998f57164b01d8a288bd726b944ddabe7201 /src/3rdparty | |
| parent | 9e1df56fcb31fbf9f1ed034c5d477ca0600503ad (diff) | |
| download | Qt-85ba298af99c42adce62c68fcaef1055ceb228c1.zip Qt-85ba298af99c42adce62c68fcaef1055ceb228c1.tar.gz Qt-85ba298af99c42adce62c68fcaef1055ceb228c1.tar.bz2 | |
2011-06-28 Alexis Menard <alexis.menard@openbossa.org>
Reviewed by Andreas Kling.
[Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it.
https://bugs.webkit.org/show_bug.cgi?id=63562
Some Qt auto-tests rely on <QtX/x.h> types of includes.
* Api/qwebkitplatformplugin.h:
* symbian/platformplugin/qwebkitplatformplugin.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89958 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
Diffstat (limited to 'src/3rdparty')
3 files changed, 17 insertions, 5 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitplatformplugin.h b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitplatformplugin.h index 88b3465..1f62804 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitplatformplugin.h +++ b/src/3rdparty/webkit/Source/WebKit/qt/Api/qwebkitplatformplugin.h @@ -26,11 +26,11 @@ * and may be changed from version to version or even be completely removed. */ -#include <QObject> -#include <QUrl> #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA #include <QMediaPlayer> #endif +#include <QtCore/QObject> +#include <QtCore/QUrl> #include <QtGui/QColor> class QWebSelectData { diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog index a14fe5e..9a7d0e7 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog @@ -2,6 +2,18 @@ Reviewed by Andreas Kling. + [Qt] Use <QtX/x.h> style of headers for Qt tests which rely on it. + https://bugs.webkit.org/show_bug.cgi?id=63562 + + Some Qt auto-tests rely on <QtX/x.h> types of includes. + + * Api/qwebkitplatformplugin.h: + * symbian/platformplugin/qwebkitplatformplugin.h: + +2011-06-28 Alexis Menard <alexis.menard@openbossa.org> + + Reviewed by Andreas Kling. + [Qt] Use QtQuick imports in Api tests rather than old deprecated Qt 4.x imports. https://bugs.webkit.org/show_bug.cgi?id=63533 diff --git a/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qwebkitplatformplugin.h b/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qwebkitplatformplugin.h index 4db0c10..1f62804 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qwebkitplatformplugin.h +++ b/src/3rdparty/webkit/Source/WebKit/qt/symbian/platformplugin/qwebkitplatformplugin.h @@ -26,12 +26,12 @@ * and may be changed from version to version or even be completely removed. */ -#include <QColor> -#include <QObject> -#include <QUrl> #if defined(WTF_USE_QT_MULTIMEDIA) && WTF_USE_QT_MULTIMEDIA #include <QMediaPlayer> #endif +#include <QtCore/QObject> +#include <QtCore/QUrl> +#include <QtGui/QColor> class QWebSelectData { public: |