diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-01-13 21:26:34 +0100 |
| commit | beaeeb99881184fd368c121fcbb1a31c78b794a3 (patch) | |
| tree | 0e078499d8fe3e8627e3612537e61f2dd1029625 /Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp | |
| parent | f7697030f444b5e16331c6d0a99712736b9ff026 (diff) | |
| parent | 79143ccfc158ec4fffc49eee600d600edb342b16 (diff) | |
| download | qtwebkit-beaeeb99881184fd368c121fcbb1a31c78b794a3.tar.gz | |
Merge remote-tracking branch 'origin/5.212' into dev
Change-Id: I9e64176fe95183acf5e093aa081b0a498795bdb2
Diffstat (limited to 'Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp index c6f96f094..14c4db5a3 100644 --- a/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp +++ b/Source/WebKit2/UIProcess/API/qt/qwebchannelwebkittransport.cpp @@ -40,10 +40,11 @@ ****************************************************************************/ #include "config.h" -#include "qwebchannelwebkittransport_p.h" #if ENABLE(QT_WEBCHANNEL) +#include "qwebchannelwebkittransport_p.h" + #include "qquickwebview_p.h" #include <QJsonDocument> |