diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-29 10:32:39 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-05-29 08:33:31 +0000 |
| commit | 95ca17c45aea718cade487640edc63e08bc23820 (patch) | |
| tree | 53d6cc2102d18ed4b143cb69b378cbbeba7faee4 /examples/webengine/quicknanobrowser/BrowserWindow.qml | |
| parent | fdbc265de10fe173b0c38e0be4c6e3eed1dc65b7 (diff) | |
| parent | 73f7be5b2a95eab3dce11caede538eeb7beb71f2 (diff) | |
| download | qtwebengine-95ca17c45aea718cade487640edc63e08bc23820.tar.gz | |
Merge remote-tracking branch 'origin/5.9.0' into 5.9
Change-Id: Iba6114263488d6bf84b255b38182904dc5880386
Diffstat (limited to 'examples/webengine/quicknanobrowser/BrowserWindow.qml')
| -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 { |