Skip to content

Use Qt6 #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bkmgit wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Use Qt6 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30119a2
Update to Qt6
bkmgit Jun 9, 2026
8f0b9fa
Grammar fix
bkmgit Jun 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions AutoTests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion Parser/Attributes.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Parser/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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.