Merge lp:~robru/ubuntu/utopic/qtubuntu-gles/platform-api-v2-sync into lp:ubuntu/utopic/qtubuntu-gles

[Robert Bruce Park]

Sync the platform-api v2.0.0 changes from qtubuntu into qtubuntu-gles.

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-05 00:28:32 +0000
+++ debian/changelog	2014-06-12 21:19:09 +0000
@@ -1,3 +1,10 @@
+qtubuntu-gles (0.54+14.10.20140612-0ubuntu1) utopic; urgency=low
+
+  [ Ricardo Mendoza ]
+  * Migrate to Platform API v2
+
+ -- Robert Bruce Park <[e-mail]>  Thu, 12 Jun 2014 13:51:37 -0700
+
 qtubuntu-gles (0.54+14.10.20140526.1-0ubuntu1) utopic; urgency=medium
 
   * Sync package with qtubuntu - 0.54+14.10.20140526.1

=== modified file 'debian/control'
--- debian/control	2014-05-08 19:53:01 +0000
+++ debian/control	2014-06-12 21:19:09 +0000
@@ -10,7 +10,7 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                libhybris-dev,
-               libplatform-api1-dev (>= 0.20),
+               libubuntu-application-api-dev (>= 2.0.0),
                libudev-dev,
                libxrender-dev,
                libxkbcommon-dev,
@@ -34,6 +34,7 @@
          ${shlibs:Depends},
          libqt5sensors5,
          qtubuntu-sensors,
+         ubuntu-application-api2-touch,
 Description: Qt plugins for Ubuntu Platform API (mobile) - OpenGLES
  QtUbuntu is a set of Qt5 components for the Ubuntu Platform API. It contains a
  QPA (Qt Platform Abstraction) plugin based on the Ubuntu Platform API and a

=== modified file 'debian/rules'
--- debian/rules	2014-05-08 19:53:01 +0000
+++ debian/rules	2014-06-12 21:19:09 +0000
@@ -14,7 +14,7 @@
 	dh_clean
 
 override_dh_auto_configure:
-	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" $(CURDIR)
+	mkdir -p $(ANDROID_DIR) && dh_auto_configure -B$(ANDROID_DIR) -- "CONFIG+=mirserver" "CONFIG+=mirclient" "CONFIG+=hybris" "QMAKE_CXXFLAGS=-DPLATFORM_API_TOUCH" $(CURDIR)
 
 override_dh_auto_build:
 	dh_auto_build -B$(ANDROID_DIR)

=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc	2014-05-08 19:53:01 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/main.cc	2014-06-12 21:19:09 +0000
@@ -37,8 +37,14 @@
 QPlatformIntegration* QUbuntuMirClientIntegrationPlugin::create(
     const QString& system, const QStringList& paramList) {
   Q_UNUSED(paramList);
-  if (system.toLower() == "ubuntumirclient")
+  if (system.toLower() == "ubuntumirclient") {
+#ifdef PLATFORM_API_TOUCH
+        setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirclient", 1);
+#else
+        setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirclient", 1);
+#endif
     return new QUbuntuMirIntegration();
+  }
   return 0;
 }
 

=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	2014-05-08 19:53:01 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro	2014-06-12 21:19:09 +0000
@@ -17,7 +17,7 @@
 
 PKGCONFIG += egl
 INCLUDEPATH += ../../../ ../../ ../
-LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirclient
+LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api
 
 OTHER_FILES += ubuntumirclient.json
 

=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	2014-05-08 19:53:01 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/main.cc	2014-06-12 21:19:09 +0000
@@ -37,8 +37,14 @@
 QPlatformIntegration* QUbuntuMirServerIntegrationPlugin::create(
     const QString& system, const QStringList& paramList) {
   Q_UNUSED(paramList);
-  if (system.toLower() == "ubuntumirserver")
+  if (system.toLower() == "ubuntumirserver") {
+#ifdef PLATFORM_API_TOUCH
+    setenv("UBUNTU_PLATFORM_API_BACKEND", "touch_mirserver", 1);
+#else
+    setenv("UBUNTU_PLATFORM_API_BACKEND", "desktop_mirserver", 1);
+#endif
     return new QUbuntuMirIntegration();
+  }
   return 0;
 }
 

=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro'
--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	2014-05-08 19:53:01 +0000
+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro	2014-06-12 21:19:09 +0000
@@ -17,7 +17,7 @@
 
 PKGCONFIG += egl
 INCLUDEPATH += ../../../ ../../ ../
-LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirserver
+LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon  -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api
 
 OTHER_FILES += ubuntu.json