diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:01:37 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-11-20 16:04:42 +0100 |
| commit | 1f474fcc4cd47a85ce8d99f07d18b46ef2af5898 (patch) | |
| tree | d4e52b5ac98343b4c2417d622164bf320d781a59 /src/webengine/ui_delegates_manager.h | |
| parent | 4cc28c7c89f794d469f5e8f778ff05effe8c646f (diff) | |
| parent | 1173d48149a8133b607894b67e1ec32de68e21e8 (diff) | |
Merge branch '5.6' into dev
Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
Diffstat (limited to 'src/webengine/ui_delegates_manager.h')
| -rw-r--r-- | src/webengine/ui_delegates_manager.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/webengine/ui_delegates_manager.h b/src/webengine/ui_delegates_manager.h index fb262aac1..7a87c1eee 100644 --- a/src/webengine/ui_delegates_manager.h +++ b/src/webengine/ui_delegates_manager.h @@ -37,7 +37,12 @@ #ifndef UI_DELEGATES_MANAGER_H #define UI_DELEGATES_MANAGER_H -#include <QObject> +#include "qglobal.h" +#include "web_contents_adapter.h" +#include "web_contents_adapter_client.h" + +#include <QCoreApplication> +#include <QExplicitlySharedDataPointer> #include <QPoint> #include <QSharedPointer> @@ -82,8 +87,9 @@ Q_SIGNALS: void triggered(); }; -class UIDelegatesManager { - +class UIDelegatesManager +{ + Q_DECLARE_TR_FUNCTIONS(UIDelegatesManager) public: enum ComponentType { Invalid = -1, |