Changeset 84928 in webkit


Ignore:
Timestamp:
Apr 26, 2011 10:33:14 AM (13 years ago)
Author:
yi.4.shen@nokia.com
Message:

2011-04-26 Siddharth Mathur <​siddharth.mathur@nokia.com>

Reviewed by Andreas Kling.

[Qt] Build fix: QtDeclarative Webview element has a fixed white background
​https://bugs.webkit.org/show_bug.cgi?id=40918

Macro Q_REVISION and associated qdeclarativeitem.h signals are not available in 4.7.3 headers in Nokia Qt SDK.

  • declarative/plugin.cpp: Bump up required version to 4.7.4+ (WebKitQmlPlugin::registerTypes):
  • declarative/qdeclarativewebview.cpp: ditto
  • declarative/qdeclarativewebview_p.h: ditto
  • tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: ditto
Location:
trunk/Source/WebKit/qt
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/ChangeLog

    r84906 r84928  
     12011-04-26  Siddharth Mathur  <siddharth.mathur@nokia.com>
     2
     3        Reviewed by Andreas Kling.
     4
     5        [Qt] Build fix: QtDeclarative Webview element has a fixed white background
     6        https://bugs.webkit.org/show_bug.cgi?id=40918
     7
     8        Macro Q_REVISION and associated qdeclarativeitem.h signals are not available in 4.7.3 headers in Nokia Qt SDK.
     9
     10        * declarative/plugin.cpp: Bump up required version to 4.7.4+
     11        (WebKitQmlPlugin::registerTypes):
     12        * declarative/qdeclarativewebview.cpp: ditto
     13        * declarative/qdeclarativewebview_p.h: ditto
     14        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: ditto
     15
    1162011-04-26  Kristóf Kosztyó  <Kosztyo.Kristof@stud.u-szeged.hu>
    217

  • trunk/Source/WebKit/qt/declarative/plugin.cpp

    r80781 r84928  
    3333        qmlRegisterType<QDeclarativeWebSettings>();
    3434        qmlRegisterType<QDeclarativeWebView>(uri, 1, 0, "WebView");
    35 #if QT_VERSION >= 0x040703
     35#if QT_VERSION >= 0x040704
    3636        qmlRegisterType<QDeclarativeWebView>(uri, 1, 1, "WebView");
    3737        qmlRegisterRevision<QDeclarativeWebView, 0>("QtWebKit", 1, 0);

  • trunk/Source/WebKit/qt/declarative/qdeclarativewebview.cpp

    r81471 r84928  
    982982}
    983983
    984 #if QT_VERSION >= 0x040703
     984#if QT_VERSION >= 0x040704
    985985/*!
    986986    \qmlproperty color WebView::backgroundColor

  • trunk/Source/WebKit/qt/declarative/qdeclarativewebview_p.h

    r80781 r84928  
    124124    Q_PROPERTY(QSize contentsSize READ contentsSize NOTIFY contentsSizeChanged)
    125125    Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
    126 #if QT_VERSION >= 0x040703
     126#if QT_VERSION >= 0x040704
    127127    Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor NOTIFY backgroundColorChanged REVISION 1)
    128128#endif
    … …  
    197197    qreal contentsScale() const;
    198198
    199 #if QT_VERSION >= 0x040703
     199#if QT_VERSION >= 0x040704
    200200    Q_REVISION(1) QColor backgroundColor() const;
    201201    Q_REVISION(1) void setBackgroundColor(const QColor&);
    … …  
    218218    void contentsSizeChanged(const QSize&);
    219219    void contentsScaleChanged();
    220 #if QT_VERSION >= 0x040703
     220#if QT_VERSION >= 0x040704
    221221    void backgroundColorChanged();
    222222#endif

  • trunk/Source/WebKit/qt/tests/qdeclarativewebview/tst_qdeclarativewebview.cpp

    r84100 r84928  
    4242    void setHtml();
    4343    void settings();
    44 #if QT_VERSION >= 0x040703
     44#if QT_VERSION >= 0x040704
    4545    void backgroundColor();
    4646#endif
    … …  
    492492}
    493493
    494 #if QT_VERSION >= 0x040703
     494#if QT_VERSION >= 0x040704
    495495void tst_QDeclarativeWebView::backgroundColor()
    496496{
Note: See TracChangeset for help on using the changeset viewer.