diff options
| author | Marco Bubke <marco.bubke@qt.io> | 2022-05-04 17:19:40 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-10 19:54:06 +0000 |
| commit | e6e5e7502a5f1aa630f3b88f28e9562502765548 (patch) | |
| tree | 3b3cfcf3ed5bc156ecf4deb422c4dfa457d010a1 | |
| parent | ef05388a7258329d464a88543aa85c7eb71c0f1a (diff) | |
Use qualified imports to avoid prototype loops
In the designer model we don't use import order to simplify the meta
type system. There are only very few places where we get a prototype
chain loop. In most cases qualified imports are used.
Change-Id: If4baac38cabb7773f58c0d326806fd6fd5612a99
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
(cherry picked from commit ede8dbb5c31266a340f1ea2cfc59541876e80e0c)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/webenginequick/ui/Menu.qml | 4 | ||||
| -rw-r--r-- | src/webenginequick/ui/MenuItem.qml | 5 | ||||
| -rw-r--r-- | src/webenginequick/ui/ToolTip.qml | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/webenginequick/ui/Menu.qml b/src/webenginequick/ui/Menu.qml index b6d799d02..04db96cb7 100644 --- a/src/webenginequick/ui/Menu.qml +++ b/src/webenginequick/ui/Menu.qml @@ -38,9 +38,9 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls +import QtQuick.Controls as C -Menu { +C.Menu { id: menu signal done() objectName: "menu" diff --git a/src/webenginequick/ui/MenuItem.qml b/src/webenginequick/ui/MenuItem.qml index b4e06ccc2..361954ab3 100644 --- a/src/webenginequick/ui/MenuItem.qml +++ b/src/webenginequick/ui/MenuItem.qml @@ -38,7 +38,6 @@ ****************************************************************************/ import QtQuick -import QtQuick.Controls - -MenuItem { } +import QtQuick.Controls as C +C.MenuItem { } diff --git a/src/webenginequick/ui/ToolTip.qml b/src/webenginequick/ui/ToolTip.qml index 8800bb1f8..185fa53d8 100644 --- a/src/webenginequick/ui/ToolTip.qml +++ b/src/webenginequick/ui/ToolTip.qml @@ -37,9 +37,9 @@ ** ****************************************************************************/ -import QtQuick.Controls +import QtQuick.Controls as C -ToolTip { +C.ToolTip { delay: 1000 timeout: 1500 objectName: "toolTip" |