Merge lp:~saviq/qtmir/fix-application-api-deps into lp:qtmir

[Michał Sawicz]

Require an application API version, fix the provided version and use include dir from the .pc file

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Y

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:329
http://jenkins.qa.ubuntu.com/job/qtmir-ci/246/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/97
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/97/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/246/rebuild

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

LGTM
 * Did you perform an exploratory manual test run of the code change and any related functionality?
Y
 * Did CI run pass? If not, please explain why.
Y

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:331
http://jenkins.qa.ubuntu.com/job/qtmir-ci/262/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/qtmir-vivid-armhf-ci/113/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtmir-ci/262/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-03-18 10:12:16 +0000
+++ CMakeLists.txt	2015-05-05 09:46:22 +0000
@@ -79,6 +79,7 @@
 pkg_check_modules(LTTNG lttng-ust)
 pkg_check_modules(QTDBUSTEST libqtdbustest-1 REQUIRED)
 pkg_check_modules(QTDBUSMOCK libqtdbusmock-1 REQUIRED)
+pkg_check_modules(APPLICATION_API REQUIRED unity-shell-application=5)
 
 add_definitions(-DMIR_REQUIRE_DEPRECATED_EVENT_OPT_IN=1)
 

=== modified file 'debian/control'
--- debian/control	2015-03-04 17:08:47 +0000
+++ debian/control	2015-05-05 09:46:22 +0000
@@ -99,7 +99,7 @@
 Conflicts: libqtmir,
            libunity-mir1,
 Provides: unity-application-impl,
-          unity-application-impl-4,
+          unity-application-impl-5,
 Description: Qt plugin for Unity specific Mir APIs
  QtMir provides Qt/QML bindings for Mir features that are exposed through the
  qtmir-desktop or qtmir-android QPA plugin such as Application management

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2015-01-08 12:37:08 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2015-05-05 09:46:22 +0000
@@ -1,4 +1,5 @@
 include_directories(
+    ${APPLICATION_API_INCLUDE_DIRS}
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
@@ -42,8 +43,8 @@
     upstart/applicationcontroller.cpp
     tracepoints.c
 # We need to run moc on these headers
-    /usr/include/unity/shell/application/ApplicationInfoInterface.h
-    /usr/include/unity/shell/application/ApplicationManagerInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
+    ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
 # Feed the automoc monster
     session_interface.h
     applicationcontroller.h