Changeset 91845 in webkit


Ignore:
Timestamp:
Jul 27, 2011, 8:20:43 AM (14 years ago)
Author:
caio.oliveira@openbossa.org
Message:

[Qt] Fix build in Qt 5 of QDeclarativeWebView
​https://bugs.webkit.org/show_bug.cgi?id=65258

Reviewed by Andreas Kling.

In Qt 5, the QGraphicsView-based classes for QtQuick are in the
qtquick1 module, including QDeclarativeItem and QDeclarativeView.

.:

  • Source/WebKit.pro:

Source/WebKit/qt:

  • declarative/qdeclarativewebview_p.h:
  • tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
  • tests/tests.pri:
  • tests/tests.pro:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r91766 r91845  
     12011-07-27  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
     2
     3        [Qt] Fix build in Qt 5 of QDeclarativeWebView
     4        https://bugs.webkit.org/show_bug.cgi?id=65258
     5
     6        Reviewed by Andreas Kling.
     7
     8        In Qt 5, the QGraphicsView-based classes for QtQuick are in the
     9        qtquick1 module, including QDeclarativeItem and QDeclarativeView.
     10
     11        * Source/WebKit.pro:
     12
    1132011-07-26  Andras Becsi  <abecsi@webkit.org>
    214

  • trunk/Source/WebKit.pro

    r91766 r91845  
    2626}
    2727
    28 contains(QT_CONFIG, declarative) {
    29     exists($$PWD/WebKit/qt/declarative): SUBDIRS += WebKit/qt/declarative
     28exists($$PWD/WebKit/qt/declarative) {
     29    lessThan(QT_MAJOR_VERSION, 5) {
     30        contains(QT_CONFIG, declarative): SUBDIRS += WebKit/qt/declarative
     31    } else {
     32        contains(QT_CONFIG, qtquick1): SUBDIRS += WebKit/qt/declarative
     33    }
    3034}
    3135

  • trunk/Source/WebKit/qt/ChangeLog

    r91797 r91845  
     12011-07-27  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
     2
     3        [Qt] Fix build in Qt 5 of QDeclarativeWebView
     4        https://bugs.webkit.org/show_bug.cgi?id=65258
     5
     6        Reviewed by Andreas Kling.
     7
     8        In Qt 5, the QGraphicsView-based classes for QtQuick are in the
     9        qtquick1 module, including QDeclarativeItem and QDeclarativeView.
     10
     11        * declarative/qdeclarativewebview_p.h:
     12        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp:
     13        * tests/tests.pri:
     14        * tests/tests.pro:
     15
    1162011-07-26  Sadrul Habib Chowdhury  <sadrul@chromium.org>
    217

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

    r85640 r91845  
    2424#include <QtCore/QBasicTimer>
    2525#include <QtCore/QUrl>
     26
     27#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     28#include <QtQuick1/QDeclarativeItem>
     29#else
    2630#include <QtDeclarative/QDeclarativeItem>
     31#endif
     32
    2733#include <QtGui/QAction>
    2834#include <QtNetwork/QNetworkAccessManager>

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

    r89454 r91845  
    33#include <QColor>
    44#include <QDebug>
     5#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
     6#include <QtQuick1/QDeclarativeItem>
     7#include <QtQuick1/QDeclarativeView>
     8#else
     9#include <QDeclarativeItem>
     10#include <QDeclarativeView>
     11#endif
    512#include <QDeclarativeComponent>
    613#include <QDeclarativeEngine>
    7 #include <QDeclarativeItem>
    814#include <QDeclarativeProperty>
    9 #include <QDeclarativeView>
    1015#include <QDir>
    1116#include <QGraphicsWebView>

  • trunk/Source/WebKit/qt/tests/tests.pri

    r88253 r91845  
    2222include(../../../WebKit.pri)
    2323QT += testlib network
    24 contains(QT_CONFIG, declarative): QT += declarative
     24
     25lessThan(QT_MAJOR_VERSION, 5) {
     26    contains(QT_CONFIG, declarative): QT += declarative
     27} else {
     28    contains(QT_CONFIG, qtquick1): QT += declarative qtquick1
     29}
    2530
    2631QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR

  • trunk/Source/WebKit/qt/tests/tests.pro

    r86437 r91845  
    99}
    1010
    11 contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativewebview
     11lessThan(QT_MAJOR_VERSION, 5) {
     12    contains(QT_CONFIG, declarative): SUBDIRS += qdeclarativewebview
     13} else {
     14    contains(QT_CONFIG, qtquick1): SUBDIRS += qdeclarativewebview
     15}
     16
     17
    1218SUBDIRS += benchmarks/painting benchmarks/loading
    1319contains(DEFINES, ENABLE_WEBGL=1) {
Note: See TracChangeset for help on using the changeset viewer.