fix: [qml] fix QML version dependency issue

reduce the version of QML from 5.15 to 5.11 Log: fix QML version dependency issue Bug: no
linuxdeepin · Sep 1, 2023 · 02e6a1d · 02e6a1d
1 parent 68961ab
commit 02e6a1d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 21 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+dde-cooperation (0.1.0) unstable; urgency=medium
+
+  * adaptation dependency V20 1060 UOS
+
+ -- liujinchang <[email protected]>  Fri, 1 Sep 2023 16:05:29 +0800
+
 dde-cooperation (0.0.10) unstable; urgency=medium
 
   * hide the desktop entry

diff --git a/debian/control b/debian/control
@@ -37,9 +37,9 @@ Package: dde-cooperation
 Architecture: any
 Depends:
  adb,
- qml-module-qtmultimedia (>= 5.15.2~),
- qml-module-qtquick-controls (>= 5.15.2~),
- qml-module-qtquick2 (>= 5.15.2~),
+ qml-module-qtmultimedia (>= 5.11.2~),
+ qml-module-qtquick-controls (>= 5.11.2~),
+ qml-module-qtquick2 (>= 5.11.2~),
  ${misc:Depends},
  ${shlibs:Depends},
 Description: cross-device collaboration by deepin

diff --git a/src/dde-cooperation/Android/qml/MainWindow.qml b/src/dde-cooperation/Android/qml/MainWindow.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick 2.11
+import QtQuick.Window 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.3
 import QtMultimedia 5.8
 
 Window {

diff --git a/src/dde-cooperation/Android/qml/NewDevice.qml b/src/dde-cooperation/Android/qml/NewDevice.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick 2.11
+import QtQuick.Window 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.3
 import QtMultimedia 5.8
 
 ColumnLayout {
@@ -50,8 +50,8 @@ ColumnLayout {
                 ctx.reset();
                 ctx.fillStyle = Qt.rgba(0, 0, 0, 1);
 
-                for (let y = 0; y < s; y++) {
-                    for (let x = 0; x < s; x++) {
+                for (var y = 0; y < s; y++) {
+                    for (var x = 0; x < s; x++) {
                         if (qrCode.getModule(x, y)) {
                             const rx1 = x * scale;
                             const ry1 = y * scale;
@@ -64,10 +64,11 @@ ColumnLayout {
             }
 
             Component.onCompleted: {
-                qrCode.textChanged.connect(() => {
-                    console.debug("update")
-                    canvas.requestPaint()
-                })
+                id: qrCode
+                ontextChanged: {
+                    console.debug("update");
+                    canvas.requestPaint();
+                }
             }
         }
     }

diff --git a/src/dde-cooperation/Android/qml/VideoPlayer.qml b/src/dde-cooperation/Android/qml/VideoPlayer.qml
@@ -1,7 +1,7 @@
-import QtQuick 2.12
-import QtQuick.Window 2.15
-import QtQuick.Controls 2.12
-import QtQuick.Layouts 1.15
+import QtQuick 2.11
+import QtQuick.Window 2.11
+import QtQuick.Controls 2.4
+import QtQuick.Layouts 1.3
 import QtMultimedia 5.8
 
 Rectangle {