diff options
| -rw-r--r-- | ApplicationWindow.qml | 18 | ||||
| -rw-r--r-- | ComboBox.qml | 12 | ||||
| -rw-r--r-- | Label.qml | 6 | ||||
| -rw-r--r-- | Page.qml | 6 | ||||
| -rw-r--r-- | ToolBar.qml | 6 | ||||
| -rw-r--r-- | qootstrap.pro | 2 |
6 files changed, 24 insertions, 26 deletions
diff --git a/ApplicationWindow.qml b/ApplicationWindow.qml index 72df372..8695461 100644 --- a/ApplicationWindow.qml +++ b/ApplicationWindow.qml @@ -1,16 +1,14 @@ -import QtQuick 2.15 -import QtQuick.Templates 2.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Templates +import Bootstrap ApplicationWindow { id: window color: Bootstrap.bodyBg - overlay { - modal: Rectangle { - color: Color.transparent(window.palette.shadow, .5) - } - modeless: Rectangle { - color: Color.transparent(window.palette.shadow, .15) - } + Overlay.modal: Rectangle { + color: Color.transparent(window.palette.shadow, .5) + } + Overlay.modeless: Rectangle { + color: Color.transparent(window.palette.shadow, .15) } } diff --git a/ComboBox.qml b/ComboBox.qml index 0699241..d91cac0 100644 --- a/ComboBox.qml +++ b/ComboBox.qml @@ -1,9 +1,9 @@ -import QtQuick 2.15 -import QtQuick.Window 2.15 -import QtQuick.Controls 2.15 -import QtQuick.Controls.impl 2.15 -import QtQuick.Templates 2.15 as T -import Bootstrap 5.3 +import QtQuick +import QtQuick.Window +import QtQuick.Controls +import QtQuick.Controls.impl +import QtQuick.Templates as T +import Bootstrap T.ComboBox { id: control @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Templates 2.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Templates +import Bootstrap Label { id: control @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Templates 2.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Templates +import Bootstrap Page { id: control diff --git a/ToolBar.qml b/ToolBar.qml index 4834c70..e722820 100644 --- a/ToolBar.qml +++ b/ToolBar.qml @@ -1,6 +1,6 @@ -import QtQuick 2.15 -import QtQuick.Templates 2.15 -import Bootstrap 5.3 +import QtQuick +import QtQuick.Templates +import Bootstrap ToolBar { id: control diff --git a/qootstrap.pro b/qootstrap.pro index 8bf06ce..b36c8ea 100644 --- a/qootstrap.pro +++ b/qootstrap.pro @@ -15,7 +15,7 @@ style.files = \ Label.qml \ Page.qml \ ToolBar.qml -style.path = $$[QT_INSTALL_QML]/QtQuick/Controls.2/$$QML_IMPORT_NAME +style.path = $$[QT_INSTALL_QML]/QtQuick/Controls/$$QML_IMPORT_NAME HEADERS += $${QML_IMPORT_NAME}.hxx SOURCES += \ |