From 7439507aa2977380c78fc6cf7914831f30ce2041 Mon Sep 17 00:00:00 2001 From: Arseniy Masiuk Date: Fri, 11 Jul 2025 14:47:25 +0200 Subject: [PATCH 1/2] Fixed to be built with Qt6 --- CMakeLists.txt | 18 +++++++++--------- example/CMakeLists.txt | 14 +++++++------- example/src/MainWindow.cpp | 1 + src/internal/QCodeEditor.cpp | 2 +- 4 files changed, 18 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 40d5617..7857f98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,9 +1,9 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.11) project(QCodeEditor) -set(CMAKE_CXX_STANDARD 11) +set(CMAKE_CXX_STANDARD 17) -option(BUILD_EXAMPLE "Example building required" Off) +option(BUILD_EXAMPLE "Example building required" On) if (${BUILD_EXAMPLE}) message(STATUS "QCodeEditor example will be built.") @@ -75,9 +75,9 @@ set(CMAKE_AUTOMOC On) set(CMAKE_AUTORCC ON) # Find includes in corresponding build directories -find_package(Qt5Core CONFIG REQUIRED) -find_package(Qt5Widgets CONFIG REQUIRED) -find_package(Qt5Gui CONFIG REQUIRED) +find_package(Qt6Core CONFIG REQUIRED) +find_package(Qt6Widgets CONFIG REQUIRED) +find_package(Qt6Gui CONFIG REQUIRED) add_library(QCodeEditor STATIC ${RESOURCES_FILE} @@ -104,7 +104,7 @@ if(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX) target_link_libraries(QCodeEditor - Qt5::Core - Qt5::Widgets - Qt5::Gui + Qt6::Core + Qt6::Widgets + Qt6::Gui ) diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt index 0e0bf4a..62780d2 100644 --- a/example/CMakeLists.txt +++ b/example/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.6) +cmake_minimum_required(VERSION 3.11) project(QCodeEditorExample) set(CMAKE_CXX_STANDARD 17) @@ -6,9 +6,9 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_AUTOMOC On) set(CMAKE_AUTORCC ON) -find_package(Qt5Core CONFIG REQUIRED) -find_package(Qt5Widgets CONFIG REQUIRED) -find_package(Qt5Gui CONFIG REQUIRED) +find_package(Qt6Core CONFIG REQUIRED) +find_package(Qt6Widgets CONFIG REQUIRED) +find_package(Qt6Gui CONFIG REQUIRED) add_executable(QCodeEditorExample resources/demo_resources.qrc @@ -22,8 +22,8 @@ target_include_directories(QCodeEditorExample PUBLIC ) target_link_libraries(QCodeEditorExample - Qt5::Core - Qt5::Widgets - Qt5::Gui QCodeEditor + Qt6::Core + Qt6::Widgets + Qt6::Gui ) \ No newline at end of file diff --git a/example/src/MainWindow.cpp b/example/src/MainWindow.cpp index 5552835..e4f5897 100644 --- a/example/src/MainWindow.cpp +++ b/example/src/MainWindow.cpp @@ -22,6 +22,7 @@ #include #include #include +#include MainWindow::MainWindow(QWidget* parent) : QMainWindow(parent), diff --git a/src/internal/QCodeEditor.cpp b/src/internal/QCodeEditor.cpp index 1aa93e7..d4a02df 100644 --- a/src/internal/QCodeEditor.cpp +++ b/src/internal/QCodeEditor.cpp @@ -537,7 +537,7 @@ void QCodeEditor::keyPressEvent(QKeyEvent* e) { // Shortcut for moving line to left if (m_replaceTab && e->key() == Qt::Key_Backtab) { - indentationLevel = std::min(indentationLevel, m_tabReplace.size()); + indentationLevel = std::min(indentationLevel, m_tabReplace.size()); auto cursor = textCursor(); From 1f2065feebd8e630d1af8e390f9e7f5888a1d150 Mon Sep 17 00:00:00 2001 From: Ars Masiuk Date: Fri, 11 Jul 2025 14:49:32 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71b9c8b..35c6049 100644 --- a/README.md +++ b/README.md @@ -7,8 +7,9 @@ must not use a resource file with the same name. (It's not a project from a Qt example.) ## Requirements -0. C++11 featured compiler. -0. Qt 5. +1. C++17 featured compiler. +2. Qt 6. +3. CMake 3.11. ## Abilities 1. Auto parentheses.