Changeset 107221 in webkit


Ignore:
Timestamp:
Feb 9, 2012 4:50:46 AM (12 years ago)
Author:
Csaba Osztrogonác
Message:

[Qt] Fix compilation with newer Qt5
​https://bugs.webkit.org/show_bug.cgi?id=77653

Patch by Simon Hausmann <​simon.hausmann@nokia.com> on 2012-02-09
Reviewed by Tor Arne Vestbø.

  • Api/qgraphicswebview.cpp: Removed unnecessary inclusion of removed header file.
  • declarative/public.pri: Use quick1 instead of qtquick1. It's mandator with Qt 5.
  • tests/tests.pri: Ditto.
  • declarative/qdeclarativewebview_p.h: Fix includes, just use the module-less

version that works with all Qt versions.

  • tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Ditto.
Location:
trunk/Source/WebKit/qt
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/qt/Api/qgraphicswebview.cpp

    r97571 r107221  
    4141#include <qscrollbar.h>
    4242#include <qstyleoption.h>
    43 #include <qinputcontext.h>
    4443#include <QtCore/qmetaobject.h>
    4544#include <QtCore/qsharedpointer.h>

  • trunk/Source/WebKit/qt/ChangeLog

    r107085 r107221  
     12012-02-09  Simon Hausmann  <simon.hausmann@nokia.com>
     2
     3        [Qt] Fix compilation with newer Qt5
     4        https://bugs.webkit.org/show_bug.cgi?id=77653
     5
     6        Reviewed by Tor Arne Vestbø.
     7
     8        * Api/qgraphicswebview.cpp: Removed unnecessary inclusion of removed header file.
     9        * declarative/public.pri: Use quick1 instead of qtquick1. It's mandator with Qt 5.
     10        * tests/tests.pri: Ditto.
     11        * declarative/qdeclarativewebview_p.h: Fix includes, just use the module-less
     12        version that works with all Qt versions.
     13        * tests/qdeclarativewebview/tst_qdeclarativewebview.cpp: Ditto.
     14
    1152012-02-08  Leo Franchi  <lfranchi@kde.org>
    216

  • trunk/Source/WebKit/qt/declarative/public.pri

    r105897 r107221  
    2828
    2929QT += declarative
    30 haveQt(5): QT += widgets quick
    31 
    32 contains(QT_CONFIG, qtquick1): {
    33     QT += qtquick1
    34 }
     30haveQt(5): QT += widgets quick quick1
    3531
    3632DESTDIR = $${ROOT_BUILD_DIR}/imports/$${TARGET.module_name}

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

    r96345 r107221  
    2222#define qdeclarativewebview_p_h
    2323
     24#include <QAction>
     25#include <QDeclarativeItem>
    2426#include <QtCore/QBasicTimer>
    2527#include <QtCore/QUrl>
    26 
    27 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
    28 #include <QtQuick1/QDeclarativeItem>
    29 #include <QtWidgets/QAction>
    30 #else
    31 #include <QtDeclarative/QDeclarativeItem>
    32 #include <QtGui/QAction>
    33 #endif
    34 
    3528#include <QtNetwork/QNetworkAccessManager>
    3629#include "qgraphicswebview.h"

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

    r99235 r107221  
    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
    95#include <QDeclarativeItem>
    106#include <QDeclarativeView>
    11 #endif
    127#include <QDeclarativeComponent>
    138#include <QDeclarativeEngine>

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

    r100123 r107221  
    2323
    2424haveQt(5) {
    25     contains(QT_CONFIG, qtquick1): QT += declarative qtquick1
     25    QT += declarative quick1
    2626} else {
    2727    contains(QT_CONFIG, declarative): QT += declarative
Note: See TracChangeset for help on using the changeset viewer.