diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-16 14:34:43 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-16 14:34:43 +0100 |
| commit | 9ffb601435df46744b1f4a95b3a4b231f4bda64e (patch) | |
| tree | 48b34f7ef1ef8aea962cf103d97ec8ab7b38291b /src/webengine/ui_delegates_manager.h | |
| parent | 6e356d55c8eabcc96223e25182458b78378dd5a4 (diff) | |
| parent | 9bec2760d44c944e7f6b43388924b5714d9e8e06 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/webengine/ui_delegates_manager.h
Change-Id: I989280b6008fbc4844ed86d6d16f7e7aa6ba8db9
Diffstat (limited to 'src/webengine/ui_delegates_manager.h')
| -rw-r--r-- | src/webengine/ui_delegates_manager.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h index 9367bff30..745ae0dfd 100644 --- a/src/webengine/ui_delegates_manager.h +++ b/src/webengine/ui_delegates_manager.h @@ -54,7 +54,8 @@ F(AlertDialog, alertDialog) SEPARATOR \ F(ConfirmDialog, confirmDialog) SEPARATOR \ F(PromptDialog, promptDialog) SEPARATOR \ - F(FilePicker, filePicker) SEPARATOR + F(FilePicker, filePicker) SEPARATOR \ + F(MessageBubble, messageBubble) SEPARATOR #define COMMA_SEPARATOR , #define SEMICOLON_SEPARATOR ; @@ -66,6 +67,7 @@ QT_BEGIN_NAMESPACE class QObject; class QQmlContext; +class QQuickItem; class QQuickWebEngineView; QT_END_NAMESPACE @@ -124,11 +126,15 @@ public: QQmlContext *creationContextForComponent(QQmlComponent *); void showDialog(QSharedPointer<JavaScriptDialogController>); void showFilePicker(FilePickerController *controller); + void showMessageBubble(const QRect &anchor, const QString &mainText, const QString &subText); + void hideMessageBubble(); + void moveMessageBubble(const QRect &anchor); private: bool ensureComponentLoaded(ComponentType); QQuickWebEngineView *m_view; + QScopedPointer<QQuickItem> m_messageBubbleItem; FOR_EACH_COMPONENT_TYPE(MEMBER_DECLARATION, SEMICOLON_SEPARATOR) |