Changeset 116646 in webkit


Ignore:
Timestamp:
May 10, 2012 8:12:36 AM (12 years ago)
Author:
kent.hansen@nokia.com
Message:

[Qt] Rename QDeclarative* to QQml*
https://bugs.webkit.org/show_bug.cgi?id=86089

Reviewed by Simon Hausmann.

The QtDeclarative module was deprecated in favor of QtQml.

  • Target.pri:
  • UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewPrivate::_q_onReceivedResponseFromDownload):
(QQuickWebViewExperimental::alertDialog):
(QQuickWebViewExperimental::setAlertDialog):
(QQuickWebViewExperimental::confirmDialog):
(QQuickWebViewExperimental::setConfirmDialog):
(QQuickWebViewExperimental::promptDialog):
(QQuickWebViewExperimental::setPromptDialog):
(QQuickWebViewExperimental::authenticationDialog):
(QQuickWebViewExperimental::setAuthenticationDialog):
(QQuickWebViewExperimental::proxyAuthenticationDialog):
(QQuickWebViewExperimental::setProxyAuthenticationDialog):
(QQuickWebViewExperimental::certificateVerificationDialog):
(QQuickWebViewExperimental::setCertificateVerificationDialog):
(QQuickWebViewExperimental::itemSelector):
(QQuickWebViewExperimental::setItemSelector):
(QQuickWebViewExperimental::filePicker):
(QQuickWebViewExperimental::setFilePicker):
(QQuickWebViewExperimental::databaseQuotaDialog):
(QQuickWebViewExperimental::setDatabaseQuotaDialog):
(QQuickWebViewExperimental::schemeDelegates_At):
(QQuickWebViewExperimental::schemeDelegates_Append):
(QQuickWebViewExperimental::schemeDelegates_Count):
(QQuickWebViewExperimental::schemeDelegates_Clear):
(QQuickWebViewExperimental::schemeDelegates):

  • UIProcess/API/qt/qquickwebview_p.h:
  • UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate):

  • UIProcess/API/qt/qwebiconimageprovider.cpp:

(QWebIconImageProvider::QWebIconImageProvider):

  • UIProcess/API/qt/qwebiconimageprovider_p.h:
  • UIProcess/API/qt/qwebviewportinfo_p.h:
  • UIProcess/API/qt/tests/tests.pri:
  • UIProcess/qt/QtDialogRunner.h:

(QtDialogRunner):

  • UIProcess/qt/WebPopupMenuProxyQt.h:

(WebPopupMenuProxyQt):

