2011-03-10 Andreas Kling <kling@webkit.org>

        Unreviewed build fix after r80774.

        QML property versioning is introduced in Qt 4.7.3, not 4.7.2.
        See also: http://bugreports.qt.nokia.com/browse/QTBUG-13451

        * declarative/plugin.cpp:
        (WebKitQmlPlugin::registerTypes):
        * declarative/qdeclarativewebview.cpp:
        * declarative/qdeclarativewebview_p.h:
        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@80781 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit/qt/ChangeLog b/Source/WebKit/qt/ChangeLog
index 9a5daab3a3cfaf90eae885a969c658ad6c034536..d467c3857fa315c677960e3d2aa216d8a8a426fe 100644 (file)
--- a/Source/WebKit/qt/ChangeLog
+++ b/Source/WebKit/qt/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-10  Andreas Kling  <kling@webkit.org>
+
+        Unreviewed build fix after r80774.
+
+        QML property versioning is introduced in Qt 4.7.3, not 4.7.2.
+        See also: http://bugreports.qt.nokia.com/browse/QTBUG-13451
+
+        * declarative/plugin.cpp:
+        (WebKitQmlPlugin::registerTypes):
+        * declarative/qdeclarativewebview.cpp:
+        * declarative/qdeclarativewebview_p.h:
+        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
+
 2011-03-10  Alexis Menard  <alexis.menard@openbossa.org>
 
         Reviewed by Andreas Kling.

diff --git a/Source/WebKit/qt/declarative/plugin.cpp b/Source/WebKit/qt/declarative/plugin.cpp
index 38c6169308c9d893606f51bf104106922a450471..49af41520e6fc91597cff3bf1da95663c8b40518 100644 (file)
--- a/Source/WebKit/qt/declarative/plugin.cpp
+++ b/Source/WebKit/qt/declarative/plugin.cpp
@@ -32,7 +32,7 @@ public:
         Q_ASSERT(QLatin1String(uri) == QLatin1String("QtWebKit"));
         qmlRegisterType<QDeclarativeWebSettings>();
         qmlRegisterType<QDeclarativeWebView>(uri, 1, 0, "WebView");
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
         qmlRegisterType<QDeclarativeWebView>(uri, 1, 1, "WebView");
         qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0);
         qmlRegisterRevision<QDeclarativeWebView, 1>("QtWebKit", 1, 1);

diff --git a/Source/WebKit/qt/declarative/qdeclarativewebview.cpp b/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
index 11c892876aecb2dbb911a9008a22c97d94b3e02d..9104068839913ee2617c087c8e4ebf3b1d909e03 100644 (file)
--- a/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
+++ b/Source/WebKit/qt/declarative/qdeclarativewebview.cpp
@@ -983,7 +983,7 @@ void QDeclarativeWebView::setContentsScale(qreal scale)
     emit contentsScaleChanged();
 }
 
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
 /*!
     \qmlproperty color WebView::backgroundColor
     \since QtWebKit 1.1

diff --git a/Source/WebKit/qt/declarative/qdeclarativewebview_p.h b/Source/WebKit/qt/declarative/qdeclarativewebview_p.h
index d09df6b17f67ddce9aeca9044c0457e53a999397..05f35f65794c6139c9a9187c45571db6ea294ebf 100644 (file)
--- a/Source/WebKit/qt/declarative/qdeclarativewebview_p.h
+++ b/Source/WebKit/qt/declarative/qdeclarativewebview_p.h
@@ -123,7 +123,7 @@ class QDeclarativeWebView : public QDeclarativeItem {
 
     Q_PROPERTY(QSize contentsSize READ contentsSize NOTIFY contentsSizeChanged)
     Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
     Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 1)
 #endif
 
@@ -196,7 +196,7 @@ public:
     void setContentsScale(qreal scale);
     qreal contentsScale() const;
 
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
     Q_REVISION(1) QColor backgroundColor() const;
     Q_REVISION(1) void setBackgroundColor(const QColor&);
 #endif
@@ -217,7 +217,7 @@ Q_SIGNALS:
     void renderingEnabledChanged();
     void contentsSizeChanged(const QSize&);
     void contentsScaleChanged();
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
     void backgroundColorChanged();
 #endif
 

diff --git a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
index 7e8d4bd1a7c84180f4a6c8c98a9f199da2ccaadf..8fcab71d4407c8afe426572be1d82c0f653e2daa 100644 (file)
--- a/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
+++ b/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp
@@ -23,7 +23,7 @@ private slots:
     void preferredHeightTest();
     void preferredWidthDefaultTest();
     void preferredHeightDefaultTest();
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
     void backgroundColor();
 #endif
 
@@ -86,7 +86,7 @@ void tst_QDeclarativeWebView::preferredHeightDefaultTest()
     QCOMPARE(wv->property("prefHeight").toDouble(), view.preferredHeight());
 }
 
-#if QT_VERSION >= 0x040702
+#if QT_VERSION >= 0x040703
 void tst_QDeclarativeWebView::backgroundColor()
 {
     // We test here the rendering of the background.