Bump Qt dependency to 6.9, fix issues after the port

Author: MartinBriza

CMakeLists.txt

@@ -158,11 +158,12 @@ CPMAddPackage(
     GIT_TAG fa5bc4296a252ad71c85209b60675bb025024a1e
     VERSION 0.10.0
     EXCLUDE_FROM_ALL ON
-    OPTIONS "QCORO_BUILD_EXAMPLES OFF" "BUILD_TESTING OFF" "QCORO_WITH_QTDBUS ${LITH_DEPENDENCY_ENABLE_DBUS}"
+    OPTIONS "QCORO_BUILD_EXAMPLES OFF" "BUILD_TESTING OFF" "QCORO_WITH_QML OFF" "QCORO_WITH_QTQUICK OFF" "QCORO_WITH_QTDBUS ${LITH_DEPENDENCY_ENABLE_DBUS}"
     FIND_PACKAGE_ARGUMENTS "COMPONENTS ${LITH_QCORO_DEPENDENCY_MODULES} REQUIRED"
 )
 
-qt_standard_project_setup(REQUIRES 6.5)
+qt_standard_project_setup(REQUIRES 6.9)
+qt_policy(SET QTP0004 NEW)
 get_target_property(QT_MOC_EXECUTABLE Qt::moc IMPORTED_LOCATION)
 get_filename_component(QT_BINARY_PREFIX ${QT_MOC_EXECUTABLE} DIRECTORY)
 get_filename_component(QT_INSTALL_PREFIX ${QT_BINARY_PREFIX} DIRECTORY)

README.md

@@ -61,7 +61,7 @@ Lith currently supports the following platforms:
 
 ## Build instructions
 
-Lith is written using C++ and the Qt framework with QML. The only supported version is Qt 6.5 and newer. Other
+Lith is written using C++ and the Qt framework with QML. The only supported version is Qt 6.9 and newer. Other
 dependencies are listed below.
 
 When building for all supported platforms, only the following steps should be necessary if CMake is setup correctly:

app/CMakeLists.txt

@@ -41,7 +41,6 @@ target_link_libraries(Lith PRIVATE
     LithStyle
     QCoro6::Coro
     Qt::Gui
-    Qt::GuiPrivate
     Qt::Multimedia
     Qt::Qml
     Qt::Quick

modules/Lith/Core/CMakeLists.txt

@@ -77,7 +77,6 @@ target_link_libraries(LithCore PRIVATE
     QCoro6::Coro
     QCoro6::Core
     Qt::Gui
-    Qt::GuiPrivate
     Qt::Multimedia
     Qt::Qml
     Qt::Quick

modules/Lith/Style/TabButton.qml

@@ -5,6 +5,8 @@ import QtQuick.Templates as T
 import Lith.Core
 import Lith.Style
 
+import "util"
+
 T.TabButton {
     id: control
 

modules/Lith/UI/MainView.qml

@@ -1,9 +1,9 @@
 import QtQuick
-import QtQuick.Controls
+import QtQuick.Controls as QQC2
 import QtQuick.Layouts
 
 import Lith.Core
-import Lith.Style
+import Lith.Style as LithStyle
 
 import "util"
 
@@ -79,7 +79,7 @@ Item {
 
     Rectangle {
         id: mainViewContents
-        color: LithPalette.regular.window
+        color: LithStyle.LithPalette.regular.window
         anchors {
             fill: parent
             leftMargin: mainView.leftMargin
@@ -211,7 +211,7 @@ Item {
             left: parent.left
         }
         width: mainView.leftMargin
-        color: LithPalette.regular.base
+        color: LithStyle.LithPalette.regular.base
     }
 
     Rectangle {
@@ -224,7 +224,7 @@ Item {
             right: parent.right
         }
         width: mainView.rightMargin
-        color: LithPalette.regular.base
+        color: LithStyle.LithPalette.regular.base
     }
 
     Rectangle {
@@ -237,7 +237,7 @@ Item {
             right: parent.right
         }
         height: mainView.topMargin
-        color: LithPalette.regular.base
+        color: LithStyle.LithPalette.regular.base
     }
 
     Rectangle {
@@ -250,11 +250,11 @@ Item {
             right: parent.right
         }
         height: mainView.bottomMargin
-        color: LithPalette.regular.base
+        color: LithStyle.LithPalette.regular.base
     }
 
     // TODO make this a component and fix this
-    Dialog {
+    LithStyle.Dialog {
         id: linkHandler
         z: 99999999
         width: channelView.width
@@ -315,15 +315,15 @@ Item {
             x: 6
             width: channelView.width - 12
             spacing: 9
-            Label {
+            LithStyle.Label {
                 id: linkText
                 Layout.fillWidth: true
                 wrapMode: Text.WrapAtWordBoundaryOrAnywhere
                 horizontalAlignment: Text.AlignHCenter
                 textFormat: Text.RichText
                 text: "<a href=\""+linkHandler.currentLink+"\">"+linkHandler.currentLink+"</a>"
             }
-            Button {
+            LithStyle.Button {
                 focusPolicy: Qt.NoFocus
                 Layout.preferredHeight: 36
                 Layout.preferredWidth: height
@@ -333,7 +333,7 @@ Item {
                     linkHandler.visible = false
                 }
             }
-            Button {
+            LithStyle.Button {
                 focusPolicy: Qt.NoFocus
                 Layout.preferredHeight: 36
                 Layout.preferredWidth: height
@@ -343,7 +343,7 @@ Item {
                 }
                 icon.source: "qrc:/navigation/"+WindowHelper.currentThemeName+"/resize.png"
             }
-            Button {
+            LithStyle.Button {
                 visible: linkHandler.containsImage || linkHandler.containsVideo
                 focusPolicy: Qt.NoFocus
                 icon.source: "qrc:/navigation/"+WindowHelper.currentThemeName+"/image.png"