diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-09 13:36:18 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-05-10 04:17:03 +0000 |
| commit | ec63ae9ad964bffd0e88a5f55dd6e6d52fea179c (patch) | |
| tree | 0cc7b62f4cc9a4e5546233c7e212d344647f06ea | |
| parent | 7be0546cc040dc1b9d2dbb0bb0614bfcccb3e6bb (diff) | |
Fix quicknanobrowser
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>
| -rw-r--r-- | examples/webengine/quicknanobrowser/BrowserWindow.qml | 4 |
1 files changed, 2 insertions, 2 deletions
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 { |