summaryrefslogtreecommitdiff
path: root/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
diff options
context:
space:
mode:
authorKonstantin Tokarev <annulen@yandex.ru>2016-09-28 16:39:37 +0300
committerKonstantin Tokarev <annulen@yandex.ru>2017-02-02 12:31:01 +0000
commit9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c (patch)
tree322337ad0acbc75732f916376ec6d36e7ec0e5bc /Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
parent6882a04fb36642862b11efe514251d32070c3d65 (diff)
downloadqtwebkit-9daf1655d7e4eaaa6ed5f44055a4b4fd399fd25c.tar.gz
Imported WebKit commit eb954cdcf58f9b915b2fcb6f8e4cb3a60650a4f3
Change-Id: I8dda875c38075d43b76fe3a21acb0ffa102bb82d Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Diffstat (limited to 'Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp')
-rw-r--r--Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp b/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
index 510b0465e..ea322093c 100644
--- a/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
+++ b/Tools/WebKitTestRunner/qt/PlatformWebViewQt.cpp
@@ -30,12 +30,12 @@
#include "qquickwebpage_p.h"
#include "qquickwebview_p.h"
-#include <QCoreApplication>
+#include <QApplication>
#include <QEventLoop>
#include <QQmlProperty>
#include <QtQuick/QQuickView>
#include <QtQuick/private/qquickwindow_p.h>
-#include <WebKit2/WKImageQt.h>
+#include <WebKit/WKImageQt.h>
#include <qpa/qwindowsysteminterface.h>
namespace WTR {
@@ -107,6 +107,11 @@ PlatformWebView::~PlatformWebView()
m_modalEventLoop->exit();
}
+void PlatformWebView::setWindowIsKey(bool isKey)
+{
+ m_windowIsKey = isKey;
+}
+
void PlatformWebView::resizeTo(unsigned width, unsigned height)
{
// If we do not have a platform window we will never get the necessary