diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 13:24:25 +0100 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 14:28:00 +0100 |
| commit | 9316b8c27c4d63ee755517fb4670268424200b3c (patch) | |
| tree | a9818fd5a8798ec56add7cd622fb13cee525557a /src/core/renderer/content_renderer_client_qt.h | |
| parent | ad46ffd2e74b17cd7e7b8a7d73590696cc8febce (diff) | |
| parent | 03a52863226aeb774721db610ba831808b30836a (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
Diffstat (limited to 'src/core/renderer/content_renderer_client_qt.h')
| -rw-r--r-- | src/core/renderer/content_renderer_client_qt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.h b/src/core/renderer/content_renderer_client_qt.h index 4e3c70cf8..7103bc29b 100644 --- a/src/core/renderer/content_renderer_client_qt.h +++ b/src/core/renderer/content_renderer_client_qt.h @@ -33,6 +33,8 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ +#ifndef CONTENT_RENDERER_CLIENT_QT_H +#define CONTENT_RENDERER_CLIENT_QT_H #include "content/public/renderer/content_renderer_client.h" @@ -61,3 +63,5 @@ public: private: QScopedPointer<visitedlink::VisitedLinkSlave> m_visitedLinkSlave; }; + +#endif // CONTENT_RENDERER_CLIENT_QT_H |