diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-03-20 16:05:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-28 10:37:20 +0100 |
| commit | 9a1a09bf82ea98a2b69b351120619c787ce990a8 (patch) | |
| tree | bcd27019991abde6ede6c0fa8480eab1287d522b /src/core/web_event_factory.cpp | |
| parent | ba5efed2905de98ed0c9eff3998c270d92a100de (diff) | |
Adapt to API changes in new stable branch 1750
Change-Id: If0cc263f36d396fd505c1d8b026e2493bfc29cc4
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'src/core/web_event_factory.cpp')
| -rw-r--r-- | src/core/web_event_factory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/web_event_factory.cpp b/src/core/web_event_factory.cpp index febad0a3a..544ac83f6 100644 --- a/src/core/web_event_factory.cpp +++ b/src/core/web_event_factory.cpp @@ -41,7 +41,7 @@ ****************************************************************************/ #include "web_event_factory.h" -#include "third_party/WebKit/Source/core/platform/WindowsKeyboardCodes.h" +#include "third_party/WebKit/Source/platform/WindowsKeyboardCodes.h" #include <QElapsedTimer> #include <QKeyEvent> @@ -50,7 +50,7 @@ static const int wheelScrollLines = 3; // FIXME: Still not available in QStyleHints in 5.1 -using namespace WebKit; +using namespace blink; static int windowsKeyCodeForKeyEvent(unsigned int keycode, bool isKeypad) { @@ -558,7 +558,7 @@ WebMouseEvent WebEventFactory::toWebMouseEvent(QHoverEvent *ev, double dpiScale) return webKitEvent; } -WebKit::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev, double dpiScale) +blink::WebMouseWheelEvent WebEventFactory::toWebWheelEvent(QWheelEvent *ev, double dpiScale) { WebMouseWheelEvent webEvent; webEvent.type = webEventTypeForEvent(ev); |