Skip to content

Commit

Permalink
Fix quicknanobrowser
Browse files Browse the repository at this point in the history
Fix conflict between two Settings classes. Required to launch example.

Change-Id: I9b98e0b79f84f905f92a7042f2bf7aab4a34d225
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
  • Loading branch information
Allan Sandfeld Jensen authored and jaheikk committed May 10, 2017
1 parent 7be0546 commit ec63ae9
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions examples/webengine/quicknanobrowser/BrowserWindow.qml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 {
Expand Down

0 comments on commit ec63ae9

Please sign in to comment.