Skip to content
Snippets Groups Projects
Commit 49f217d4 authored by Ilya Kotov's avatar Ilya Kotov
Browse files

changed minimal Qt version to 6.2

parent 322a36ba
No related branches found
No related tags found
No related merge requests found
cmake_minimum_required(VERSION 3.16.0) cmake_minimum_required(VERSION 3.18.0)
project(qt6ct LANGUAGES CXX) project(qt6ct LANGUAGES CXX)
...@@ -20,11 +20,14 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) ...@@ -20,11 +20,14 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN 1)
set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON) set(CMAKE_AUTORCC ON)
set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOUIC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_BUILD_RPATH_USE_ORIGIN ON) set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000 -DUSE_WIDGETS) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060200 -DUSE_WIDGETS -DQT_DEPRECATED_WARNINGS -DQT_MESSAGELOGCONTEXT)
add_compile_options(-Wall -Wextra)
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src)
find_package(Qt6 REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools) find_package(Qt6 6.2 CONFIG REQUIRED COMPONENTS BuildInternals Core Widgets OPTIONAL_COMPONENTS LinguistTools)
get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION) get_target_property(QT_QTPATHS_EXECUTABLE Qt6::qtpaths IMPORTED_LOCATION)
......
...@@ -8,9 +8,9 @@ Official home page: https://www.opencode.net/trialuser/qt6ct ...@@ -8,9 +8,9 @@ Official home page: https://www.opencode.net/trialuser/qt6ct
Requirements: Requirements:
- GNU Linux or FreeBSD - GNU Linux or FreeBSD
- qtbase >= 6.0.0 - qtbase >= 6.2.0
- qtsvg >= 6.0.0 (Runtime dependency for the SVG icon support) - qtsvg >= 6.2.0 (Runtime dependency for the SVG icon support)
- qttools >= 6.0.0 (For build only) - qttools >= 6.2.0 (For build only)
Installation: Installation:
......
...@@ -8,8 +8,8 @@ QMAKE_DISTCLEAN += -r .build ...@@ -8,8 +8,8 @@ QMAKE_DISTCLEAN += -r .build
QMAKE_DISTCLEAN += translations/*.qm QMAKE_DISTCLEAN += translations/*.qm
CONFIG += hide_symbols c++17 ordered CONFIG += hide_symbols c++17 ordered
DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 QT_DEPRECATED_WARNINGS_SINCE=0x060200 DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH QT_MESSAGELOGCONTEXT
DEFINES += QT_NO_CAST_FROM_BYTEARRAY QT_STRICT_ITERATORS QT_NO_FOREACH DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060200 QT_DEPRECATED_WARNINGS
QMAKE_DISTCLEAN += -r .build QMAKE_DISTCLEAN += -r .build
#*-g++ { #*-g++ {
...@@ -21,9 +21,8 @@ INCLUDEPATH += ../qt6ct-common ...@@ -21,9 +21,8 @@ INCLUDEPATH += ../qt6ct-common
QMAKE_LIBDIR += ../qt6ct-common QMAKE_LIBDIR += ../qt6ct-common
LIBS += -lqt6ct-common LIBS += -lqt6ct-common
!isEqual(QT_MAJOR_VERSION, 6)|!greaterThan(QT_MINOR_VERSION, 1) {
!isEqual (QT_MAJOR_VERSION, 6) { error("Use Qt 6.2.0 or higher.")
error("Use Qt 6.0.0 or higher.")
} }
#Install paths #Install paths
......
...@@ -22,8 +22,6 @@ set(app_SRCS ...@@ -22,8 +22,6 @@ set(app_SRCS
qt6ct.cpp qt6ct.cpp
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
add_library(qt6ct-common SHARED ${app_SRCS}) add_library(qt6ct-common SHARED ${app_SRCS})
set_target_properties(qt6ct-common PROPERTIES VERSION ${QT6CT_VERSION}) set_target_properties(qt6ct-common PROPERTIES VERSION ${QT6CT_VERSION})
target_link_libraries(qt6ct-common PRIVATE Qt6::Gui) target_link_libraries(qt6ct-common PRIVATE Qt6::Gui)
......
...@@ -5,8 +5,6 @@ set(app_SRCS ...@@ -5,8 +5,6 @@ set(app_SRCS
qt6ctplatformtheme.cpp qt6ctplatformtheme.cpp
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
add_library(qt6ct-qtplugin MODULE ${app_SRCS}) add_library(qt6ct-qtplugin MODULE ${app_SRCS})
set_target_properties(qt6ct-qtplugin PROPERTIES OUTPUT_NAME qt6ct) set_target_properties(qt6ct-qtplugin PROPERTIES OUTPUT_NAME qt6ct)
target_link_libraries(qt6ct-qtplugin PRIVATE Qt6::Widgets Qt6::GuiPrivate qt6ct-common) target_link_libraries(qt6ct-qtplugin PRIVATE Qt6::Widgets Qt6::GuiPrivate qt6ct-common)
......
...@@ -7,8 +7,6 @@ set(app_SRCS ...@@ -7,8 +7,6 @@ set(app_SRCS
qt6ctproxystyle.cpp qt6ctproxystyle.cpp
) )
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../)
add_library(qt6ct-style MODULE ${app_SRCS}) add_library(qt6ct-style MODULE ${app_SRCS})
target_link_libraries(qt6ct-style PRIVATE Qt6::Widgets qt6ct-common) target_link_libraries(qt6ct-style PRIVATE Qt6::Widgets qt6ct-common)
install(TARGETS qt6ct-style DESTINATION ${PLUGINDIR}/styles) install(TARGETS qt6ct-style DESTINATION ${PLUGINDIR}/styles)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment