diff options
| author | Alexis Menard <alexis.menard@openbossa.org> | 2011-06-28 14:22:44 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2011-06-28 16:16:47 (GMT) |
| commit | c6fabf65a06f76ca38e0d9fdc49ab61067d1a56f (patch) | |
| tree | b1dd1a25dddcaa8cc97ad4cd3fe5a30c64adf2dc /src/3rdparty/webkit | |
| parent | cc7f93d1a8b6350c5e0ad5a58cf78d17a51201fa (diff) | |
| download | Qt-c6fabf65a06f76ca38e0d9fdc49ab61067d1a56f.zip Qt-c6fabf65a06f76ca38e0d9fdc49ab61067d1a56f.tar.gz Qt-c6fabf65a06f76ca38e0d9fdc49ab61067d1a56f.tar.bz2 | |
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
We need to use the new QtQuick 1.x imports rather than the old deprecated
version.
* tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml:
* tests/qdeclarativewebview/resources/webviewtest.qml:
* tests/qdeclarativewebview/resources/webviewtestdefault.qml:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89923 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Signed-off-by: Alexis Menard <alexis.menard@nokia.com>
Diffstat (limited to 'src/3rdparty/webkit')
4 files changed, 17 insertions, 3 deletions
diff --git a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog index f4566cd..a14fe5e 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/Source/WebKit/qt/ChangeLog @@ -1,3 +1,17 @@ +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 + + We need to use the new QtQuick 1.x imports rather than the old deprecated + version. + + * tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml: + * tests/qdeclarativewebview/resources/webviewtest.qml: + * tests/qdeclarativewebview/resources/webviewtestdefault.qml: + 2011-06-27 Caio Marcelo de Oliveira Filho <caio.oliveira@openbossa.org> Reviewed by Andreas Kling. diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml index 2edc794..fb46d38 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml +++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewbackgroundcolor.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import QtWebKit 1.1 WebView { diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtest.qml b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtest.qml index ae8a42b..609d9c9 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtest.qml +++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtest.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import QtWebKit 1.0 Flickable { diff --git a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtestdefault.qml b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtestdefault.qml index 3f659f6..b26eea6 100644 --- a/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtestdefault.qml +++ b/src/3rdparty/webkit/Source/WebKit/qt/tests/qdeclarativewebview/resources/webviewtestdefault.qml @@ -1,4 +1,4 @@ -import Qt 4.7 +import QtQuick 1.0 import QtWebKit 1.0 Flickable { |