Start move to qt6

nemomobile-ux · Oct 13, 2023 · abee075 · abee075
1 parent d9e0df1
commit abee075
Show file tree

Hide file tree

Showing 14 changed files with 52 additions and 128 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,27 +1,27 @@
 cmake_minimum_required(VERSION 3.6.0)
 
 project(glacier-messages
-	VERSION 0.1.2
+        VERSION 0.3
 	DESCRIPTION "The Glacier messages")
 
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_INSTALL_PREFIX /usr)
 
 include(FeatureSummary)
 include(GNUInstallDirs)
 
-set(QT_MIN_VERSION "5.12.0")
-find_package(Qt5 COMPONENTS Gui Qml Quick DBus LinguistTools REQUIRED)
-find_package(Glacier 0.8 COMPONENTS App REQUIRED)
-find_package(Qt5QuickCompiler)
+set(QT_MIN_VERSION "6.0.0")
+find_package(Qt6 COMPONENTS Gui Qml Quick DBus LinguistTools REQUIRED)
+find_package(Glacier 1.0 COMPONENTS App REQUIRED)
 
 add_subdirectory(src)
 
 # Translations
 file(GLOB TS_FILES translations/*.ts)
-qt5_add_translation(QM_FILES ${TS_FILES})
+qt6_add_translation(QM_FILES ${TS_FILES})
 add_custom_target(translations DEPENDS ${QM_FILES})
 add_dependencies(glacier-messages translations)
 
@@ -40,16 +40,9 @@ install(FILES ${SVG_FILES}
 	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-messages/images)
 
 install(FILES
-	data/org.freedesktop.Telepathy.Client.qmlmessages.service
 	data/org.nemomobile.qmlmessages.service
 	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/dbus-1/services)
 
 install(FILES
 	data/glacier-messages.service
 	DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/user/)
-
-
-install(FILES
-	data/glacier-messages.client
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/telepathy/clients)
-
diff --git a/data/glacier-messages.client b/data/glacier-messages.client
diff --git a/data/glacier-messages.service b/data/glacier-messages.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=Glacier messaging application
-Requires=dbus.socket mission-control-5.service lipstick.service
-After=dbus.socket mission-control-5.service lipstick.service
+Requires=dbus.socket lipstick.service
+After=dbus.socket lipstick.service
 
 [Service]
 Type=dbus

diff --git a/data/org.freedesktop.Telepathy.Client.qmlmessages.service b/data/org.freedesktop.Telepathy.Client.qmlmessages.service
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -2,15 +2,15 @@ set(SRC
     main.cpp
 )
 
-qtquick_compiler_add_resources(RESOURCES qml/glacier-messages.qrc)
+qt_add_resources(RESOURCES qml/glacier-messages.qrc)
 
 add_executable(glacier-messages ${SRC} ${RESOURCES})
 
 target_link_libraries(glacier-messages
-	Qt5::Gui
-	Qt5::Qml
-	Qt5::Quick
-	Qt5::DBus
+        Qt6::Gui
+        Qt6::Qml
+        Qt6::Quick
+        Qt6::DBus
 	Glacier::App)
 
 install(TARGETS glacier-messages RUNTIME

diff --git a/src/qml/components/ChatTextInput.qml b/src/qml/components/ChatTextInput.qml
@@ -30,13 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import QtQuick.Controls.Styles 1.4
+import Nemo
+import Nemo.Controls
 
 Item {
     id: textArea
@@ -86,14 +84,14 @@ Item {
                 visible: (!textInput.focus && !inputFocusScope.focus) || textInput.text.lenght == 0
             }
 
-            style: TextAreaStyle {
+            /*style: TextAreaStyle {
                 backgroundColor: Theme.fillDarkColor
                 font.pixelSize: Theme.fontSizeMedium
                 font.family: Theme.fontFamily
                 textColor: Theme.textColor
                 selectedTextColor: Theme.textColor
                 selectionColor: Theme.accentColor
-            }
+            }*/
         }
     }
 

