[qmlmessages] Port to Qt5

special · Jun 13, 2013 · 50c73cc · 50c73cc
1 parent eb22348
commit 50c73cc
Show file tree

Hide file tree

Showing 22 changed files with 95 additions and 217 deletions.
diff --git a/data/org.freedesktop.Telepathy.Client.qmlmessages.service b/data/org.freedesktop.Telepathy.Client.qmlmessages.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.Client.qmlmessages
-Exec=/usr/bin/invoker --no-wait -d 10 --type=d /usr/bin/qmlmessages -prestart
+Exec=/usr/bin/invoker --no-wait -d 10 --type=qtcomponents-qt5 /usr/bin/qmlmessages -prestart
diff --git a/data/org.nemomobile.qmlmessages.service b/data/org.nemomobile.qmlmessages.service
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.nemomobile.qmlmessages
-Exec=/usr/bin/invoker --no-wait -d 10 --type=d /usr/bin/qmlmessages -prestart
+Exec=/usr/bin/invoker --no-wait -d 10 --type=qtcomponents-qt5 /usr/bin/qmlmessages -prestart
diff --git a/data/qmlmessages.desktop b/data/qmlmessages.desktop
@@ -2,7 +2,7 @@
 Type=Application
 Name=Messages
 Icon=icons-Applications-sms
-Exec=invoker --type=d /usr/bin/qmlmessages
+Exec=invoker --type=qtcomponents-qt5 /usr/bin/qmlmessages
 Comment=Nemo messaging application
 X-Desktop-File-Install-Version=0.19
 X-Maemo-Service=org.nemomobile.qmlmessages

