diff --git a/CMakeLists.txt b/CMakeLists.txt index 28492d9..2eab321 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,8 +30,8 @@ set(BUILD_SHARED_LIBS ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -set(QT_VERSION_MAJOR 6) -find_package(Qt6 COMPONENTS Core Test REQUIRED) +set(QT_VERSION_MAJOR 5) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Test REQUIRED) if (NOT DEFINED SNAKEPROJECT_TESTS) set(SNAKEPROJECT_TESTS ON) diff --git a/src/ClientLib/CMakeLists.txt b/src/ClientLib/CMakeLists.txt index 42e30a6..d83eb3c 100644 --- a/src/ClientLib/CMakeLists.txt +++ b/src/ClientLib/CMakeLists.txt @@ -22,12 +22,12 @@ file(GLOB SOURCE_CPP set(PUBLIC_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}") set(PRIVATE_INCUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/private") -find_package(Qt6 COMPONENTS Core Quick QuickControls2 Concurrent REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick QuickControls2 Concurrent REQUIRED) add_library(${CURRENT_PROJECT} ${SOURCE_CPP} ${SOURCE_QRC}) target_link_libraries(${CURRENT_PROJECT} PUBLIC - Qt6::Concurrent + Qt${QT_VERSION_MAJOR}::Concurrent QuasarApp QmlNotyfyService) diff --git a/src/ClientLib/SnakeProjectModule/GraphicItem.qml b/src/ClientLib/SnakeProjectModule/GraphicItem.qml index 61e9ded..cc99293 100644 --- a/src/ClientLib/SnakeProjectModule/GraphicItem.qml +++ b/src/ClientLib/SnakeProjectModule/GraphicItem.qml @@ -1,5 +1,5 @@ -import QtQuick -import QtQuick3D +import QtQuick 2.15 +import QtQuick3D 1.15 Model { id: graphicItem diff --git a/src/ClientLib/SnakeProjectModule/ImageView.qml b/src/ClientLib/SnakeProjectModule/ImageView.qml index c5a4455..fbac616 100644 --- a/src/ClientLib/SnakeProjectModule/ImageView.qml +++ b/src/ClientLib/SnakeProjectModule/ImageView.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 2.15 Item { id: imageView diff --git a/src/ClientLib/SnakeProjectModule/MainMenu.qml b/src/ClientLib/SnakeProjectModule/MainMenu.qml index 47d5ea4..4598b7f 100644 --- a/src/ClientLib/SnakeProjectModule/MainMenu.qml +++ b/src/ClientLib/SnakeProjectModule/MainMenu.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 Item { id: item1 diff --git a/src/ClientLib/SnakeProjectModule/MainMenuButton.qml b/src/ClientLib/SnakeProjectModule/MainMenuButton.qml index 3060f38..b16632b 100644 --- a/src/ClientLib/SnakeProjectModule/MainMenuButton.qml +++ b/src/ClientLib/SnakeProjectModule/MainMenuButton.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 Button { id: exit diff --git a/src/ClientLib/SnakeProjectModule/Metrix.qml b/src/ClientLib/SnakeProjectModule/Metrix.qml index 425715c..5f4417f 100644 --- a/src/ClientLib/SnakeProjectModule/Metrix.qml +++ b/src/ClientLib/SnakeProjectModule/Metrix.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Window -import QtQuick.Controls.Material -import QtQuick.Controls +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 Item { readonly property int pointCount: 100; diff --git a/src/ClientLib/SnakeProjectModule/PagePopUp.qml b/src/ClientLib/SnakeProjectModule/PagePopUp.qml index 230fe69..51b0bb7 100644 --- a/src/ClientLib/SnakeProjectModule/PagePopUp.qml +++ b/src/ClientLib/SnakeProjectModule/PagePopUp.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls -import QtQuick.Controls.Material -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Layouts 1.15 Dialog { id: pagePopUp diff --git a/src/ClientLib/SnakeProjectModule/PropertyView.qml b/src/ClientLib/SnakeProjectModule/PropertyView.qml index e190bc0..e7b63f9 100644 --- a/src/ClientLib/SnakeProjectModule/PropertyView.qml +++ b/src/ClientLib/SnakeProjectModule/PropertyView.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 2.15 Item { id: properyView diff --git a/src/ClientLib/SnakeProjectModule/Scene.qml b/src/ClientLib/SnakeProjectModule/Scene.qml index c3bc946..64a3ef0 100644 --- a/src/ClientLib/SnakeProjectModule/Scene.qml +++ b/src/ClientLib/SnakeProjectModule/Scene.qml @@ -1,8 +1,9 @@ -import QtQuick -import QtQuick3D -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick3D 1.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 + View3D { id: scene; @@ -78,7 +79,7 @@ View3D { id: background clearColor: window.color backgroundMode: SceneEnvironment.SkyBox - probeOrientation: Qt.vector3d(0, -90, 0) + //probeOrientation: Qt.vector3d(0, -90, 0) lightProbe: Texture { source: "qrc:/hdr/res/hdr/lebombo_2k.hdr" diff --git a/src/ClientLib/SnakeProjectModule/SettingsView.qml b/src/ClientLib/SnakeProjectModule/SettingsView.qml index 987cc54..85be6e9 100644 --- a/src/ClientLib/SnakeProjectModule/SettingsView.qml +++ b/src/ClientLib/SnakeProjectModule/SettingsView.qml @@ -1,7 +1,7 @@ -import QtQuick -import QtQuick.Controls.Material -import QtQuick.Controls -import QtQuick.Layouts +import QtQuick 2.15 +import QtQuick.Controls.Material 2.15 +import QtQuick.Controls 2.15 +import QtQuick.Layouts 1.15 Item { id: settingsView diff --git a/src/ClientLib/SnakeProjectModule/SnakeItem.qml b/src/ClientLib/SnakeProjectModule/SnakeItem.qml index af007cc..a6a1760 100644 --- a/src/ClientLib/SnakeProjectModule/SnakeItem.qml +++ b/src/ClientLib/SnakeProjectModule/SnakeItem.qml @@ -1,4 +1,4 @@ -import QtQuick +import QtQuick 2.15 GraphicItem { diff --git a/src/ClientLib/SnakeProjectModule/SnakeProject.qml b/src/ClientLib/SnakeProjectModule/SnakeProject.qml index 516c167..ba76d7a 100644 --- a/src/ClientLib/SnakeProjectModule/SnakeProject.qml +++ b/src/ClientLib/SnakeProjectModule/SnakeProject.qml @@ -1,8 +1,8 @@ -import QtQuick -import QtQuick.Window -import QtQuick.Controls +import QtQuick 2.15 +import QtQuick.Window 2.15 +import QtQuick.Controls 2.15 -import NotifyModule +import NotifyModule 1.0 ApplicationWindow { id: mainWindow; diff --git a/src/ClientLib/res/meshes/cube.mesh b/src/ClientLib/res/meshes/cube.mesh index 571a363..603b326 100644 Binary files a/src/ClientLib/res/meshes/cube.mesh and b/src/ClientLib/res/meshes/cube.mesh differ