restore to qt5

This commit is contained in:
Andrei Yankovich 2021-06-05 14:19:08 +03:00
parent 3ef9bd24f9
commit 3405afb40d
14 changed files with 46 additions and 45 deletions

View File

@ -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)

View File

@ -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)

View File

@ -1,5 +1,5 @@
import QtQuick
import QtQuick3D
import QtQuick 2.15
import QtQuick3D 1.15
Model {
id: graphicItem

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -1,4 +1,4 @@
import QtQuick
import QtQuick 2.15
GraphicItem {

View File

@ -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;

Binary file not shown.