Qt6 support

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
 )

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.

example/CMakeLists.txt

@@ -1,14 +1,14 @@
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.11)
 project(QCodeEditorExample)
 
 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
 )

example/src/MainWindow.cpp

@@ -22,6 +22,7 @@
 #include <QSpinBox>
 #include <QGroupBox>
 #include <QLabel>
+#include <QFile>
 
 MainWindow::MainWindow(QWidget* parent) :
     QMainWindow(parent),

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<int>(indentationLevel, m_tabReplace.size());
 
       auto cursor = textCursor();