diff --git a/AutoTests/CMakeLists.txt b/AutoTests/CMakeLists.txt index 7efab90..aeeef76 100644 --- a/AutoTests/CMakeLists.txt +++ b/AutoTests/CMakeLists.txt @@ -1,13 +1,13 @@ enable_testing() -find_package(Qt5Test 5.3.0 REQUIRED NO_MODULE) +find_package(Qt6Test REQUIRED NO_MODULE) -qt5_add_resources(TestDataResources_SRCS TestData.qrc) +qt6_add_resources(TestDataResources_SRCS TestData.qrc) ########### next target ############### set(ParserTests_SRCS tst_ParserTests.cpp TestHelpers.cpp ${TestDataResources_SRCS}) add_executable(OrgModeParser_ParserTests ${ParserTests_SRCS}) -target_link_libraries(OrgModeParser_ParserTests Qt5::Test OrgModeParser) +target_link_libraries(OrgModeParser_ParserTests Qt6::Test OrgModeParser) target_include_directories(OrgModeParser_ParserTests PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) add_test(OrgModeParser_ParserTests OrgModeParser_ParserTests) set_target_properties(OrgModeParser_ParserTests PROPERTIES MACOSX_BUNDLE FALSE) @@ -17,7 +17,7 @@ set_property(TARGET OrgModeParser_ParserTests PROPERTY CXX_STANDARD 11) set(ClockTests_SRCS tst_ClockTests.cpp TestHelpers.cpp ${TestDataResources_SRCS}) add_executable(OrgModeParser_ClockTests ${ClockTests_SRCS}) -target_link_libraries(OrgModeParser_ClockTests Qt5::Test OrgModeParser) +target_link_libraries(OrgModeParser_ClockTests Qt6::Test OrgModeParser) target_include_directories(OrgModeParser_ClockTests PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) add_test(OrgModeParser_ClockTests OrgModeParser_ClockTests) set_target_properties(OrgModeParser_ClockTests PROPERTIES MACOSX_BUNDLE FALSE) @@ -27,7 +27,7 @@ set_property(TARGET OrgModeParser_ClockTests PROPERTY CXX_STANDARD 11) set(Benchmarks_SRCS tst_Benchmarks.cpp TestHelpers.cpp ${TestDataResources_SRCS}) add_executable(OrgModeParser_Benchmarks ${Benchmarks_SRCS}) -target_link_libraries(OrgModeParser_Benchmarks Qt5::Test OrgModeParser) +target_link_libraries(OrgModeParser_Benchmarks Qt6::Test OrgModeParser) target_include_directories(OrgModeParser_Benchmarks PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) add_test(OrgModeParser_Benchmarks OrgModeParser_Benchmarks) set_target_properties(OrgModeParser_Benchmarks PROPERTIES MACOSX_BUNDLE FALSE) diff --git a/CMakeLists.txt b/CMakeLists.txt index 929a256..e2bdb38 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.16 FATAL_ERROR) project(OrgModeParser) include(GenerateExportHeader) -find_package(Qt5Core 5.3.0 REQUIRED NO_MODULE) +find_package(Qt6Core REQUIRED NO_MODULE) enable_testing() set(CMAKE_AUTOMOC ON) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/Parser/Attributes.cpp b/Parser/Attributes.cpp index 508cc36..f74bb69 100644 --- a/Parser/Attributes.cpp +++ b/Parser/Attributes.cpp @@ -98,7 +98,7 @@ const QStringList Attributes::drawerNames() const static const QStringList defaults = QStringList() << QStringLiteral("PROPERTIES"); try { const QString drawersAttribute = fileAttribute(QString::fromLatin1("DRAWERS")); - const QStringList names = drawersAttribute.split(QRegExp(QLatin1String("\\s+"))); + const QStringList names = drawersAttribute.split(QRegularExpression(QLatin1String("\\s+"))); return defaults + names; } catch (const RuntimeException&) { // No drawer attribute defined: diff --git a/Parser/CMakeLists.txt b/Parser/CMakeLists.txt index f6226a0..31e84f5 100644 --- a/Parser/CMakeLists.txt +++ b/Parser/CMakeLists.txt @@ -34,7 +34,7 @@ set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) add_library(OrgModeParser SHARED ${OrgModeParser_LIB_SRCS}) generate_export_header(OrgModeParser) -target_link_libraries(OrgModeParser PUBLIC Qt5::Core) +target_link_libraries(OrgModeParser PUBLIC Qt6::Core) target_include_directories(OrgModeParser PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(OrgModeParser PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) set_property(TARGET OrgModeParser PROPERTY CXX_STANDARD 14) diff --git a/README.md b/README.md index 16989d2..200604a 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ possibilities are endless. ### Installation -OrgModeParser requires Qt 5.3 and CMake 3.2. Newer versions should +OrgModeParser requires Qt 6.0 and CMake 3.2. Newer versions should work as well. On most Linux distributions, shipped packages should be fine. Installation is straight-forward: @@ -95,4 +95,4 @@ the tests, go to the build directory and run `make test`. To fix or extend the functionality of OrgModeParser, provide examples of Org files and specify where OrgModeParser parses it wrong or does not implement features. When submitting pull requests on -Github. remember every new piece of code needs to be auto-tested. +Github. Remember every new piece of code needs to be auto-tested.