Support building with Qt6

Author: JamiKettunen

CMakeLists.txt

@@ -19,10 +19,10 @@ include(AsteroidCMakeSettings)
 
 set(ASTEROID_MODULES_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/asteroidapp/cmake)
 
-find_package(Qt5 ${QT_MIN_VERSION} COMPONENTS DBus Qml Quick Svg REQUIRED)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} COMPONENTS DBus Qml Quick Svg REQUIRED)
 if (WITH_ASTEROIDAPP)
-    find_package(Mlite5 MODULE REQUIRED)
-    find_package(Mapplauncherd_qt5 MODULE REQUIRED)
+    find_package(Mlite${QT_MAJOR_VERSION} MODULE REQUIRED)
+    find_package(Mapplauncherd_qt${QT_MAJOR_VERSION} MODULE REQUIRED)
 endif()
 
 ecm_find_qmlmodule(QtQuick.VirtualKeyboard 2.1)

src/controls/CMakeLists.txt

@@ -87,9 +87,9 @@ add_custom_command(
 )
 
 target_link_libraries(asteroidcontrolsplugin
-	Qt5::Qml
-	Qt5::Quick
-	Qt5::Svg)
+	Qt::Qml
+	Qt::Quick
+	Qt::Svg)
 
 install(TARGETS asteroidcontrolsplugin
 	DESTINATION ${INSTALL_QML_IMPORT_DIR}/org/asteroid/controls)

src/controls/src/icon.cpp

@@ -32,6 +32,9 @@
 #include <QPainter>
 #include <QIcon>
 #include <QSvgRenderer>
+#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+#include <QFile>
+#endif
 
 #define ICONS_DIRECTORY "/usr/share/icons/asteroid/"
 
@@ -79,9 +82,18 @@ void Icon::paint(QPainter *painter)
     painter->drawPixmap(0, 0, width(), height(), m_pixmap);
 }
 
+
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
 void Icon::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry)
+#else
+void Icon::geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry)
+#endif
 {
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     QQuickPaintedItem::geometryChanged(newGeometry, oldGeometry);
+#else
+    QQuickPaintedItem::geometryChange(newGeometry, oldGeometry);
+#endif
     if(newGeometry.size() == oldGeometry.size() || newGeometry.width() == 0 || newGeometry.height() == 0)
         return;
     updateBasePixmap();

src/controls/src/icon.h

@@ -52,7 +52,11 @@ class Icon : public QQuickPaintedItem
 
     void paint(QPainter *painter) override;
 
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
     void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+#else
+    void geometryChange(const QRectF &newGeometry, const QRectF &oldGeometry) override;
+#endif
 
 signals:
     void nameChanged();

src/utils/CMakeLists.txt

@@ -12,9 +12,9 @@ set(HEADERS
 add_library(asteroidutilsplugin ${SRC} ${HEADERS})
 
 target_link_libraries(asteroidutilsplugin
-	Qt5::DBus
-	Qt5::Qml
-	Qt5::Quick)
+	Qt::DBus
+	Qt::Qml
+	Qt::Quick)
 
 install(TARGETS asteroidutilsplugin
 	DESTINATION ${INSTALL_QML_IMPORT_DIR}/org/asteroid/utils)

src/utils/src/deviceinfo.cpp

@@ -35,15 +35,23 @@ DeviceInfo::DeviceInfo()
     QFile host(HOST_FILE);
     if (host.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&host);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         in.setCodec("UTF-8");
+#else
+	in.setEncoding(QStringConverter::Utf8);
+#endif
         m_hostname = in.readLine();
         host.close();
     }
 
     QFile release(OS_RELEASE_FILE);
     if (release.open(QIODevice::ReadOnly | QIODevice::Text)) {
         QTextStream in(&release);
+#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
         in.setCodec("UTF-8");
+#else
+	in.setEncoding(QStringConverter::Utf8);
+#endif
         QString line = in.readLine();
         for (bool searching{true}; searching && !in.atEnd(); line = in.readLine()) {
             if (line.startsWith("BUILD_ID")) {