Reason:

CMakeLists.txt

@@ -114,12 +114,12 @@ else()
 endif()
 
 find_package(
-  Qt5 5.12
+  Qt6
   COMPONENTS ${QT_MODULES} LinguistTools
   REQUIRED)
 if(FLATPAK)
   find_package(
-    Qt5 5.15
+    Qt6
     COMPONENTS XcbQpa
     REQUIRED)
   add_compile_definitions(FLATPAK)
@@ -135,7 +135,7 @@ endif()
 
 include(GNUInstallDirs) # Defines some variables as BINDIR, LIBDIR, ...
 
-set(QT_TRANSLATIONS_DIR "${Qt5_DIR}/../../../translations")
+set(QT_TRANSLATIONS_DIR "${Qt6_DIR}/../../../translations")
 set(QT_TRANSLATIONS_DIR "/usr/share/qt/translations")
 
 if(APPLE)
@@ -145,8 +145,8 @@ if(APPLE)
     # dependencies are to the release libraries (e.g. QtGui_debug depends on
     # QtCore). This causes multiple symbol definition errors at application load
     # time.
-    get_target_property(LOCATION Qt5::${QT_MODULE} LOCATION)
-    set_target_properties(Qt5::${QT_MODULE} PROPERTIES IMPORTED_LOCATION_DEBUG
+    get_target_property(LOCATION Qt6::${QT_MODULE} LOCATION)
+    set_target_properties(Qt6::${QT_MODULE} PROPERTIES IMPORTED_LOCATION_DEBUG
                                                        ${LOCATION})
   endforeach()
 endif()

dep/scintilla/CMakeLists.txt

@@ -54,7 +54,7 @@ target_compile_definitions(
 
 target_include_directories(scintilla PUBLIC ${SCINTILLA_DIR}/src)
 
-target_link_libraries(scintilla Qt5::Widgets lexilla)
+target_link_libraries(scintilla Qt6::Widgets lexilla)
 
 set_target_properties(scintilla PROPERTIES AUTOMOC ON)
 

l10n/CMakeLists.txt

@@ -20,9 +20,9 @@ endforeach()
 
 if(UPDATE_TRANSLATIONS)
   # FIXME: Clean removes the .ts files.
-  qt5_create_translation(QM_FILES ${SOURCE_FILES} ${TS_FILES})
+  qt6_create_translation(QM_FILES ${SOURCE_FILES} ${TS_FILES})
 else()
-  qt5_add_translation(QM_FILES ${TS_FILES})
+  qt6_add_translation(QM_FILES ${TS_FILES})
 endif()
 
 add_custom_target(translations DEPENDS ${QM_FILES})

pack/CMakeLists.txt

@@ -28,13 +28,13 @@ if(FLATPAK)
   qt_import_plugins(gittyup INCLUDE ${QT_PLUGINS})
 elseif(NOT USE_SYSTEM_QT)
   foreach(QT_PLUGIN ${QT_PLUGINS})
-    if(NOT TARGET Qt5::${QT_PLUGIN})
+    if(NOT TARGET Qt6::${QT_PLUGIN})
       if(UNIX OR APPLE)
         continue()
       endif()
     endif()
 
-    get_target_property(PLUGIN Qt5::${QT_PLUGIN} LOCATION_${CMAKE_BUILD_TYPE})
+    get_target_property(PLUGIN Qt6::${QT_PLUGIN} LOCATION_${CMAKE_BUILD_TYPE})
     get_filename_component(FILE_NAME ${PLUGIN} NAME)
     get_filename_component(DIR ${PLUGIN} DIRECTORY)
     get_filename_component(DIR_NAME ${DIR} NAME)
@@ -78,7 +78,7 @@ elseif(NOT USE_SYSTEM_QT)
 
   # Install Qt libraries.
   foreach(QT_MODULE ${QT_MODULES})
-    get_target_property(QT_LIBRARY Qt5::${QT_MODULE}
+    get_target_property(QT_LIBRARY Qt6::${QT_MODULE}
                         LOCATION_${CMAKE_BUILD_TYPE})
 
     if(APPLE)
@@ -131,8 +131,8 @@ endif()
 
 # Install XcbQpa library.
 if(UNIX AND NOT APPLE)
-  set(LIB_NAME libQt5XcbQpa)
-  get_target_property(QT_CORE_LIBRARY Qt5::Core LOCATION)
+  set(LIB_NAME libQt6XcbQpa)
+  get_target_property(QT_CORE_LIBRARY Qt6::Core LOCATION)
   get_filename_component(LIB_PATH ${QT_CORE_LIBRARY} PATH)
   get_filename_component(LIB_EXT ${QT_CORE_LIBRARY} EXT)
 

src/app/CMakeLists.txt

@@ -22,7 +22,7 @@ file(GLOB SCINTILLUA_LEXERS ${SRC_SCINTILLUA_LEXERS_DIR}/*.lua)
 file(GLOB LUA_PLUGINS ${CONF_DIR}/plugins/*.lua ${CONF_DIR}/plugins/*.txt)
 
 # Build resources.
-qt5_add_resources(RESOURCES ${RSRC_DIR}/resources.qrc)
+qt6_add_resources(RESOURCES ${RSRC_DIR}/resources.qrc)
 
 # Generate acknowledgments.
 set(DOC_SOURCE_DIR ${CMAKE_SOURCE_DIR}/docs)
@@ -67,12 +67,12 @@ target_compile_definitions(
   PRIVATE QT_TRANSLATIONS_DIR="${QT_TRANSLATIONS_DIR}"
           BUILD_DESCRIPTION="${BUILD_DESCRIPTION}")
 
-target_link_libraries(app conf git ui update Qt5::Widgets)
+target_link_libraries(app conf git ui update Qt6::Widgets)
 
 set_target_properties(app PROPERTIES AUTOMOC ON)
 
 if(UNIX AND NOT APPLE)
-  target_link_libraries(app Qt5::DBus)
+  target_link_libraries(app Qt6::DBus)
 endif()
 
 # Add main executable.
@@ -164,7 +164,7 @@ install(
   COMPONENT ${GITTYUP_NAME})
 
 if(APPLE)
-  get_target_property(QT_LIBRARY Qt5::Core LOCATION)
+  get_target_property(QT_LIBRARY Qt6::Core LOCATION)
   get_filename_component(QT_FRAMEWORK ${QT_LIBRARY} DIRECTORY)
   get_filename_component(RPATH ${QT_FRAMEWORK} DIRECTORY)
 

src/app/Gittyup.cpp

@@ -13,8 +13,6 @@
 #include <QMessageBox>
 
 int main(int argc, char *argv[]) {
-  Application::setAttribute(Qt::AA_EnableHighDpiScaling);
-  Application::setAttribute(Qt::AA_UseHighDpiPixmaps);
   Application app(argc, argv, true);
 
   // Check if only one running instance is allowed and already running

src/cli/CMakeLists.txt

@@ -7,4 +7,4 @@ endif()
 
 add_library(cli Installer.cpp ${INSTALLER_IMPL_FILE})
 
-target_link_libraries(cli Qt5::Core ${INSTALLER_IMPL_LIBS})
+target_link_libraries(cli Qt6::Core ${INSTALLER_IMPL_LIBS})

src/conf/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_library(conf ConfFile.cpp Settings.cpp Setting.cpp RecentRepositories.cpp
                  RecentRepository.cpp)
 
-target_link_libraries(conf lua Qt5::Core util)
+target_link_libraries(conf lua Qt6::Core util)
 
 # SRC_ definitions point to the source directly
 target_compile_definitions(

src/conf/Settings.cpp

@@ -13,6 +13,7 @@
 #include "qtsupport.h"
 #include <QCoreApplication>
 #include <QDir>
+#include <QRegularExpression>
 #include <QSettings>
 #include <QStandardPaths>
 
@@ -117,8 +118,8 @@ QString Settings::lexer(const QString &filename) {
     QVariantMap map(lexers.value(key).toMap());
     if (map.contains("patterns")) {
       foreach (QString pattern, map.value("patterns").toString().split(",")) {
-        QRegExp regExp(pattern, CS, QRegExp::Wildcard);
-        if (regExp.exactMatch(name))
+        QRegularExpression regExp{QRegularExpression::fromWildcard(pattern, CS)};
+        if (regExp.match(name).hasMatch())
           return key;
       }
     }

src/cred/CMakeLists.txt

@@ -1,5 +1,7 @@
 add_library(cred Cache.cpp Store.cpp CredentialHelper.cpp GitCredential.cpp)
 
-target_link_libraries(cred conf git Qt5::Core)
+target_link_libraries(cred conf git Qt6::Core)
+add_library(cred Cache.cpp CredentialHelper.cpp GitCredential.cpp
+                 ${CREDENTIAL_IMPL_FILE})
 
 set_target_properties(cred PROPERTIES AUTOMOC ON)

src/dialogs/CMakeLists.txt

@@ -39,13 +39,15 @@ target_compile_definitions(
 
 target_include_directories(dialogs PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
 
+find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
+
 target_link_libraries(
   dialogs
   cli
   conf
   cred
   host
   index
-  Qt5::Widgets)
+  Qt6::Widgets)
 
 set_target_properties(dialogs PROPERTIES AUTOMOC ON)

src/dialogs/ConfigDialog.cpp

@@ -30,6 +30,7 @@
 #include "ui/MainWindow.h"
 #include "ui/RepoView.h"
 #include <QAction>
+#include <QActionGroup>
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QFormLayout>
@@ -506,7 +507,7 @@ class LfsPanel : public QWidget {
               watcher->deleteLater();
             });
 
-    watcher->setFuture(QtConcurrent::run(repo, &git::Repository::lfsTracked));
+    watcher->setFuture(QtConcurrent::run(&git::Repository::lfsTracked, repo));
 
     Footer *footer = new Footer(includedList);
     connect(footer, &Footer::plusClicked, this,

src/dialogs/DeleteBranchDialog.cpp

@@ -61,8 +61,9 @@ DeleteBranchDialog::DeleteBranchDialog(const git::Branch &branch,
 
       entry->setBusy(true);
       QStringList refspecs(QString(":%1").arg(upstreamName));
+      git::Result (git::Remote::*push)(git::Remote::Callbacks*, const QStringList&) = &git::Remote::push;
       watcher->setFuture(
-          QtConcurrent::run(remote, &git::Remote::push, callbacks, refspecs));
+          QtConcurrent::run(push, remote, callbacks, refspecs));
 
       connect(watcher, &QFutureWatcher<git::Result>::finished, watcher,
               [entry, watcher, callbacks, remoteName] {

src/dialogs/DeleteTagDialog.cpp

@@ -53,8 +53,9 @@ DeleteTagDialog::DeleteTagDialog(const git::TagRef &tag, QWidget *parent)
 
       entry->setBusy(true);
       QStringList refspecs(QString(":refs/tags/%1").arg(name));
+      git::Result (git::Remote::*push)(git::Remote::Callbacks*, const QStringList&) = &git::Remote::push;
       watcher->setFuture(
-          QtConcurrent::run(remote, &git::Remote::push, callbacks, refspecs));
+          QtConcurrent::run(push, remote, callbacks, refspecs));
 
       connect(watcher, &QFutureWatcher<git::Result>::finished, watcher,
               [entry, watcher, callbacks, remoteName] {

src/dialogs/DiffPanel.cpp

@@ -21,7 +21,6 @@
 #include <QHBoxLayout>
 #include <QPushButton>
 #include <QSpinBox>
-#include <QTextCodec>
 
 DiffPanel::DiffPanel(const git::Repository &repo, QWidget *parent)
     : QWidget(parent),
@@ -45,12 +44,24 @@ DiffPanel::DiffPanel(const git::Repository &repo, QWidget *parent)
   });
 
   // encoding
+
+  static std::array encodings{
+    "Utf8",
+    "Utf16",
+    "Utf16LE",
+    "Utf16BE",
+    "Utf32",
+    "Utf32LE",
+    "Utf32BE",
+    "Latin1",
+  };
+
   QComboBox *encoding = new QComboBox(this);
   encoding->addItem(tr("System Locale"), -1);
   encoding->insertSeparator(encoding->count());
-  foreach (int mib, QTextCodec::availableMibs())
-    encoding->addItem(QTextCodec::codecForMib(mib)->name(), mib);
-
+  for (int i = 0; i < encodings.size(); i++) {
+    encoding->addItem(encodings[i], i);
+  }
   QString name = mConfig.value<QString>("gui.encoding");
   if (!name.isEmpty())
     encoding->setCurrentIndex(encoding->findText(name));

src/dialogs/IconLabel.cpp

@@ -22,8 +22,7 @@ QSize IconLabel::minimumSizeHint() const { return sizeHint(); }
 
 void IconLabel::paintEvent(QPaintEvent *event) {
   QSize size = sizeHint();
-  QWidget *win = window();
   QPainter(this).drawPixmap(
       QStyle::alignedRect(Qt::LeftToRight, Qt::AlignHCenter, size, rect()),
-      mIcon.pixmap(win ? win->windowHandle() : nullptr, size));
+      mIcon.pixmap(size, window()->devicePixelRatio()));
 }

src/dialogs/SettingsDialog.cpp

@@ -27,6 +27,7 @@
 #include "ui/RepoView.h"
 #include "update/Updater.h"
 #include <QAction>
+#include <QActionGroup>
 #include <QApplication>
 #include <QCheckBox>
 #include <QComboBox>

src/editor/PlatQt.cpp

@@ -329,7 +329,7 @@ void SurfaceImpl::MeasureWidths(Font &font, std::string_view s,
 
 XYPOSITION SurfaceImpl::WidthText(Font &font, std::string_view s) {
   QFontMetricsF metrics(*static_cast<QFont *>(font.GetID()), device);
-  return metrics.width(QString::fromUtf8(s.data(), s.length()));
+  return metrics.horizontalAdvance(QString::fromUtf8(s.data(), s.length()));
 }
 
 XYPOSITION SurfaceImpl::Ascent(Font &font) {

src/editor/ScintillaQt.cpp

@@ -327,7 +327,8 @@ void ScintillaQt::keyPressEvent(QKeyEvent *event) {
 
     QString text = event->text();
     if (input && !text.isEmpty() && text[0].isPrint()) {
-      InsertCharacter(text.toStdString(), CharacterSource::directInput);
+      QByteArray utext = text.toUtf8();
+      InsertCharacter(std::string_view(utext.data(), utext.size()), CharacterSource::directInput);
     } else {
       event->ignore();
     }
@@ -430,7 +431,7 @@ void ScintillaQt::dragEnterEvent(QDragEnterEvent *event) {
   if (event->mimeData()->hasText()) {
     event->acceptProposedAction();
 
-    Point point = PointFromQPoint(event->pos());
+    Point point = PointFromQPoint(event->position().toPoint());
     SetDragPosition(
         SPositionFromLocation(point, false, false, UserVirtualSpace()));
   } else {
@@ -447,7 +448,7 @@ void ScintillaQt::dragMoveEvent(QDragMoveEvent *event) {
   if (event->mimeData()->hasText()) {
     event->acceptProposedAction();
 
-    Point point = PointFromQPoint(event->pos());
+    Point point = PointFromQPoint(event->position().toPoint());
     SetDragPosition(
         SPositionFromLocation(point, false, false, UserVirtualSpace()));
   } else {
@@ -460,7 +461,7 @@ void ScintillaQt::dropEvent(QDropEvent *event) {
     event->acceptProposedAction();
 
     const QMimeData *data = event->mimeData();
-    Point point = PointFromQPoint(event->pos());
+    Point point = PointFromQPoint(event->position().toPoint());
     bool move =
         (event->source() == this && event->proposedAction() == Qt::MoveAction);
 
@@ -520,8 +521,8 @@ void ScintillaQt::inputMethodEvent(QInputMethodEvent *event) {
       const unsigned int ucWidth = commitStr.at(i).isHighSurrogate() ? 2 : 1;
       const QString oneCharUTF16 = commitStr.mid(i, ucWidth);
       const QByteArray oneChar = oneCharUTF16.toUtf8();
-
-      InsertCharacter(oneChar.toStdString(), CharacterSource::directInput);
+      const int oneCharLen = oneChar.length();
+      InsertCharacter(std::string_view(oneChar.data(), oneCharLen), CharacterSource::directInput);
       i += ucWidth;
     }
 
@@ -604,7 +605,7 @@ void ScintillaQt::inputMethodEvent(QInputMethodEvent *event) {
       numBytes += oneCharLen;
       imeCharPos[i + 1] = numBytes;
 
-      InsertCharacter(oneChar.toStdString(), CharacterSource::directInput);
+      InsertCharacter(std::string_view(oneChar.data(), oneCharLen), CharacterSource::directInput);
 
 #ifdef Q_OS_LINUX
       // Segment marked with imeCaretPos is for target input.

src/git/CMakeLists.txt

@@ -27,6 +27,6 @@ add_library(
   TagRef.cpp
   Tree.cpp)
 
-target_link_libraries(git git2 Qt5::Core Qt5::Network util)
+target_link_libraries(git git2 Qt6::Core Qt6::Network util)
 
 set_target_properties(git PROPERTIES AUTOMOC ON)

src/git/Commit.cpp

@@ -26,7 +26,8 @@
 #include <QJsonDocument>
 #include <QJsonObject>
 #include <QRegularExpression>
-#include <QTextCodec>
+#include <QStringConverter>
+#include <QStringDecoder>
 #include <QVector>
 
 namespace git {
@@ -291,8 +292,9 @@ void Commit::setStarred(bool starred) {
 
 QString Commit::decodeMessage(const char *msg) const {
   if (const char *encoding = git_commit_message_encoding(*this)) {
-    if (QTextCodec *codec = QTextCodec::codecForName(encoding))
-      return codec->toUnicode(msg);
+    auto conv = QStringConverter::encodingForName(encoding);
+    if (conv.has_value())
+      return QStringDecoder{conv.value()}.decode(msg);
   }
 
   return msg;

src/git/Commit.h

@@ -15,6 +15,7 @@
 #include "git2/revwalk.h"
 #include "git2/reset.h"
 #include "Blob.h"
+#include <QStringList>
 
 class QDateTime;