diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 14:09:57 +0100 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2024-11-19 14:10:09 +0100 |
| commit | 4059077eb23b6338e153036c602972cbbb46cbb8 (patch) | |
| tree | b233dc3cdcecac582ddbfb9ff3ab0ee2b4aa9559 | |
| parent | f18b5268b1fd1071353a596b86dcd416548d7107 (diff) | |
Import the patches for the demo applications into the app repos.
Bug-AGL: SPEC-5294
Change-Id: I1a4fb9bc726eb8bd677807166ba957fb20b3bdf2
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
| -rw-r--r-- | imports/qtquickcontrols2aglstyle/ProgressBar.qml | 2 | ||||
| -rw-r--r-- | imports/qtquickcontrols2aglstyle/Slider.qml | 2 | ||||
| -rw-r--r-- | imports/qtquickcontrols2aglstyle/qmldir | 10 | ||||
| -rw-r--r-- | imports/qtquickcontrols2aglstyle/qtquickcontrols2aglstyle.pro | 4 |
4 files changed, 14 insertions, 4 deletions
diff --git a/imports/qtquickcontrols2aglstyle/ProgressBar.qml b/imports/qtquickcontrols2aglstyle/ProgressBar.qml index 6d5e3ae..fca0b8a 100644 --- a/imports/qtquickcontrols2aglstyle/ProgressBar.qml +++ b/imports/qtquickcontrols2aglstyle/ProgressBar.qml @@ -16,7 +16,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects T.ProgressBar { id: control diff --git a/imports/qtquickcontrols2aglstyle/Slider.qml b/imports/qtquickcontrols2aglstyle/Slider.qml index 5b6a495..02f4555 100644 --- a/imports/qtquickcontrols2aglstyle/Slider.qml +++ b/imports/qtquickcontrols2aglstyle/Slider.qml @@ -16,7 +16,7 @@ import QtQuick 2.6 import QtQuick.Templates 2.0 as T -import QtGraphicalEffects 1.0 +import Qt5Compat.GraphicalEffects T.Slider { id: root diff --git a/imports/qtquickcontrols2aglstyle/qmldir b/imports/qtquickcontrols2aglstyle/qmldir new file mode 100644 index 0000000..e4e4417 --- /dev/null +++ b/imports/qtquickcontrols2aglstyle/qmldir @@ -0,0 +1,10 @@ +module AGL +ApplicationWindow 1.0 ApplicationWindow.qml +Button 1.0 Button.qml +Label 1.0 Label.qml +Page 1.0 Page.qml +ProgressBar 1.0 ProgressBar.qml +Slider 1.0 Slider.qml +Switch 1.0 Switch.qml +TextField 1.0 TextField.qml +Tumbler 1.0 Tumbler.qml
\ No newline at end of file diff --git a/imports/qtquickcontrols2aglstyle/qtquickcontrols2aglstyle.pro b/imports/qtquickcontrols2aglstyle/qtquickcontrols2aglstyle.pro index 5a34485..ba24e9d 100644 --- a/imports/qtquickcontrols2aglstyle/qtquickcontrols2aglstyle.pro +++ b/imports/qtquickcontrols2aglstyle/qtquickcontrols2aglstyle.pro @@ -1,8 +1,8 @@ TEMPLATE = aux -DISTFILES = *.qml images +DISTFILES = *.qml images qmldir files.files = $$DISTFILES -files.path = $$PREFIX$$[QT_INSTALL_QML]/QtQuick/Controls.2/AGL +files.path = $$PREFIX$$[QT_INSTALL_BINS]/AGL INSTALLS += files |