Merge lp:~ricmm/qtubuntu/qurl-final into lp:qtubuntu

[Ricardo Mendoza]

Implement QDesktopServices::openUrl()

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:178
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/81/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/qtubuntu-saucy-armhf-ci/69/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-ci/81/rebuild

review: Needs Fixing (continuous-integration)

[Loïc Minier (lool)]

I think we gave up on landing the last remaining change in this mp (build-dep bump) which would still be useful but we've landed recent enough packages in saucy anyway now.

Unmerged revisions

178. By Ricardo Mendoza on 2013-09-18

Bump build-dep version of platform-api

177. By Ricardo Mendoza on 2013-09-18

Implement QDesktopServices URL handlers

=== modified file 'debian/control'
--- debian/control	2013-09-03 18:03:17 +0000
+++ debian/control	2013-09-18 16:04:35 +0000
@@ -10,7 +10,7 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                libhybris-dev,
-               libplatform-api1-dev (>= 0.18.1daily13.06.11),
+               libplatform-api1-dev (>= 0.19),
                libudev-dev,
                libunity-api-dev,
                libxrender-dev,

=== modified file 'src/platforms/base/base.pro'
--- src/platforms/base/base.pro	2013-06-19 23:31:25 +0000
+++ src/platforms/base/base.pro	2013-09-18 16:04:35 +0000
@@ -19,6 +19,7 @@
           window.cc \
           input.cc \
           theme.cc \
+          platformservices.cc \
           clipboard.cc
 
 HEADERS = integration.h \
@@ -30,6 +31,7 @@
           input.h \
           logging.h \
           theme.h \
+          platformservices.h \
           clipboard.h
 
 CONFIG += static create_prl egl qpa/genericunixfontdatabase

=== modified file 'src/platforms/base/integration.cc'
--- src/platforms/base/integration.cc	2013-02-14 16:31:33 +0000
+++ src/platforms/base/integration.cc	2013-09-18 16:04:35 +0000
@@ -20,6 +20,7 @@
 #include "context.h"
 #include "logging.h"
 #include "theme.h"
+#include "platformservices.h"
 #include <QtPlatformSupport/private/qgenericunixfontdatabase_p.h>
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
 #include <QtGui/private/qguiapplication_p.h>
@@ -28,7 +29,8 @@
 QUbuntuBaseIntegration::QUbuntuBaseIntegration()
     : eventDispatcher_(createUnixEventDispatcher())
     , nativeInterface_(new QUbuntuBaseNativeInterface())
-    , fontDb_(new QGenericUnixFontDatabase()) {
+    , fontDb_(new QGenericUnixFontDatabase())
+    , platformServices_(new QUbuntuBasePlatformServices()) {
   QGuiApplicationPrivate::instance()->setEventDispatcher(eventDispatcher_);
   DLOG("QUbuntuBaseIntegration::QUbuntuBaseIntegration (this=%p)", this);
 }

=== modified file 'src/platforms/base/integration.h'
--- src/platforms/base/integration.h	2013-02-14 16:31:33 +0000
+++ src/platforms/base/integration.h	2013-09-18 16:04:35 +0000
@@ -29,6 +29,7 @@
   bool hasCapability(QPlatformIntegration::Capability cap) const;
   QAbstractEventDispatcher* guiThreadEventDispatcher() const { return eventDispatcher_; }
   QPlatformNativeInterface* nativeInterface() const { return nativeInterface_; }
+  QPlatformServices *services() const { return platformServices_; }
   QPlatformBackingStore* createPlatformBackingStore(QWindow* window) const;
   QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context) const;
   QPlatformOpenGLContext* createPlatformOpenGLContext(QOpenGLContext* context);
@@ -40,6 +41,7 @@
   QAbstractEventDispatcher* eventDispatcher_;
   QPlatformNativeInterface* nativeInterface_;
   QPlatformFontDatabase* fontDb_;
+  QPlatformServices* platformServices_;
 };
 
 #endif  // QUBUNTUBASEINTEGRATION_H

=== added file 'src/platforms/base/platformservices.cc'
--- src/platforms/base/platformservices.cc	1970-01-01 00:00:00 +0000
+++ src/platforms/base/platformservices.cc	2013-09-18 16:04:35 +0000
@@ -0,0 +1,50 @@
+// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
+// Copyright © 2013 Canonical Ltd.
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 3, as published by
+// the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#include "platformservices.h"
+
+#include <QUrl>
+
+#include <ubuntu/application/url_dispatcher/service.h>
+#include <ubuntu/application/url_dispatcher/session.h>
+
+bool QUbuntuBasePlatformServices::openUrl(const QUrl &url)
+{
+    return callDispatcher(url);
+}
+
+bool QUbuntuBasePlatformServices::openDocument(const QUrl &url)
+{
+    return callDispatcher(url);
+}
+
+bool QUbuntuBasePlatformServices::callDispatcher(const QUrl &url)
+{
+    UAUrlDispatcherSession* session = ua_url_dispatcher_session();
+    if (!session)
+        return false;
+
+    ua_url_dispatcher_session_open(session, url.toEncoded().constData(), NULL, NULL);
+
+    free(session);
+
+    // We are returning true here because the other option
+    // is spawning a nested event loop and wait for the
+    // callback. But there is no guarantee on how fast
+    // the callback is going to be so we prefer to avoid the
+    // nested event loop. Long term plan is improve Qt API
+    // to support an async openUrl
+    return true;
+}

=== added file 'src/platforms/base/platformservices.h'
--- src/platforms/base/platformservices.h	1970-01-01 00:00:00 +0000
+++ src/platforms/base/platformservices.h	2013-09-18 16:04:35 +0000
@@ -0,0 +1,30 @@
+// This file is part of QtUbuntu, a set of Qt components for Ubuntu.
+// Copyright © 2013 Canonical Ltd.
+//
+// This program is free software: you can redistribute it and/or modify it under
+// the terms of the GNU Lesser General Public License version 3, as published by
+// the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
+// SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef QUBUNTUBASEPLATFORMSERVICES_H
+#define QUBUNTUBASEPLATFORMSERVICES_H
+
+#include <qpa/qplatformservices.h>
+
+class QUbuntuBasePlatformServices : public QPlatformServices {
+public:
+    bool openUrl(const QUrl &url);
+    bool openDocument(const QUrl &url);
+
+private:
+    bool callDispatcher(const QUrl &url);
+};
+
+#endif  // QUBUNTUBASEPLATFORMSERVICES_H