QuasarApp/ViewSolutions
4
0
Fork 0
mirror of https://github.com/QuasarApp/ViewSolutions.git synced 2025-04-29 11:14:40 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:QuasarApp/ViewSolutions

Browse Source
This commit is contained in:
Andrei Yankovich 2021-02-01 13:56:36 +03:00
commit 025936a080
8 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2018-2020 QuasarApp. # Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying # Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies # Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed. # of this license document, but changing it is not allowed.

5
Examples/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2018-2020 QuasarApp. # Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying # Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies # Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed. # 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 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) 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 file(GLOB SOURCE_CPP
"src/*.cpp" "src/*.cpp"

2
Examples/src/main.cpp
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
# #
# Copyright (C) 2018-2020 QuasarApp. # Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying # Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies # Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed. # of this license document, but changing it is not allowed.

2
Examples/src/main.qml
View File

@ -1,7 +1,7 @@
/**************************************************************************** /****************************************************************************
** **
# #
# Copyright (C) 2018-2020 QuasarApp. # Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying # Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies # Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed. # of this license document, but changing it is not allowed.

2
ViewSolutions/CMake

@ -1 +1 @@
Subproject commit 0c7a0ac156d9ea8e43eac7829d25e977801a219e Subproject commit 7d0eea26fac93eeab7ea37e500b0094bad152522

7
ViewSolutions/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2018-2020 QuasarApp. # Copyright (C) 2018-2021 QuasarApp.
# Distributed under the lgplv3 software license, see the accompanying # Distributed under the lgplv3 software license, see the accompanying
# Everyone is permitted to copy and distribute verbatim copies # Everyone is permitted to copy and distribute verbatim copies
# of this license document, but changing it is not allowed. # 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 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) 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 file(GLOB SOURCE_CPP
"src/*.cpp" "src/*.cpp"
@ -33,7 +34,7 @@ file(GLOB SOURCE_CPP
) )
add_library(${PROJECT_NAME} ${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") target_include_directories(${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/src")

2
ViewSolutions/src/ViewSolutionsModule/ViewPortGradientPage.qml
View File

@ -52,7 +52,7 @@ ViewPortPage {
} }
GradientStop { GradientStop {
position: 0.70; position: 0.6;
color: "#00" + baseColor; color: "#00" + baseColor;
} }
} }

5
ViewSolutions/src/ViewSolutionsModule/ViewPortPage.qml
View File

@ -35,11 +35,6 @@ ViewPortDelegatBase {
content: Item { content: Item {
id: privatePage id: privatePage
Component.onDestruction: {
header.destroy()
sourceText.destroy()
}
clip: true clip: true
TextEdit { TextEdit {
id: header id: header