diff --git a/qml/AccountSelector.qml b/qml/AccountSelector.qml
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.messages.internal 1.0
 
 Rectangle {

diff --git a/qml/ChatTextInput.qml b/qml/ChatTextInput.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 BorderImage {
     id: textArea

diff --git a/qml/ConversationListDelegate.qml b/qml/ConversationListDelegate.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.qmlcontacts 1.0
 
 MouseArea {

diff --git a/qml/ConversationListPage.qml b/qml/ConversationListPage.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 Page {
     PageHeader {

diff --git a/qml/ConversationListWidget.qml b/qml/ConversationListWidget.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.2
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.messages.internal 1.0
 
 Item {

diff --git a/qml/ConversationPage.qml b/qml/ConversationPage.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.messages.internal 1.0
 import org.nemomobile.qmlcontacts 1.0
 import org.nemomobile.commhistory 1.0

diff --git a/qml/MessagesView.qml b/qml/MessagesView.qml
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.messages.internal 1.0
 import org.nemomobile.commhistory 1.0
 

diff --git a/qml/PageHeader.qml b/qml/PageHeader.qml
diff --git a/qml/TargetEditBox.qml b/qml/TargetEditBox.qml
@@ -28,8 +28,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 
 Rectangle {
     color: "white"

diff --git a/qml/main.qml b/qml/main.qml
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-import QtQuick 1.1
-import com.nokia.meego 1.0
+import QtQuick 2.0
+import com.nokia.meego 2.0
 import org.nemomobile.messages.internal 1.0
 import org.nemomobile.contacts 1.0
 import org.nemomobile.commhistory 1.0

diff --git a/qml/qml.pro b/qml/qml.pro
@@ -0,0 +1,6 @@
+TEMPLATE = aux
+
+qml.files = *.qml *.js
+qml.path = $${INSTAL_ROOT}/usr/share/qmlmessages/
+
+INSTALLS += qml
diff --git a/qml/qml.qrc b/qml/qml.qrc
diff --git a/qmlmessages.pro b/qmlmessages.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
 SUBDIRS = src \
-    data
+    data \
+    qml
diff --git a/rpm/qmlmessages.spec b/rpm/qmlmessages.spec
@@ -1,6 +1,6 @@
 # 
 # Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.25
+# Generated by: spectacle version 0.26
 # 
 
 Name:       qmlmessages
@@ -16,17 +16,21 @@ License:    BSD
 URL:        https://github.com/nemomobile/qmlmessages
 Source0:    %{name}-%{version}.tar.bz2
 Source100:  qmlmessages.yaml
-Requires:   qt-components >= 1.4.8
-Requires:   nemo-qml-plugin-messages-internal >= 0.1.1
-Requires:   libcommhistory-declarative >= 1.5.1
+Requires:   qt-components-qt5
+Requires:   qt5-qtsvg-plugin-imageformat-svg
+Requires:   nemo-qml-plugin-messages-internal-qt5
+Requires:   libcommhistory-qt5-declarative
+Requires:   mapplauncherd-booster-qtcomponents-qt5
 Requires:   commhistory-daemon
 Requires:   nemo-qml-plugins-contacts
 Requires:   qmlcontacts
-BuildRequires:  pkgconfig(QtCore) >= 4.7.0
-BuildRequires:  pkgconfig(QtDeclarative)
-BuildRequires:  pkgconfig(QtContacts)
-BuildRequires:  pkgconfig(qdeclarative-boostable)
-BuildRequires:  pkgconfig(TelepathyQt4)
+BuildRequires:  pkgconfig(Qt5Core)
+BuildRequires:  pkgconfig(Qt5Qml)
+BuildRequires:  pkgconfig(Qt5Quick)
+BuildRequires:  pkgconfig(Qt5DBus)
+BuildRequires:  pkgconfig(Qt5Contacts)
+BuildRequires:  pkgconfig(qdeclarative5-boostable)
+BuildRequires:  pkgconfig(TelepathyQt5)
 BuildRequires:  desktop-file-utils
 Provides:   meego-handset-sms > 0.1.2
 Provides:   meego-handset-sms-branding-upstream > 0.1.2
@@ -46,7 +50,6 @@ Obsoletes:   peregrine-tablet-common < 1.1.7
 %description
 Messaging application using Qt Quick for Nemo Mobile.
 
-
 %prep
 %setup -q -n %{name}-%{version}
 
@@ -57,7 +60,7 @@ Messaging application using Qt Quick for Nemo Mobile.
 # >> build pre
 # << build pre
 
-%qmake 
+%qmake5 
 
 make %{?jobs:-j%jobs}
 
@@ -85,6 +88,7 @@ update-contextkit-providers
 %files
 %defattr(-,root,root,-)
 %{_bindir}/qmlmessages
+%{_datadir}/qmlmessages/*
 %{_datadir}/applications/qmlmessages.desktop
 %{_datadir}/telepathy/clients/qmlmessages.client
 %{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.qmlmessages.service

diff --git a/rpm/qmlmessages.yaml b/rpm/qmlmessages.yaml
@@ -10,7 +10,7 @@ Sources:
 
 Description: Messaging application using Qt Quick for Nemo Mobile.
 Configure: none
-Builder: qmake
+Builder: qmake5
 Obsoletes: 
     # meego-handset-sms is the old MTF based application that isn't
     # maintained anymore, obsoleted here to make updates work.
@@ -34,16 +34,20 @@ Provides:
     - peregrine-qml-starter = 1.1.7
     - peregrine-tablet-common = 1.1.7
 PkgConfigBR:
-    - QtCore >= 4.7.0
-    - QtDeclarative
-    - QtContacts
-    - qdeclarative-boostable
-    - TelepathyQt4
+    - Qt5Core
+    - Qt5Qml
+    - Qt5Quick
+    - Qt5DBus
+    - Qt5Contacts
+    - qdeclarative5-boostable
+    - TelepathyQt5
 
 Requires:
-    - qt-components >= 1.4.8
-    - nemo-qml-plugin-messages-internal >= 0.1.1
-    - libcommhistory-declarative >= 1.5.1
+    - qt-components-qt5
+    - qt5-qtsvg-plugin-imageformat-svg
+    - nemo-qml-plugin-messages-internal-qt5
+    - libcommhistory-qt5-declarative
+    - mapplauncherd-booster-qtcomponents-qt5
     - commhistory-daemon
 # C++ contacts APIs
     - nemo-qml-plugins-contacts
@@ -52,6 +56,7 @@ Requires:
 
 Files:
     - "%{_bindir}/qmlmessages"
+    - "%{_datadir}/qmlmessages/*"
     - "%{_datadir}/applications/qmlmessages.desktop"
     - "%{_datadir}/telepathy/clients/qmlmessages.client"
     - "%{_datadir}/dbus-1/services/org.freedesktop.Telepathy.Client.qmlmessages.service"

diff --git a/src/main.cpp b/src/main.cpp
@@ -29,10 +29,10 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <QApplication>
+#include <QGuiApplication>
 #include <QDBusConnection>
 #ifdef HAS_BOOSTER
-#include <applauncherd/MDeclarativeCache>
+#include <MDeclarativeCache>
 #endif
 
 #include <TelepathyQt/Constants>
@@ -50,7 +50,7 @@ int main(int argc, char **argv)
     MDeclarativeCache::qApplication(argc, argv);
 #else
     qWarning() << Q_FUNC_INFO << "Warning! Running without booster. This may be a bit slower.";
-    QApplication a(argc, argv);
+    QGuiApplication a(argc, argv);
 #endif
 
     // Set up Telepathy

diff --git a/src/src.pro b/src/src.pro
@@ -1,8 +1,8 @@
 PROJECT_NAME = qmlmessages
-QT += dbus declarative svg
+QT += dbus quick qml 
 
 CONFIG += link_pkgconfig
-PKGCONFIG += TelepathyQt4
+PKGCONFIG += TelepathyQt5
 
 target.path = $$INSTALL_ROOT/usr/bin
 INSTALLS += target
@@ -14,7 +14,7 @@ SOURCES += main.cpp \
 HEADERS += windowmanager.h \
     dbusadaptor.h
 
-RESOURCES += ../res/res.qrc ../qml/qml.qrc
+RESOURCES += ../res/res.qrc 
 
 # do not edit below here
 TEMPLATE = app
@@ -23,10 +23,10 @@ TARGET = $$PROJECT_NAME
 
 CONFIG += link_pkgconfig
 
-packagesExist(qdeclarative-boostable) {
-    message("Building with qdeclarative-boostable support")
+packagesExist(qdeclarative5-boostable) {
+    message("Building with qdeclarative5-boostable support")
     DEFINES += HAS_BOOSTER
-    PKGCONFIG += qdeclarative-boostable
+    PKGCONFIG += qdeclarative5-boostable
 } else {
-    warning("qdeclarative-boostable not available; startup times will be slower")
+    warning("qdeclarative5-boostable not available; startup times will be slower")
 }