Update for Qt6

Author: AdrianTM

debian/control

@@ -2,7 +2,7 @@ Source: custom-toolbox
 Section: admin
 Priority: optional
 Maintainer: Adrian <adrian@mxlinux.org>
-Build-Depends: debhelper (>=10), qtbase5-dev, qttools5-dev-tools
+Build-Depends: debhelper (>=10), qt6-base-dev, qt6-base-dev-tools, qt6-tools-dev, qt6-tools-dev-tools
 Standards-Version: 3.9.8
 Vcs-Git: git://github.com/AdrianTM/custom-toolbox
 

debian/rules

@@ -1,15 +1,18 @@
 #!/usr/bin/make -f
-export QT_SELECT=5
+export QT_SELECT=6
 
 QMAKE_OPTS = DEFINES+=NO_DEBUG_ON_CONSOLE
-MAKE_OPTS  = QMAKE=qmake-qt5 LRELEASE=lrelease-qt5 QMAKE_OPTS="$(QMAKE_OPTS)"
+MAKE_OPTS  = QMAKE=qmake6 QMAKE_OPTS="$(QMAKE_OPTS)"
+
+override_dh_auto_configure:
+	qmake6
 
 override_dh_auto_clean:
 	dh_auto_clean
 	rm -f src/translations/*.qm
 
 override_dh_auto_build:
-	lrelease translations/*.ts
+	/usr/lib/qt6/bin/lrelease translations/*.ts
 	head -n1 debian/changelog | sed -e "s/.*(\([^(]*\)).*/const QString VERSION {\"\1\"};/" > version.h
 	dh_auto_build -- $(MAKE_OPTS)
 

flatbutton.cpp

@@ -43,7 +43,7 @@ void FlatButton::leaveEvent(QEvent *e)
     QPushButton::leaveEvent(e);
 }
 
-void FlatButton::enterEvent(QEvent *e)
+void FlatButton::enterEvent(QEnterEvent *e)
 {
     // setFlat(false);
     setStyleSheet("QPushButton { text-align:left; text-decoration:underline}; QToolTip { text-decoration: none; }");

flatbutton.h

@@ -21,6 +21,8 @@
  **********************************************************************/
 #pragma once
 
+#include <QEnterEvent>
+#include <QEvent>
 #include <QPushButton>
 
 class QEvent;
@@ -35,6 +37,6 @@ class FlatButton : public QPushButton
     void setIconSize(QSize);
 
 protected:
-    void enterEvent(QEvent *e) override;
-    void leaveEvent(QEvent *e) override;
+    void enterEvent(QEnterEvent *e);
+    void leaveEvent(QEvent *e);
 };

main.cpp

@@ -50,12 +50,12 @@ int main(int argc, char *argv[])
     QApplication::setOrganizationName("MX-Linux");
 
     QTranslator qtTran;
-    if (qtTran.load("qt_", QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+    if (qtTran.load("qt_" + QLocale::system().name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
         QApplication::installTranslator(&qtTran);
     }
 
     QTranslator qtBaseTran;
-    if (qtBaseTran.load("qtbase_" + QLocale::system().name(), QLibraryInfo::location(QLibraryInfo::TranslationsPath))) {
+    if (qtBaseTran.load("qtbase_" + QLocale::system().name(), QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
         QApplication::installTranslator(&qtBaseTran);
     }
 

mainwindow.cpp

@@ -543,11 +543,11 @@ void MainWindow::readFile(const QString &file_name)
     setWindowTitle(name);
     ui->commentLabel->setText(comment);
 
-    const auto lines = text.splitRef('\n');
+    const auto lines = text.split('\n');
     QRegularExpression skipPattern("^(Name|Comment|#|$).*");
-    for (const QStringRef &line : lines) {
+    for (const QString &line : lines) {
         if (!skipPattern.match(line).hasMatch()) {
-            processLine(line.toString());
+            processLine(line);
         }
     }
 }