Location:
trunk/Source/WebKit2
Files:
11 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r116634 r116646  
     12012-05-10  Kent Hansen  <kent.hansen@nokia.com>
     2
     3        [Qt] Rename QDeclarative* to QQml*
     4        https://bugs.webkit.org/show_bug.cgi?id=86089
     5
     6        Reviewed by Simon Hausmann.
     7
     8        The QtDeclarative module was deprecated in favor of QtQml.
     9
     10        * Target.pri:
     11        * UIProcess/API/qt/qquickwebview.cpp:
     12        (QQuickWebViewPrivate::_q_onReceivedResponseFromDownload):
     13        (QQuickWebViewExperimental::alertDialog):
     14        (QQuickWebViewExperimental::setAlertDialog):
     15        (QQuickWebViewExperimental::confirmDialog):
     16        (QQuickWebViewExperimental::setConfirmDialog):
     17        (QQuickWebViewExperimental::promptDialog):
     18        (QQuickWebViewExperimental::setPromptDialog):
     19        (QQuickWebViewExperimental::authenticationDialog):
     20        (QQuickWebViewExperimental::setAuthenticationDialog):
     21        (QQuickWebViewExperimental::proxyAuthenticationDialog):
     22        (QQuickWebViewExperimental::setProxyAuthenticationDialog):
     23        (QQuickWebViewExperimental::certificateVerificationDialog):
     24        (QQuickWebViewExperimental::setCertificateVerificationDialog):
     25        (QQuickWebViewExperimental::itemSelector):
     26        (QQuickWebViewExperimental::setItemSelector):
     27        (QQuickWebViewExperimental::filePicker):
     28        (QQuickWebViewExperimental::setFilePicker):
     29        (QQuickWebViewExperimental::databaseQuotaDialog):
     30        (QQuickWebViewExperimental::setDatabaseQuotaDialog):
     31        (QQuickWebViewExperimental::schemeDelegates_At):
     32        (QQuickWebViewExperimental::schemeDelegates_Append):
     33        (QQuickWebViewExperimental::schemeDelegates_Count):
     34        (QQuickWebViewExperimental::schemeDelegates_Clear):
     35        (QQuickWebViewExperimental::schemeDelegates):
     36        * UIProcess/API/qt/qquickwebview_p.h:
     37        * UIProcess/API/qt/qquickwebview_p_p.h:
     38        (QQuickWebViewPrivate):
     39        * UIProcess/API/qt/qwebiconimageprovider.cpp:
     40        (QWebIconImageProvider::QWebIconImageProvider):
     41        * UIProcess/API/qt/qwebiconimageprovider_p.h:
     42        * UIProcess/API/qt/qwebviewportinfo_p.h:
     43        * UIProcess/API/qt/tests/tests.pri:
     44        * UIProcess/qt/QtDialogRunner.h:
     45        (QtDialogRunner):
     46        * UIProcess/qt/WebPopupMenuProxyQt.h:
     47        (WebPopupMenuProxyQt):
     48
    1492012-05-10  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    250
  • trunk/Source/WebKit2/Target.pri

    r115083 r116646  
    1313
    1414WEBKIT += wtf javascriptcore webcore
    15 QT += declarative quick quick-private
     15QT += qml quick quick-private
    1616
    1717CONFIG += staticlib
  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

    r116632 r116646  
    490490
    491491    Q_Q(QQuickWebView);
    492     QDeclarativeEngine::setObjectOwnership(downloadItem, QDeclarativeEngine::JavaScriptOwnership);
     492    QQmlEngine::setObjectOwnership(downloadItem, QQmlEngine::JavaScriptOwnership);
    493493    emit q->experimental()->downloadRequested(downloadItem);
    494494}
     
    11001100}
    11011101
    1102 QDeclarativeComponent* QQuickWebViewExperimental::alertDialog() const
     1102QQmlComponent* QQuickWebViewExperimental::alertDialog() const
    11031103{
    11041104    Q_D(const QQuickWebView);
     
    11061106}
    11071107
    1108 void QQuickWebViewExperimental::setAlertDialog(QDeclarativeComponent* alertDialog)
     1108void QQuickWebViewExperimental::setAlertDialog(QQmlComponent* alertDialog)
    11091109{
    11101110    Q_D(QQuickWebView);
     
    11151115}
    11161116
    1117 QDeclarativeComponent* QQuickWebViewExperimental::confirmDialog() const
     1117QQmlComponent* QQuickWebViewExperimental::confirmDialog() const
    11181118{
    11191119    Q_D(const QQuickWebView);
     
    11211121}
    11221122
    1123 void QQuickWebViewExperimental::setConfirmDialog(QDeclarativeComponent* confirmDialog)
     1123void QQuickWebViewExperimental::setConfirmDialog(QQmlComponent* confirmDialog)
    11241124{
    11251125    Q_D(QQuickWebView);
     
    11351135}
    11361136
    1137 QDeclarativeComponent* QQuickWebViewExperimental::promptDialog() const
     1137QQmlComponent* QQuickWebViewExperimental::promptDialog() const
    11381138{
    11391139    Q_D(const QQuickWebView);
     
    11491149}
    11501150
    1151 void QQuickWebViewExperimental::setPromptDialog(QDeclarativeComponent* promptDialog)
     1151void QQuickWebViewExperimental::setPromptDialog(QQmlComponent* promptDialog)
    11521152{
    11531153    Q_D(QQuickWebView);
     
    11581158}
    11591159
    1160 QDeclarativeComponent* QQuickWebViewExperimental::authenticationDialog() const
     1160QQmlComponent* QQuickWebViewExperimental::authenticationDialog() const
    11611161{
    11621162    Q_D(const QQuickWebView);
     
    11641164}
    11651165
    1166 void QQuickWebViewExperimental::setAuthenticationDialog(QDeclarativeComponent* authenticationDialog)
     1166void QQuickWebViewExperimental::setAuthenticationDialog(QQmlComponent* authenticationDialog)
    11671167{
    11681168    Q_D(QQuickWebView);
     
    11731173}
    11741174
    1175 QDeclarativeComponent* QQuickWebViewExperimental::proxyAuthenticationDialog() const
     1175QQmlComponent* QQuickWebViewExperimental::proxyAuthenticationDialog() const
    11761176{
    11771177    Q_D(const QQuickWebView);
     
    11791179}
    11801180
    1181 void QQuickWebViewExperimental::setProxyAuthenticationDialog(QDeclarativeComponent* proxyAuthenticationDialog)
     1181void QQuickWebViewExperimental::setProxyAuthenticationDialog(QQmlComponent* proxyAuthenticationDialog)
    11821182{
    11831183    Q_D(QQuickWebView);
     
    11871187    emit proxyAuthenticationDialogChanged();
    11881188}
    1189 QDeclarativeComponent* QQuickWebViewExperimental::certificateVerificationDialog() const
     1189QQmlComponent* QQuickWebViewExperimental::certificateVerificationDialog() const
    11901190{
    11911191    Q_D(const QQuickWebView);
     
    11931193}
    11941194
    1195 void QQuickWebViewExperimental::setCertificateVerificationDialog(QDeclarativeComponent* certificateVerificationDialog)
     1195void QQuickWebViewExperimental::setCertificateVerificationDialog(QQmlComponent* certificateVerificationDialog)
    11961196{
    11971197    Q_D(QQuickWebView);
     
    12021202}
    12031203
    1204 QDeclarativeComponent* QQuickWebViewExperimental::itemSelector() const
     1204QQmlComponent* QQuickWebViewExperimental::itemSelector() const
    12051205{
    12061206    Q_D(const QQuickWebView);
     
    12081208}
    12091209
    1210 void QQuickWebViewExperimental::setItemSelector(QDeclarativeComponent* itemSelector)
     1210void QQuickWebViewExperimental::setItemSelector(QQmlComponent* itemSelector)
    12111211{
    12121212    Q_D(QQuickWebView);
     
    12171217}
    12181218
    1219 QDeclarativeComponent* QQuickWebViewExperimental::filePicker() const
     1219QQmlComponent* QQuickWebViewExperimental::filePicker() const
    12201220{
    12211221    Q_D(const QQuickWebView);
     
    12231223}
    12241224
    1225 void QQuickWebViewExperimental::setFilePicker(QDeclarativeComponent* filePicker)
     1225void QQuickWebViewExperimental::setFilePicker(QQmlComponent* filePicker)
    12261226{
    12271227    Q_D(QQuickWebView);
     
    12321232}
    12331233
    1234 QDeclarativeComponent* QQuickWebViewExperimental::databaseQuotaDialog() const
     1234QQmlComponent* QQuickWebViewExperimental::databaseQuotaDialog() const
    12351235{
    12361236    Q_D(const QQuickWebView);
     
    12381238}
    12391239
    1240 void QQuickWebViewExperimental::setDatabaseQuotaDialog(QDeclarativeComponent* databaseQuotaDialog)
     1240void QQuickWebViewExperimental::setDatabaseQuotaDialog(QQmlComponent* databaseQuotaDialog)
    12411241{
    12421242    Q_D(QQuickWebView);
     
    13341334}
    13351335
    1336 QQuickUrlSchemeDelegate* QQuickWebViewExperimental::schemeDelegates_At(QDeclarativeListProperty<QQuickUrlSchemeDelegate>* property, int index)
     1336QQuickUrlSchemeDelegate* QQuickWebViewExperimental::schemeDelegates_At(QQmlListProperty<QQuickUrlSchemeDelegate>* property, int index)
    13371337{
    13381338    const QObjectList children = property->object->children();
     
    13421342}
    13431343
    1344 void QQuickWebViewExperimental::schemeDelegates_Append(QDeclarativeListProperty<QQuickUrlSchemeDelegate>* property, QQuickUrlSchemeDelegate *scheme)
     1344void QQuickWebViewExperimental::schemeDelegates_Append(QQmlListProperty<QQuickUrlSchemeDelegate>* property, QQuickUrlSchemeDelegate *scheme)
    13451345{
    13461346    QObject* schemeParent = property->object;
     
    13541354}
    13551355
    1356 int QQuickWebViewExperimental::schemeDelegates_Count(QDeclarativeListProperty<QQuickUrlSchemeDelegate>* property)
     1356int QQuickWebViewExperimental::schemeDelegates_Count(QQmlListProperty<QQuickUrlSchemeDelegate>* property)
    13571357{
    13581358    return property->object->children().count();
    13591359}
    13601360
    1361 void QQuickWebViewExperimental::schemeDelegates_Clear(QDeclarativeListProperty<QQuickUrlSchemeDelegate>* property)
     1361void QQuickWebViewExperimental::schemeDelegates_Clear(QQmlListProperty<QQuickUrlSchemeDelegate>* property)
    13621362{
    13631363    const QObjectList children = property->object->children();
     
    13691369}
    13701370
    1371 QDeclarativeListProperty<QQuickUrlSchemeDelegate> QQuickWebViewExperimental::schemeDelegates()
    1372 {
    1373     return QDeclarativeListProperty<QQuickUrlSchemeDelegate>(schemeParent, 0,
     1371QQmlListProperty<QQuickUrlSchemeDelegate> QQuickWebViewExperimental::schemeDelegates()
     1372{
     1373    return QQmlListProperty<QQuickUrlSchemeDelegate>(schemeParent, 0,
    13741374            QQuickWebViewExperimental::schemeDelegates_Append,
    13751375            QQuickWebViewExperimental::schemeDelegates_Count,
  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

    r116420 r116646  
    2929
    3030class QWebNavigationRequest;
    31 class QDeclarativeComponent;
     31class QQmlComponent;
    3232class QQuickWebPage;
    3333class QQuickWebViewAttached;
     
    7171
    7272// Instantiating the WebView in C++ is only possible by creating
    73 // a QDeclarativeComponent as the initialization depends on the
     73// a QQmlComponent as the initialization depends on the
    7474// componentComplete method being called.
    7575class QWEBKIT_EXPORT QQuickWebView : public QQuickFlickable {
     
    254254
    255255    Q_PROPERTY(QWebNavigationHistory* navigationHistory READ navigationHistory CONSTANT FINAL)
    256     Q_PROPERTY(QDeclarativeComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
    257     Q_PROPERTY(QDeclarativeComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)
    258     Q_PROPERTY(QDeclarativeComponent* promptDialog READ promptDialog WRITE setPromptDialog NOTIFY promptDialogChanged)
    259     Q_PROPERTY(QDeclarativeComponent* authenticationDialog READ authenticationDialog WRITE setAuthenticationDialog NOTIFY authenticationDialogChanged)
    260     Q_PROPERTY(QDeclarativeComponent* proxyAuthenticationDialog READ proxyAuthenticationDialog WRITE setProxyAuthenticationDialog NOTIFY proxyAuthenticationDialogChanged)
    261     Q_PROPERTY(QDeclarativeComponent* certificateVerificationDialog READ certificateVerificationDialog WRITE setCertificateVerificationDialog NOTIFY certificateVerificationDialogChanged)
    262     Q_PROPERTY(QDeclarativeComponent* itemSelector READ itemSelector WRITE setItemSelector NOTIFY itemSelectorChanged)
    263     Q_PROPERTY(QDeclarativeComponent* filePicker READ filePicker WRITE setFilePicker NOTIFY filePickerChanged)
    264     Q_PROPERTY(QDeclarativeComponent* databaseQuotaDialog READ databaseQuotaDialog WRITE setDatabaseQuotaDialog NOTIFY databaseQuotaDialogChanged)
     256    Q_PROPERTY(QQmlComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)
     257    Q_PROPERTY(QQmlComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)
     258    Q_PROPERTY(QQmlComponent* promptDialog READ promptDialog WRITE setPromptDialog NOTIFY promptDialogChanged)
     259    Q_PROPERTY(QQmlComponent* authenticationDialog READ authenticationDialog WRITE setAuthenticationDialog NOTIFY authenticationDialogChanged)
     260    Q_PROPERTY(QQmlComponent* proxyAuthenticationDialog READ proxyAuthenticationDialog WRITE setProxyAuthenticationDialog NOTIFY proxyAuthenticationDialogChanged)
     261    Q_PROPERTY(QQmlComponent* certificateVerificationDialog READ certificateVerificationDialog WRITE setCertificateVerificationDialog NOTIFY certificateVerificationDialogChanged)
     262    Q_PROPERTY(QQmlComponent* itemSelector READ itemSelector WRITE setItemSelector NOTIFY itemSelectorChanged)
     263    Q_PROPERTY(QQmlComponent* filePicker READ filePicker WRITE setFilePicker NOTIFY filePickerChanged)
     264    Q_PROPERTY(QQmlComponent* databaseQuotaDialog READ databaseQuotaDialog WRITE setDatabaseQuotaDialog NOTIFY databaseQuotaDialogChanged)
    265265    Q_PROPERTY(QWebPreferences* preferences READ preferences CONSTANT FINAL)
    266266    Q_PROPERTY(QWebViewportInfo* viewportInfo READ viewportInfo CONSTANT FINAL)
    267     Q_PROPERTY(QDeclarativeListProperty<QQuickUrlSchemeDelegate> urlSchemeDelegates READ schemeDelegates)
     267    Q_PROPERTY(QQmlListProperty<QQuickUrlSchemeDelegate> urlSchemeDelegates READ schemeDelegates)
    268268    Q_PROPERTY(QString userAgent READ userAgent WRITE setUserAgent NOTIFY userAgentChanged)
    269269    Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged)
     
    278278    virtual ~QQuickWebViewExperimental();
    279279
    280     QDeclarativeComponent* alertDialog() const;
    281     void setAlertDialog(QDeclarativeComponent*);
    282     QDeclarativeComponent* confirmDialog() const;
    283     void setConfirmDialog(QDeclarativeComponent*);
    284     QDeclarativeComponent* promptDialog() const;
    285     void setPromptDialog(QDeclarativeComponent*);
    286     QDeclarativeComponent* authenticationDialog() const;
    287     void setAuthenticationDialog(QDeclarativeComponent*);
    288     QDeclarativeComponent* certificateVerificationDialog() const;
    289     void setCertificateVerificationDialog(QDeclarativeComponent*);
    290     QDeclarativeComponent* itemSelector() const;
    291     void setItemSelector(QDeclarativeComponent*);
    292     QDeclarativeComponent* proxyAuthenticationDialog() const;
    293     void setProxyAuthenticationDialog(QDeclarativeComponent*);
    294     QDeclarativeComponent* filePicker() const;
    295     void setFilePicker(QDeclarativeComponent*);
    296     QDeclarativeComponent* databaseQuotaDialog() const;
    297     void setDatabaseQuotaDialog(QDeclarativeComponent*);
     280    QQmlComponent* alertDialog() const;
     281    void setAlertDialog(QQmlComponent*);
     282    QQmlComponent* confirmDialog() const;
     283    void setConfirmDialog(QQmlComponent*);
     284    QQmlComponent* promptDialog() const;
     285    void setPromptDialog(QQmlComponent*);
     286    QQmlComponent* authenticationDialog() const;
     287    void setAuthenticationDialog(QQmlComponent*);
     288    QQmlComponent* certificateVerificationDialog() const;
     289    void setCertificateVerificationDialog(QQmlComponent*);
     290    QQmlComponent* itemSelector() const;
     291    void setItemSelector(QQmlComponent*);
     292    QQmlComponent* proxyAuthenticationDialog() const;
     293    void setProxyAuthenticationDialog(QQmlComponent*);
     294    QQmlComponent* filePicker() const;
     295    void setFilePicker(QQmlComponent*);
     296    QQmlComponent* databaseQuotaDialog() const;
     297    void setDatabaseQuotaDialog(QQmlComponent*);
    298298    QString userAgent() const;
    299299    void setUserAgent(const QString& userAgent);
     
    307307    QQuickWebPage* page();
    308308
    309     static QQuickUrlSchemeDelegate* schemeDelegates_At(QDeclarativeListProperty<QQuickUrlSchemeDelegate>*, int index);
    310     static void schemeDelegates_Append(QDeclarativeListProperty<QQuickUrlSchemeDelegate>*, QQuickUrlSchemeDelegate*);
    311     static int schemeDelegates_Count(QDeclarativeListProperty<QQuickUrlSchemeDelegate>*);
    312     static void schemeDelegates_Clear(QDeclarativeListProperty<QQuickUrlSchemeDelegate>*);
    313     QDeclarativeListProperty<QQuickUrlSchemeDelegate> schemeDelegates();
     309    static QQuickUrlSchemeDelegate* schemeDelegates_At(QQmlListProperty<QQuickUrlSchemeDelegate>*, int index);
     310    static void schemeDelegates_Append(QQmlListProperty<QQuickUrlSchemeDelegate>*, QQuickUrlSchemeDelegate*);
     311    static int schemeDelegates_Count(QQmlListProperty<QQuickUrlSchemeDelegate>*);
     312    static void schemeDelegates_Clear(QQmlListProperty<QQuickUrlSchemeDelegate>*);
     313    QQmlListProperty<QQuickUrlSchemeDelegate> schemeDelegates();
    314314    void invokeApplicationSchemeHandler(WTF::PassRefPtr<WebKit::QtRefCountedNetworkRequestData>);
    315315    void sendApplicationSchemeReply(QQuickNetworkReply*);
  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h

    r116516 r116646  
    5252
    5353QT_BEGIN_NAMESPACE
    54 class QDeclarativeComponent;
     54class QQmlComponent;
    5555QT_END_NAMESPACE
    5656
     
    184184    FlickableAxisLocker axisLocker;
    185185
    186     QDeclarativeComponent* alertDialog;
    187     QDeclarativeComponent* confirmDialog;
    188     QDeclarativeComponent* promptDialog;
    189     QDeclarativeComponent* authenticationDialog;
    190     QDeclarativeComponent* certificateVerificationDialog;
    191     QDeclarativeComponent* itemSelector;
    192     QDeclarativeComponent* proxyAuthenticationDialog;
    193     QDeclarativeComponent* filePicker;
    194     QDeclarativeComponent* databaseQuotaDialog;
     186    QQmlComponent* alertDialog;
     187    QQmlComponent* confirmDialog;
     188    QQmlComponent* promptDialog;
     189    QQmlComponent* authenticationDialog;
     190    QQmlComponent* certificateVerificationDialog;
     191    QQmlComponent* itemSelector;
     192    QQmlComponent* proxyAuthenticationDialog;
     193    QQmlComponent* filePicker;
     194    QQmlComponent* databaseQuotaDialog;
    195195
    196196    WebCore::ViewportAttributes attributes;
  • trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider.cpp

    r103413 r116646  
    3030
    3131QWebIconImageProvider::QWebIconImageProvider()
    32     : QDeclarativeImageProvider(QDeclarativeImageProvider::Image)
     32    : QQuickImageProvider(QQuickImageProvider::Image)
    3333{
    3434}
  • trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h

    r116100 r116646  
    2424#include <QtQuick/QQuickImageProvider>
    2525
    26 class QWEBKIT_EXPORT QWebIconImageProvider : public QDeclarativeImageProvider {
     26class QWEBKIT_EXPORT QWebIconImageProvider : public QQuickImageProvider {
    2727public:
    2828    QWebIconImageProvider();
  • trunk/Source/WebKit2/UIProcess/API/qt/qwebviewportinfo_p.h

    r109608 r116646  
    2828#include <QtCore/QSize>
    2929#include <QtCore/QVariant>
    30 #include <QtDeclarative/QtDeclarative>
     30#include <QtQml/QtQml>
    3131
    3232class QQuickWebViewPrivate;
  • trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri

    r113861 r116646  
    1111INCLUDEPATH += $$PWD
    1212
    13 QT += testlib declarative quick quick-private webkit
     13QT += testlib qml quick quick-private webkit
    1414
    1515DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\" \
  • trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.h

    r114897 r116646  
    2828
    2929QT_BEGIN_NAMESPACE
    30 class QDeclarativeComponent;
    31 class QDeclarativeContext;
     30class QQmlComponent;
     31class QQmlContext;
    3232class QQuickItem;
    3333QT_END_NAMESPACE
     
    4242    virtual ~QtDialogRunner();
    4343
    44     bool initForAlert(QDeclarativeComponent*, QQuickItem* dialogParent, const QString& message);
    45     bool initForConfirm(QDeclarativeComponent*, QQuickItem* dialogParent, const QString& message);
    46     bool initForPrompt(QDeclarativeComponent*, QQuickItem* dialogParent, const QString& message, const QString& defaultValue);
    47     bool initForAuthentication(QDeclarativeComponent*, QQuickItem* dialogParent, const QString& hostname, const QString& realm, const QString& prefilledUsername);
    48     bool initForCertificateVerification(QDeclarativeComponent*, QQuickItem*, const QString& hostname);
    49     bool initForProxyAuthentication(QDeclarativeComponent*, QQuickItem*, const QString& hostname, uint16_t port, const QString& prefilledUsername);
    50     bool initForFilePicker(QDeclarativeComponent*, QQuickItem*, const QStringList& selectedFiles, bool allowMultiple);
    51     bool initForDatabaseQuotaDialog(QDeclarativeComponent*, QQuickItem*, const QString& databaseName, const QString& displayName, WKSecurityOriginRef, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage);
     44    bool initForAlert(QQmlComponent*, QQuickItem* dialogParent, const QString& message);
     45    bool initForConfirm(QQmlComponent*, QQuickItem* dialogParent, const QString& message);
     46    bool initForPrompt(QQmlComponent*, QQuickItem* dialogParent, const QString& message, const QString& defaultValue);
     47    bool initForAuthentication(QQmlComponent*, QQuickItem* dialogParent, const QString& hostname, const QString& realm, const QString& prefilledUsername);
     48    bool initForCertificateVerification(QQmlComponent*, QQuickItem*, const QString& hostname);
     49    bool initForProxyAuthentication(QQmlComponent*, QQuickItem*, const QString& hostname, uint16_t port, const QString& prefilledUsername);
     50    bool initForFilePicker(QQmlComponent*, QQuickItem*, const QStringList& selectedFiles, bool allowMultiple);
     51    bool initForDatabaseQuotaDialog(QQmlComponent*, QQuickItem*, const QString& databaseName, const QString& displayName, WKSecurityOriginRef, quint64 currentQuota, quint64 currentOriginUsage, quint64 currentDatabaseUsage, quint64 expectedUsage);
    5252
    5353    QQuickItem* dialog() const { return m_dialog.get(); }
     
    8989
    9090private:
    91     bool createDialog(QDeclarativeComponent*, QQuickItem* dialogParent, QObject* contextObject);
     91    bool createDialog(QQmlComponent*, QQuickItem* dialogParent, QObject* contextObject);
    9292
    93     OwnPtr<QDeclarativeContext> m_dialogContext;
     93    OwnPtr<QQmlContext> m_dialogContext;
    9494    OwnPtr<QQuickItem> m_dialog;
    9595    QString m_result;
  • trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h

    r114897 r116646  
    3232#include <wtf/OwnPtr.h>
    3333
    34 class QDeclarativeComponent;
    35 class QDeclarativeContext;
     34class QQmlComponent;
     35class QQmlContext;
    3636class QQuickWebView;
    3737class QQuickItem;
     
    6060    WebPopupMenuProxyQt(WebPopupMenuProxy::Client*, QQuickWebView*);
    6161    void createItem(QObject*);
    62     void createContext(QDeclarativeComponent*, QObject*);
     62    void createContext(QQmlComponent*, QObject*);
    6363
    6464    void notifyValueChanged();
    6565
    66     OwnPtr<QDeclarativeContext> m_context;
     66    OwnPtr<QQmlContext> m_context;
    6767    OwnPtr<QQuickItem> m_itemSelector;
    6868
Note: See TracChangeset for help on using the changeset viewer.