diff --git a/src/qml/components/ConversationListDelegate.qml b/src/qml/components/ConversationListDelegate.qml
@@ -30,13 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import org.nemomobile.qmlcontacts 1.0
+import Nemo
+import Nemo.Controls
 
 ListViewItemWithActions {
     id: converstationListDelegate

diff --git a/src/qml/components/ConversationListWidget.qml b/src/qml/components/ConversationListWidget.qml
@@ -29,14 +29,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick 2.6
-
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import org.nemomobile.messages.internal 1.0
+import Nemo
+import Nemo.Controls
 
 Item {
     Label{
@@ -53,7 +50,7 @@ Item {
         focus: true
         keyNavigationWraps: false
         clip: true
-        model: groupModel
+//        model: groupModel
 
         delegate: ConversationListDelegate {
             onClicked: {

diff --git a/src/qml/components/MessagesService.qml b/src/qml/components/MessagesService.qml
@@ -1,5 +1,5 @@
-import QtQuick 2.6
-import Nemo.DBus 2.0
+import QtQuick
+import Nemo.DBus
 
 Item {
     id: rootObject

diff --git a/src/qml/components/MessagesView.qml b/src/qml/components/MessagesView.qml
@@ -29,14 +29,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import org.nemomobile.messages.internal 1.0
-import org.nemomobile.commhistory 1.0
+import Nemo
+import Nemo.Controls
 
 Item {
     property alias model: view.model

diff --git a/src/qml/components/TargetEditBox.qml b/src/qml/components/TargetEditBox.qml
@@ -28,12 +28,11 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick 2.6
-
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
+import Nemo
+import Nemo.Controls
 
 Item {
     id: targetEdirBox

diff --git a/src/qml/glacier-messages.qml b/src/qml/glacier-messages.qml
@@ -30,46 +30,25 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
+import QtQuick
+import QtQuick.Controls
+import QtQuick.Window
 
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
+import Nemo
+import Nemo.Controls
 
-import org.nemomobile.messages.internal 1.0
 import org.nemomobile.contacts 1.0
-import org.nemomobile.commhistory 1.0
 
 import "components"
 import "pages"
 
 ApplicationWindow {
     id: app
 
-    // Shared AccountsModel
-    TelepathyAccountsModel {
-        id: accountsModel
-    }
-
     PeopleModel {
         id: peopleModel
     }
 
-    TelepathyChannelManager {
-        id: channelManager
-        handlerName: "qmlmessages"
-    }
-
-    CommGroupManager {
-        id: groupManager
-        useBackgroundThread: true
-    }
-
-    CommGroupModel {
-        id: groupModel
-        manager: groupManager
-    }
-
     MessagesService{
         id: messageService
 

diff --git a/src/qml/pages/ConversationListPage.qml b/src/qml/pages/ConversationListPage.qml
@@ -30,11 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
+import QtQuick
+import QtQuick.Controls
 
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
+import Nemo
+import Nemo.Controls
 
 import "../components"
 
@@ -47,7 +47,7 @@ Page {
             ToolButton{
                 iconSource: "image://theme/user-plus"
                 onClicked: {
-                    pageStack.push(Qt.resolvedUrl("../pages/ConversationPage.qml"), {add : true});
+                    app.push(Qt.resolvedUrl("../pages/ConversationPage.qml"), {add : true});
                 }
             }
         ]

diff --git a/src/qml/pages/ConversationPage.qml b/src/qml/pages/ConversationPage.qml
@@ -30,17 +30,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 2.6
-
-import QtQuick.Controls 1.0
-import QtQuick.Controls.Nemo 1.0
-import QtQuick.Controls.Styles.Nemo 1.0
-
-import org.nemomobile.messages.internal 1.0
-import org.nemomobile.qmlcontacts 1.0
-import org.nemomobile.commhistory 1.0
-import org.nemomobile.voicecall 1.0
+import QtQuick
+import QtQuick.Controls
 
+import Nemo
+import Nemo.Controls
 
 import "../components"
 
@@ -77,10 +71,6 @@ Page {
         markAsRead()
     }
 
-    VoiceCallManager {
-        id:callManager
-    }
-
     TextField {
         id: targetEditor
         visible: !channel
@@ -99,12 +89,6 @@ Page {
 
     }
 
-    CommConversationModel {
-        id: conversationModel
-        useBackgroundThread: true
-        groupId: group ? group.id : -1
-    }
-
     MessagesView {
         id: messagesView
         anchors {