Changeset 116646 in webkit
- Timestamp:
- May 10, 2012 8:12:36 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 11 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r116634 r116646 1 2012-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 1 49 2012-05-10 Jocelyn Turcotte <jocelyn.turcotte@nokia.com> 2 50 -
trunk/Source/WebKit2/Target.pri
r115083 r116646 13 13 14 14 WEBKIT += wtf javascriptcore webcore 15 QT += declarativequick quick-private15 QT += qml quick quick-private 16 16 17 17 CONFIG += staticlib -
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp
r116632 r116646 490 490 491 491 Q_Q(QQuickWebView); 492 Q DeclarativeEngine::setObjectOwnership(downloadItem, QDeclarativeEngine::JavaScriptOwnership);492 QQmlEngine::setObjectOwnership(downloadItem, QQmlEngine::JavaScriptOwnership); 493 493 emit q->experimental()->downloadRequested(downloadItem); 494 494 } … … 1100 1100 } 1101 1101 1102 Q DeclarativeComponent* QQuickWebViewExperimental::alertDialog() const1102 QQmlComponent* QQuickWebViewExperimental::alertDialog() const 1103 1103 { 1104 1104 Q_D(const QQuickWebView); … … 1106 1106 } 1107 1107 1108 void QQuickWebViewExperimental::setAlertDialog(Q DeclarativeComponent* alertDialog)1108 void QQuickWebViewExperimental::setAlertDialog(QQmlComponent* alertDialog) 1109 1109 { 1110 1110 Q_D(QQuickWebView); … … 1115 1115 } 1116 1116 1117 Q DeclarativeComponent* QQuickWebViewExperimental::confirmDialog() const1117 QQmlComponent* QQuickWebViewExperimental::confirmDialog() const 1118 1118 { 1119 1119 Q_D(const QQuickWebView); … … 1121 1121 } 1122 1122 1123 void QQuickWebViewExperimental::setConfirmDialog(Q DeclarativeComponent* confirmDialog)1123 void QQuickWebViewExperimental::setConfirmDialog(QQmlComponent* confirmDialog) 1124 1124 { 1125 1125 Q_D(QQuickWebView); … … 1135 1135 } 1136 1136 1137 Q DeclarativeComponent* QQuickWebViewExperimental::promptDialog() const1137 QQmlComponent* QQuickWebViewExperimental::promptDialog() const 1138 1138 { 1139 1139 Q_D(const QQuickWebView); … … 1149 1149 } 1150 1150 1151 void QQuickWebViewExperimental::setPromptDialog(Q DeclarativeComponent* promptDialog)1151 void QQuickWebViewExperimental::setPromptDialog(QQmlComponent* promptDialog) 1152 1152 { 1153 1153 Q_D(QQuickWebView); … … 1158 1158 } 1159 1159 1160 Q DeclarativeComponent* QQuickWebViewExperimental::authenticationDialog() const1160 QQmlComponent* QQuickWebViewExperimental::authenticationDialog() const 1161 1161 { 1162 1162 Q_D(const QQuickWebView); … … 1164 1164 } 1165 1165 1166 void QQuickWebViewExperimental::setAuthenticationDialog(Q DeclarativeComponent* authenticationDialog)1166 void QQuickWebViewExperimental::setAuthenticationDialog(QQmlComponent* authenticationDialog) 1167 1167 { 1168 1168 Q_D(QQuickWebView); … … 1173 1173 } 1174 1174 1175 Q DeclarativeComponent* QQuickWebViewExperimental::proxyAuthenticationDialog() const1175 QQmlComponent* QQuickWebViewExperimental::proxyAuthenticationDialog() const 1176 1176 { 1177 1177 Q_D(const QQuickWebView); … … 1179 1179 } 1180 1180 1181 void QQuickWebViewExperimental::setProxyAuthenticationDialog(Q DeclarativeComponent* proxyAuthenticationDialog)1181 void QQuickWebViewExperimental::setProxyAuthenticationDialog(QQmlComponent* proxyAuthenticationDialog) 1182 1182 { 1183 1183 Q_D(QQuickWebView); … … 1187 1187 emit proxyAuthenticationDialogChanged(); 1188 1188 } 1189 Q DeclarativeComponent* QQuickWebViewExperimental::certificateVerificationDialog() const1189 QQmlComponent* QQuickWebViewExperimental::certificateVerificationDialog() const 1190 1190 { 1191 1191 Q_D(const QQuickWebView); … … 1193 1193 } 1194 1194 1195 void QQuickWebViewExperimental::setCertificateVerificationDialog(Q DeclarativeComponent* certificateVerificationDialog)1195 void QQuickWebViewExperimental::setCertificateVerificationDialog(QQmlComponent* certificateVerificationDialog) 1196 1196 { 1197 1197 Q_D(QQuickWebView); … … 1202 1202 } 1203 1203 1204 Q DeclarativeComponent* QQuickWebViewExperimental::itemSelector() const1204 QQmlComponent* QQuickWebViewExperimental::itemSelector() const 1205 1205 { 1206 1206 Q_D(const QQuickWebView); … … 1208 1208 } 1209 1209 1210 void QQuickWebViewExperimental::setItemSelector(Q DeclarativeComponent* itemSelector)1210 void QQuickWebViewExperimental::setItemSelector(QQmlComponent* itemSelector) 1211 1211 { 1212 1212 Q_D(QQuickWebView); … … 1217 1217 } 1218 1218 1219 Q DeclarativeComponent* QQuickWebViewExperimental::filePicker() const1219 QQmlComponent* QQuickWebViewExperimental::filePicker() const 1220 1220 { 1221 1221 Q_D(const QQuickWebView); … … 1223 1223 } 1224 1224 1225 void QQuickWebViewExperimental::setFilePicker(Q DeclarativeComponent* filePicker)1225 void QQuickWebViewExperimental::setFilePicker(QQmlComponent* filePicker) 1226 1226 { 1227 1227 Q_D(QQuickWebView); … … 1232 1232 } 1233 1233 1234 Q DeclarativeComponent* QQuickWebViewExperimental::databaseQuotaDialog() const1234 QQmlComponent* QQuickWebViewExperimental::databaseQuotaDialog() const 1235 1235 { 1236 1236 Q_D(const QQuickWebView); … … 1238 1238 } 1239 1239 1240 void QQuickWebViewExperimental::setDatabaseQuotaDialog(Q DeclarativeComponent* databaseQuotaDialog)1240 void QQuickWebViewExperimental::setDatabaseQuotaDialog(QQmlComponent* databaseQuotaDialog) 1241 1241 { 1242 1242 Q_D(QQuickWebView); … … 1334 1334 } 1335 1335 1336 QQuickUrlSchemeDelegate* QQuickWebViewExperimental::schemeDelegates_At(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>* property, int index)1336 QQuickUrlSchemeDelegate* QQuickWebViewExperimental::schemeDelegates_At(QQmlListProperty<QQuickUrlSchemeDelegate>* property, int index) 1337 1337 { 1338 1338 const QObjectList children = property->object->children(); … … 1342 1342 } 1343 1343 1344 void QQuickWebViewExperimental::schemeDelegates_Append(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>* property, QQuickUrlSchemeDelegate *scheme)1344 void QQuickWebViewExperimental::schemeDelegates_Append(QQmlListProperty<QQuickUrlSchemeDelegate>* property, QQuickUrlSchemeDelegate *scheme) 1345 1345 { 1346 1346 QObject* schemeParent = property->object; … … 1354 1354 } 1355 1355 1356 int QQuickWebViewExperimental::schemeDelegates_Count(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>* property)1356 int QQuickWebViewExperimental::schemeDelegates_Count(QQmlListProperty<QQuickUrlSchemeDelegate>* property) 1357 1357 { 1358 1358 return property->object->children().count(); 1359 1359 } 1360 1360 1361 void QQuickWebViewExperimental::schemeDelegates_Clear(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>* property)1361 void QQuickWebViewExperimental::schemeDelegates_Clear(QQmlListProperty<QQuickUrlSchemeDelegate>* property) 1362 1362 { 1363 1363 const QObjectList children = property->object->children(); … … 1369 1369 } 1370 1370 1371 Q DeclarativeListProperty<QQuickUrlSchemeDelegate> QQuickWebViewExperimental::schemeDelegates()1372 { 1373 return Q DeclarativeListProperty<QQuickUrlSchemeDelegate>(schemeParent, 0,1371 QQmlListProperty<QQuickUrlSchemeDelegate> QQuickWebViewExperimental::schemeDelegates() 1372 { 1373 return QQmlListProperty<QQuickUrlSchemeDelegate>(schemeParent, 0, 1374 1374 QQuickWebViewExperimental::schemeDelegates_Append, 1375 1375 QQuickWebViewExperimental::schemeDelegates_Count, -
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h
r116420 r116646 29 29 30 30 class QWebNavigationRequest; 31 class Q DeclarativeComponent;31 class QQmlComponent; 32 32 class QQuickWebPage; 33 33 class QQuickWebViewAttached; … … 71 71 72 72 // Instantiating the WebView in C++ is only possible by creating 73 // a Q DeclarativeComponent as the initialization depends on the73 // a QQmlComponent as the initialization depends on the 74 74 // componentComplete method being called. 75 75 class QWEBKIT_EXPORT QQuickWebView : public QQuickFlickable { … … 254 254 255 255 Q_PROPERTY(QWebNavigationHistory* navigationHistory READ navigationHistory CONSTANT FINAL) 256 Q_PROPERTY(Q DeclarativeComponent* alertDialog READ alertDialog WRITE setAlertDialog NOTIFY alertDialogChanged)257 Q_PROPERTY(Q DeclarativeComponent* confirmDialog READ confirmDialog WRITE setConfirmDialog NOTIFY confirmDialogChanged)258 Q_PROPERTY(Q DeclarativeComponent* promptDialog READ promptDialog WRITE setPromptDialog NOTIFY promptDialogChanged)259 Q_PROPERTY(Q DeclarativeComponent* authenticationDialog READ authenticationDialog WRITE setAuthenticationDialog NOTIFY authenticationDialogChanged)260 Q_PROPERTY(Q DeclarativeComponent* proxyAuthenticationDialog READ proxyAuthenticationDialog WRITE setProxyAuthenticationDialog NOTIFY proxyAuthenticationDialogChanged)261 Q_PROPERTY(Q DeclarativeComponent* certificateVerificationDialog READ certificateVerificationDialog WRITE setCertificateVerificationDialog NOTIFY certificateVerificationDialogChanged)262 Q_PROPERTY(Q DeclarativeComponent* itemSelector READ itemSelector WRITE setItemSelector NOTIFY itemSelectorChanged)263 Q_PROPERTY(Q DeclarativeComponent* filePicker READ filePicker WRITE setFilePicker NOTIFY filePickerChanged)264 Q_PROPERTY(Q DeclarativeComponent* 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) 265 265 Q_PROPERTY(QWebPreferences* preferences READ preferences CONSTANT FINAL) 266 266 Q_PROPERTY(QWebViewportInfo* viewportInfo READ viewportInfo CONSTANT FINAL) 267 Q_PROPERTY(Q DeclarativeListProperty<QQuickUrlSchemeDelegate> urlSchemeDelegates READ schemeDelegates)267 Q_PROPERTY(QQmlListProperty<QQuickUrlSchemeDelegate> urlSchemeDelegates READ schemeDelegates) 268 268 Q_PROPERTY(QString userAgent READ userAgent WRITE setUserAgent NOTIFY userAgentChanged) 269 269 Q_PROPERTY(double devicePixelRatio READ devicePixelRatio WRITE setDevicePixelRatio NOTIFY devicePixelRatioChanged) … … 278 278 virtual ~QQuickWebViewExperimental(); 279 279 280 Q DeclarativeComponent* alertDialog() const;281 void setAlertDialog(Q DeclarativeComponent*);282 Q DeclarativeComponent* confirmDialog() const;283 void setConfirmDialog(Q DeclarativeComponent*);284 Q DeclarativeComponent* promptDialog() const;285 void setPromptDialog(Q DeclarativeComponent*);286 Q DeclarativeComponent* authenticationDialog() const;287 void setAuthenticationDialog(Q DeclarativeComponent*);288 Q DeclarativeComponent* certificateVerificationDialog() const;289 void setCertificateVerificationDialog(Q DeclarativeComponent*);290 Q DeclarativeComponent* itemSelector() const;291 void setItemSelector(Q DeclarativeComponent*);292 Q DeclarativeComponent* proxyAuthenticationDialog() const;293 void setProxyAuthenticationDialog(Q DeclarativeComponent*);294 Q DeclarativeComponent* filePicker() const;295 void setFilePicker(Q DeclarativeComponent*);296 Q DeclarativeComponent* databaseQuotaDialog() const;297 void setDatabaseQuotaDialog(Q DeclarativeComponent*);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*); 298 298 QString userAgent() const; 299 299 void setUserAgent(const QString& userAgent); … … 307 307 QQuickWebPage* page(); 308 308 309 static QQuickUrlSchemeDelegate* schemeDelegates_At(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>*, int index);310 static void schemeDelegates_Append(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>*, QQuickUrlSchemeDelegate*);311 static int schemeDelegates_Count(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>*);312 static void schemeDelegates_Clear(Q DeclarativeListProperty<QQuickUrlSchemeDelegate>*);313 Q DeclarativeListProperty<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(); 314 314 void invokeApplicationSchemeHandler(WTF::PassRefPtr<WebKit::QtRefCountedNetworkRequestData>); 315 315 void sendApplicationSchemeReply(QQuickNetworkReply*); -
trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p_p.h
r116516 r116646 52 52 53 53 QT_BEGIN_NAMESPACE 54 class Q DeclarativeComponent;54 class QQmlComponent; 55 55 QT_END_NAMESPACE 56 56 … … 184 184 FlickableAxisLocker axisLocker; 185 185 186 Q DeclarativeComponent* alertDialog;187 Q DeclarativeComponent* confirmDialog;188 Q DeclarativeComponent* promptDialog;189 Q DeclarativeComponent* authenticationDialog;190 Q DeclarativeComponent* certificateVerificationDialog;191 Q DeclarativeComponent* itemSelector;192 Q DeclarativeComponent* proxyAuthenticationDialog;193 Q DeclarativeComponent* filePicker;194 Q DeclarativeComponent* 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; 195 195 196 196 WebCore::ViewportAttributes attributes; -
trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider.cpp
r103413 r116646 30 30 31 31 QWebIconImageProvider::QWebIconImageProvider() 32 : Q DeclarativeImageProvider(QDeclarativeImageProvider::Image)32 : QQuickImageProvider(QQuickImageProvider::Image) 33 33 { 34 34 } -
trunk/Source/WebKit2/UIProcess/API/qt/qwebiconimageprovider_p.h
r116100 r116646 24 24 #include <QtQuick/QQuickImageProvider> 25 25 26 class QWEBKIT_EXPORT QWebIconImageProvider : public Q DeclarativeImageProvider {26 class QWEBKIT_EXPORT QWebIconImageProvider : public QQuickImageProvider { 27 27 public: 28 28 QWebIconImageProvider(); -
trunk/Source/WebKit2/UIProcess/API/qt/qwebviewportinfo_p.h
r109608 r116646 28 28 #include <QtCore/QSize> 29 29 #include <QtCore/QVariant> 30 #include <Qt Declarative/QtDeclarative>30 #include <QtQml/QtQml> 31 31 32 32 class QQuickWebViewPrivate; -
trunk/Source/WebKit2/UIProcess/API/qt/tests/tests.pri
r113861 r116646 11 11 INCLUDEPATH += $$PWD 12 12 13 QT += testlib declarativequick quick-private webkit13 QT += testlib qml quick quick-private webkit 14 14 15 15 DEFINES += TESTS_SOURCE_DIR=\\\"$$PWD\\\" \ -
trunk/Source/WebKit2/UIProcess/qt/QtDialogRunner.h
r114897 r116646 28 28 29 29 QT_BEGIN_NAMESPACE 30 class Q DeclarativeComponent;31 class Q DeclarativeContext;30 class QQmlComponent; 31 class QQmlContext; 32 32 class QQuickItem; 33 33 QT_END_NAMESPACE … … 42 42 virtual ~QtDialogRunner(); 43 43 44 bool initForAlert(Q DeclarativeComponent*, QQuickItem* dialogParent, const QString& message);45 bool initForConfirm(Q DeclarativeComponent*, QQuickItem* dialogParent, const QString& message);46 bool initForPrompt(Q DeclarativeComponent*, QQuickItem* dialogParent, const QString& message, const QString& defaultValue);47 bool initForAuthentication(Q DeclarativeComponent*, QQuickItem* dialogParent, const QString& hostname, const QString& realm, const QString& prefilledUsername);48 bool initForCertificateVerification(Q DeclarativeComponent*, QQuickItem*, const QString& hostname);49 bool initForProxyAuthentication(Q DeclarativeComponent*, QQuickItem*, const QString& hostname, uint16_t port, const QString& prefilledUsername);50 bool initForFilePicker(Q DeclarativeComponent*, QQuickItem*, const QStringList& selectedFiles, bool allowMultiple);51 bool initForDatabaseQuotaDialog(Q DeclarativeComponent*, 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); 52 52 53 53 QQuickItem* dialog() const { return m_dialog.get(); } … … 89 89 90 90 private: 91 bool createDialog(Q DeclarativeComponent*, QQuickItem* dialogParent, QObject* contextObject);91 bool createDialog(QQmlComponent*, QQuickItem* dialogParent, QObject* contextObject); 92 92 93 OwnPtr<Q DeclarativeContext> m_dialogContext;93 OwnPtr<QQmlContext> m_dialogContext; 94 94 OwnPtr<QQuickItem> m_dialog; 95 95 QString m_result; -
trunk/Source/WebKit2/UIProcess/qt/WebPopupMenuProxyQt.h
r114897 r116646 32 32 #include <wtf/OwnPtr.h> 33 33 34 class Q DeclarativeComponent;35 class Q DeclarativeContext;34 class QQmlComponent; 35 class QQmlContext; 36 36 class QQuickWebView; 37 37 class QQuickItem; … … 60 60 WebPopupMenuProxyQt(WebPopupMenuProxy::Client*, QQuickWebView*); 61 61 void createItem(QObject*); 62 void createContext(Q DeclarativeComponent*, QObject*);62 void createContext(QQmlComponent*, QObject*); 63 63 64 64 void notifyValueChanged(); 65 65 66 OwnPtr<Q DeclarativeContext> m_context;66 OwnPtr<QQmlContext> m_context; 67 67 OwnPtr<QQuickItem> m_itemSelector; 68 68
Note: See TracChangeset
for help on using the changeset viewer.