From 637beda0062ff65918823147830b52e29ae550a6 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Mon, 8 May 2017 14:44:17 +0200 Subject: Fix backwards compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QtWebEngine supports building with last stable and last LTS Qt releases. Guard some 5.7-5.9 API from being used when not available, and reinstate the default features for 5.6 LTS builds. Change-Id: Ia288a49109d011a2bee883d4a2d38d994b497d59 Reviewed-by: Michael Brüning --- examples/webenginewidgets/spellchecker/webview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'examples') diff --git a/examples/webenginewidgets/spellchecker/webview.cpp b/examples/webenginewidgets/spellchecker/webview.cpp index 0e52e7628..80158f7e5 100644 --- a/examples/webenginewidgets/spellchecker/webview.cpp +++ b/examples/webenginewidgets/spellchecker/webview.cpp @@ -69,7 +69,7 @@ void WebView::contextMenuEvent(QContextMenuEvent *event) QMenu *menu = page()->createStandardContextMenu(); menu->addSeparator(); - QAction *spellcheckAction = new QAction(tr("Check Spelling")); + QAction *spellcheckAction = new QAction(tr("Check Spelling"), nullptr); spellcheckAction->setCheckable(true); spellcheckAction->setChecked(profile->isSpellCheckEnabled()); connect(spellcheckAction, &QAction::toggled, this, [profile](bool toogled) { -- cgit v1.2.3 From ec63ae9ad964bffd0e88a5f55dd6e6d52fea179c Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 9 May 2017 13:36:18 +0200 Subject: Fix quicknanobrowser Fix conflict between two Settings classes. Required to launch example. Change-Id: I9b98e0b79f84f905f92a7042f2bf7aab4a34d225 Reviewed-by: Simon Hausmann Reviewed-by: Kai Koehne --- examples/webengine/quicknanobrowser/BrowserWindow.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'examples') diff --git a/examples/webengine/quicknanobrowser/BrowserWindow.qml b/examples/webengine/quicknanobrowser/BrowserWindow.qml index 596e4a76e..16efc9e37 100644 --- a/examples/webengine/quicknanobrowser/BrowserWindow.qml +++ b/examples/webengine/quicknanobrowser/BrowserWindow.qml @@ -52,7 +52,7 @@ import Qt.labs.settings 1.0 import QtQml 2.2 import QtQuick 2.2 import QtQuick.Controls 1.0 -import QtQuick.Controls.Private 1.0 +import QtQuick.Controls.Private 1.0 as QQCPrivate import QtQuick.Controls.Styles 1.0 import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.0 @@ -75,7 +75,7 @@ ApplicationWindow { // Create a styleItem to determine the platform. // When using style "mac", ToolButtons are not supposed to accept focus. - StyleItem { id: styleItem } + QQCPrivate.StyleItem { id: styleItem } property bool platformIsMac: styleItem.style == "mac" Settings { -- cgit v1.2.3