diff options
| author | Michael Brüning <michael.bruning@qt.io> | 2019-01-18 16:26:29 +0100 |
|---|---|---|
| committer | Michael Brüning <michael.bruning@qt.io> | 2019-01-18 16:26:29 +0100 |
| commit | 819182302d5bdaba41efb68ef3c533b2acc19ae1 (patch) | |
| tree | cab7a922998bc5d6e7f42b537b0c0ce1b69111f6 /tests/auto/widgets/qwebengineview | |
| parent | 0763b7c40d3490250f5bca1e0029cefba635305c (diff) | |
| parent | 3f7ea91e23d82e676aeaf157736e25cf54e5ec6b (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
src/core/net/network_delegate_qt.cpp
src/core/profile_io_data_qt.cpp
src/core/web_engine_context.h
tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp
Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0
Diffstat (limited to 'tests/auto/widgets/qwebengineview')
| -rw-r--r-- | tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index 74762d5a6..d9afb56db 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -1703,8 +1703,8 @@ struct InputMethodInfo , selectedText(selectedText) {} - const int cursorPosition; - const int anchorPosition; + int cursorPosition; + int anchorPosition; QString surroundingText; QString selectedText; }; |