Merge lp:~sergiusens/phablet-extras/qtmultimedia-touch-quick into lp:~phablet-team/phablet-extras/qtmultimedia-touch

[Sergio Schvezov]

[lp:~sergiusens/phablet-extras/qtmultimedia-touch-quick]

84. By Sergio Schvezov on 2013-10-03

Moving quick addition

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-24 22:36:49 +0000
+++ debian/changelog	2013-10-03 00:29:27 +0000
@@ -1,3 +1,9 @@
+qtmultimedia-opensource-src-touch (5.1.1+git20130920+5b12abb862-0ubuntu3) UNRELEASED; urgency=low
+
+  * Adding quick to pro file for qgsttools_p (LP: #1234087).
+
+ -- Sergio Schvezov <[e-mail]>  Wed, 02 Oct 2013 20:21:03 -0300
+
 qtmultimedia-opensource-src-touch (5.1.1+git20130920+5b12abb862-0ubuntu2) saucy; urgency=low
 
   * Don't build the packages not being diverted.

=== modified file 'debian/control'
--- debian/control	2013-09-20 07:33:34 +0000
+++ debian/control	2013-10-03 00:29:27 +0000
@@ -27,7 +27,7 @@
 Homepage: https://qt-project.org/
 Vcs-Git: git://github.com/jhodapp/qtmultimedia.git
 Vcs-Browser: https://github.com/jhodapp/qtmultimedia
-Vcs-Bzr: https://code.launchpad.net/~phablet-team/phablet-extras/qtmultimedia-opensource-src-touch
+Vcs-Bzr: https://code.launchpad.net/~phablet-team/phablet-extras/qtmultimedia-touch
 
 Package: libqt5multimedia5-touch
 Architecture: any

=== added directory 'debian/patches'
=== added file 'debian/patches/add_quick_to_qgsttools.patch'
--- debian/patches/add_quick_to_qgsttools.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/add_quick_to_qgsttools.patch	2013-10-03 00:29:27 +0000
@@ -0,0 +1,16 @@
+Description: Adds quick to pro file for qgsttools_p
+Author: "Sergio Schvezov <[e-mail]>"
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/telephony-service/+bug/1234087
+Forwarded: https://github.com/jhodapp/qtmultimedia/compare/gst-1.0...sergiusens:gst-1.0
+
+--- a/src/gsttools/gsttools.pro
++++ b/src/gsttools/gsttools.pro
+@@ -111,7 +111,7 @@
+     contains(QT_CONFIG, opengles2):qtHaveModule(widgets) {
+         PRIVATE_HEADERS += qgstreamermirtexturerenderer_p.h
+         SOURCES += qgstreamermirtexturerenderer.cpp
+-        QT += opengl
++        QT += opengl quick
+         LIBS += -lEGL
+     }
+     DEFINES += HAVE_MIR

=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2013-10-03 00:29:27 +0000
@@ -0,0 +1,1 @@
+add_quick_to_qgsttools.patch