drop support android extrass and qt5

src/Client/CMakeLists.txt

@@ -43,17 +43,17 @@ if (ANDROID)
                          QmlNotyfyService
                          ViewSolutions)
 
-    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
+#    find_package(Qt${QT_VERSION_MAJOR} COMPONENTS AndroidExtras REQUIRED)
 
-    addDeployAPK(${CURRENT_PROJECT}
-                "${CMAKE_CURRENT_LIST_DIR}/android"
-                "SnakeProject"
-                "${SIGPATH}/Crawl.keystore"
-                "${SIGPASS_SNAKE}"
-                "${TARGET_DIR}"
-                "${SNAKE_EXTRA_LIBS}")
+#    addDeployAPK(${CURRENT_PROJECT}
+#                "${CMAKE_CURRENT_LIST_DIR}/android"
+#                "SnakeProject"
+#                "${SIGPATH}/Crawl.keystore"
+#                "${SIGPASS_SNAKE}"
+#                "${TARGET_DIR}"
+#                "${SNAKE_EXTRA_LIBS}")
 
-    target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
+#    target_link_libraries(${CURRENT_PROJECT} PRIVATE Qt${QT_VERSION_MAJOR}::AndroidExtras)
 
     file(GLOB java_files
        "android/src/com/quasarapp/androidtools/*.java"

src/Core/CrawlModule/DayLight.qml

@@ -5,8 +5,8 @@
 //# of this license document, but changing it is not allowed.
 //#
 
-import QtQuick 2.15
-import QtQuick3D 1.15
+import QtQuick
+import QtQuick3D
 
 Node {
     id: graphicItem

src/Core/CrawlModule/GraphicItem.qml

@@ -5,8 +5,8 @@
 //# of this license document, but changing it is not allowed.
 //#
 
-import QtQuick 2.15
-import QtQuick3D 1.15
+import QtQuick
+import QtQuick3D
 
 Model {
     id: graphicItem

src/Core/CrawlModule/Scene.qml

@@ -1,11 +1,11 @@
-import QtQuick 2.15
-import QtQuick3D 1.15
-import QtQuick.Controls.Material 2.15
-import QtQuick.Controls 2.15
-import QtQuick.Layouts 1.15
+import QtQuick
+import QtQuick3D
+import QtQuick.Controls.Material
+import QtQuick.Controls
+import QtQuick.Layouts
 
 // https://doc.qt.io/qt-5/qqmlengine.html#qmlRegisterUncreatableMetaObject
-import engine.worldstatus 1.0
+import engine.worldstatus
 
 View3D {
     id: scene;

src/CrawlTestLvl/TestControl.qml

@@ -21,7 +21,7 @@ DefaultMenu {
             property real oldX: 0
             property real oldY: 0
             cursorShape: Qt.DragMoveCursor
-            onPressed: {
+            onPressed: (mouse) => {
                 track = true
                 oldX = mouse.x
                 oldY = mouse.y
@@ -32,7 +32,7 @@ DefaultMenu {
                 track = false
             }
 
-            onMouseXChanged: {
+            onPositionChanged: (mouse) => {
                 if (!model) {
                     return;
                 }
@@ -41,27 +41,17 @@ DefaultMenu {
                     return;
                 }
 
-                const delta = mouse.x - oldX;
-                const radianDelta = (delta / (parent.width / 2)) * 45
-
-                model.xChanged(radianDelta)
-                oldX = mouse.x;
-            }
-
-            onMouseYChanged:  {
-                if (!model) {
-                    return;
-                }
-
-                if (!track) {
-                    return;
-                }
-
-                const delta = mouse.y - oldY;
-                const radianDelta = (delta / (parent.height / 2)) * 45
+                let delta = mouse.y - oldY;
+                let radianDelta = (delta / (parent.height / 2)) * 45
 
                 model.yChanged(radianDelta)
                 oldY = mouse.y;
+
+                delta = mouse.x - oldX;
+                radianDelta = (delta / (parent.width / 2)) * 45
+
+                model.xChanged(radianDelta)
+                oldX = mouse.x;
             }
 
             anchors.fill: parent

submodules/ViewSolutions

@@ -1 +1 @@
-Subproject commit 69dd61abe7dee5d27f70b055a26bc91a3bd00f7a
+Subproject commit 40e620ea324f09e31d8a8808c221710c63d28083