diff --git a/CMakeLists.txt b/CMakeLists.txt index f5305cf..c9d6e86 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2020 QuasarApp. +# Copyright (C) 2018-2021 QuasarApp. # Distributed under the lgplv3 software license, see the accompanying # Everyone is permitted to copy and distribute verbatim copies # of this license document, but changing it is not allowed. diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 4f4258e..3144f78 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2020 QuasarApp. +# Copyright (C) 2018-2021 QuasarApp. # Distributed under the lgplv3 software license, see the accompanying # Everyone is permitted to copy and distribute verbatim copies # of this license document, but changing it is not allowed. @@ -17,7 +17,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt5 COMPONENTS Core REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED) file(GLOB SOURCE_CPP "src/*.cpp" diff --git a/Examples/src/main.cpp b/Examples/src/main.cpp index 5c43b07..8d779f9 100644 --- a/Examples/src/main.cpp +++ b/Examples/src/main.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** # -# Copyright (C) 2018-2020 QuasarApp. +# Copyright (C) 2018-2021 QuasarApp. # Distributed under the lgplv3 software license, see the accompanying # Everyone is permitted to copy and distribute verbatim copies # of this license document, but changing it is not allowed. diff --git a/Examples/src/main.qml b/Examples/src/main.qml index 7f29de9..ab8022f 100644 --- a/Examples/src/main.qml +++ b/Examples/src/main.qml @@ -1,7 +1,7 @@ /**************************************************************************** ** # -# Copyright (C) 2018-2020 QuasarApp. +# Copyright (C) 2018-2021 QuasarApp. # Distributed under the lgplv3 software license, see the accompanying # Everyone is permitted to copy and distribute verbatim copies # of this license document, but changing it is not allowed. diff --git a/ViewSolutions/CMake b/ViewSolutions/CMake index 0c7a0ac..7d0eea2 160000 --- a/ViewSolutions/CMake +++ b/ViewSolutions/CMake @@ -1 +1 @@ -Subproject commit 0c7a0ac156d9ea8e43eac7829d25e977801a219e +Subproject commit 7d0eea26fac93eeab7ea37e500b0094bad152522 diff --git a/ViewSolutions/CMakeLists.txt b/ViewSolutions/CMakeLists.txt index 89757d8..2f8bb07 100644 --- a/ViewSolutions/CMakeLists.txt +++ b/ViewSolutions/CMakeLists.txt @@ -1,5 +1,5 @@ # -# Copyright (C) 2018-2020 QuasarApp. +# Copyright (C) 2018-2021 QuasarApp. # Distributed under the lgplv3 software license, see the accompanying # Everyone is permitted to copy and distribute verbatim copies # of this license document, but changing it is not allowed. @@ -24,7 +24,8 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) -find_package(Qt5 COMPONENTS Core Quick QuickControls2 REQUIRED) +find_package(QT NAMES Qt6 Qt5 COMPONENTS Core Quick QuickControls2 REQUIRED) +find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core Quick QuickControls2 REQUIRED) file(GLOB SOURCE_CPP "src/*.cpp" @@ -33,7 +34,7 @@ file(GLOB SOURCE_CPP ) add_library(${PROJECT_NAME} ${SOURCE_CPP}) -target_link_libraries(${PROJECT_NAME} PUBLIC Qt5::Core Qt5::Quick Qt5::QuickControls2) +target_link_libraries(${PROJECT_NAME} PUBLIC Qt::Core Qt::Quick Qt::QuickControls2) target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src") diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml index d96ffdb..c488635 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml @@ -52,7 +52,7 @@ ViewPortPage { } GradientStop { - position: 0.70; + position: 0.6; color: "#00" + baseColor; } } diff --git a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml index aed35a5..fbb2fcf 100644 --- a/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml +++ b/ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml @@ -35,11 +35,6 @@ ViewPortDelegatBase { content: Item { id: privatePage - Component.onDestruction: { - header.destroy() - sourceText.destroy() - } - clip: true TextEdit { id: header