Ubuntu Document Viewer App

Merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor into lp:ubuntu-docviewer-app

  1. reboot-cmake-refactor
  2. Merge into lo-viewer
Proposed by Stefano Verzegnassi
Status: Merged
Approved by: Stefano Verzegnassi
Approved revision: 200
Merged at revision: 207
Proposed branch: lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor
Merge into: lp:ubuntu-docviewer-app
Prerequisite: lp:~verzegnassi-stefano/ubuntu-docviewer-app/get-click-deps
Diff against target: 982 lines (+372/-300)
29 files modified
.bzrignore (+0/-1)
CMakeLists.txt (+27/-125)
click/CMakeLists.txt (+18/-0)
click/com.ubuntu.docviewer.url-dispatcher (+5/-0)
click/docviewer-content.json (+8/-0)
click/docviewer-libs.json (+94/-0)
click/docviewer.apparmor (+16/-0)
click/manifest.json.in (+25/-0)
cmake/modules/Click.cmake (+48/-0)
com.ubuntu.docviewer.url-dispatcher (+0/-5)
data/CMakeLists.txt (+29/-0)
debian/control (+37/-5)
debian/qtdeclarative5-documentviewer-common.install (+2/-0)
debian/qtdeclarative5-documentviewer-libreoffice.install (+1/-0)
debian/qtdeclarative5-documentviewer-pdf.install (+1/-0)
debian/rules (+1/-1)
debian/ubuntu-docviewer-app.install (+0/-1)
docviewer-content.json (+0/-8)
docviewer-libs.json (+0/-94)
docviewer.apparmor (+0/-16)
manifest.json.in (+0/-25)
po/CMakeLists.txt (+11/-2)
po/com.ubuntu.docviewer.pot (+25/-11)
src/CMakeLists.txt (+0/-4)
src/app/CMakeLists.txt (+6/-1)
src/plugin/file-qml-plugin/CMakeLists.txt (+4/-0)
src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt (+5/-0)
src/plugin/poppler-qml-plugin/CMakeLists.txt (+8/-0)
tools/run-pep8 (+1/-1)
To merge this branch: bzr merge lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Ubuntu Document Viewer Developers Pending
Review via email: mp+275903@code.launchpad.net

This proposal supersedes a proposal from 2015-10-21.

Commit message

* Changes to the project structure
* Provide DocViewer plugins as separate .deb packages
* Added exception for '*.user.*' in .bzrignore file

Description of the change

* Changes to the project structure
* Provide DocViewer plugins as separate .deb packages
* Added exception for '*.user.*' in .bzrignore file

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:195
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/52/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/52/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/52/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:196
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/53/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/53/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/53/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:197
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/54/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-vivid-amd64-ci/54

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-docviewer-app-reboot-ci/54/rebuild

review: Approve (continuous-integration)
Revision history for this message
Roman Shchekin (mrqtros) wrote : Posted in a previous version of this proposal

I hope ypu know what you do :)

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/149/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/12/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/17/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/155/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/17/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:197
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/161/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/23/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:198
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/27/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/171/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/27/rebuild

review: Approve (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-autolanding/10/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/409/console

review: Needs Fixing (continuous-integration)
lp:~verzegnassi-stefano/ubuntu-docviewer-app/reboot-cmake-refactor updated
199. By Stefano Verzegnassi

Merged 'reboot' - .pot not updated

200. By Stefano Verzegnassi

Updated .pot

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:200
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/29/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/177/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/docviewer-app-ci/29/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2015-11-11 19:59:15 +0000
3+++ .bzrignore 2015-11-24 16:01:42 +0000
4@@ -6,7 +6,6 @@
5 launcher/build-docviewer-launcher-Desktop-Debug/
6 launcher/build-docviewer-launcher-Desktop-Release/
7 launcher/src/docviewer-launcher.pro.user
8-*.cmake
9 CMakeFiles
10 *_automoc.cpp
11 moc_*
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2015-11-19 16:01:37 +0000
15+++ CMakeLists.txt 2015-11-24 16:01:42 +0000
16@@ -1,16 +1,8 @@
17 project(com.ubuntu.docviewer C CXX)
18 cmake_minimum_required(VERSION 2.8.9)
19
20-find_program(INTLTOOL_MERGE intltool-merge)
21-if(NOT INTLTOOL_MERGE)
22- message(FATAL_ERROR "Could not find intltool-merge, please install the intltool package")
23-endif(NOT INTLTOOL_MERGE)
24-
25-find_program(INTLTOOL_EXTRACT intltool-extract)
26-if(NOT INTLTOOL_EXTRACT)
27- message(FATAL_ERROR "Could not find intltool-extract, please install the intltool package")
28-endif(NOT INTLTOOL_EXTRACT)
29-
30+set(UBUNTU_MANIFEST_PATH "click/manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
31+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
32 set(CMAKE_AUTOMOC ON)
33 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra -fPIC")
34
35@@ -18,20 +10,16 @@
36 # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG}")
37
38 include(FindPkgConfig)
39-# Standard install paths
40 include(GNUInstallDirs)
41
42-option(INSTALL_TESTS "Install the tests on make install" on)
43-option(CLICK_MODE "Installs to a contained location" on)
44+option(INSTALL_TESTS "Install the tests on make install" on)
45+option(CLICK_MODE "Installs to a contained location" on)
46
47-set(APP_NAME ubuntu-docviewer-app)
48-set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
49-set(URLS_FILE "${PROJECT_NAME}.url-dispatcher")
50-set(LP_PROJECT ubuntu-docviewer-app)
51-set(ICON_FILE docviewer@30.png)
52-set(AUTOPILOT_DIR ubuntu_docviewer_app)
53-set(EXEC "${APP_NAME}")
54-set(UBUNTU_MANIFEST_PATH "manifest.json.in" CACHE INTERNAL "Relative path to the manifest file")
55+set(APP_NAME ubuntu-docviewer-app)
56+set(DESKTOP_FILE "${PROJECT_NAME}.desktop")
57+set(LP_PROJECT ubuntu-docviewer-app)
58+set(ICON_FILE docviewer@30.png)
59+set(AUTOPILOT_DIR ubuntu_docviewer_app)
60
61 # Sets BZR_REVNO
62 execute_process(
63@@ -40,112 +28,26 @@
64 OUTPUT_STRIP_TRAILING_WHITESPACE
65 )
66
67-if(CLICK_MODE)
68- if(NOT DEFINED BZR_SOURCE)
69- set(BZR_SOURCE "lp:${LP_PROJECT}")
70- message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
71- endif(NOT DEFINED BZR_SOURCE)
72-
73- if(NOT BZR_REVNO)
74- set(BZR_REVNO "latest")
75- endif(NOT BZR_REVNO)
76-
77- # Find out the architecture for package building
78- # to determine the plugin's installation path
79- execute_process(
80- COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
81- OUTPUT_VARIABLE ARCH_TRIPLET
82- OUTPUT_STRIP_TRAILING_WHITESPACE
83- )
84- execute_process(
85- COMMAND dpkg-architecture -qDEB_HOST_ARCH
86- OUTPUT_VARIABLE CLICK_ARCH
87- OUTPUT_STRIP_TRAILING_WHITESPACE
88- )
89- set(CMAKE_INSTALL_PREFIX /)
90- set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
91- set(BIN_DIR /lib/${ARCH_TRIPLET}/bin)
92- set(DATA_DIR /)
93- set(ICON ${ICON_FILE})
94- set(DESKTOP_DIR ${DATA_DIR})
95- set(URLS_DIR ${DATA_DIR})
96- configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
97- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json docviewer.apparmor docviewer-content.json ${URLS_FILE}
98- DESTINATION ${CMAKE_INSTALL_PREFIX})
99- # Make the click files visible in Qt Creator
100- file(GLOB CLICK_FILES
101- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
102- *.json *.json.in *.apparmor)
103-
104- add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
105-else(CLICK_MODE)
106- # components PATH
107- execute_process(
108- COMMAND qmake -query QT_INSTALL_QML
109- OUTPUT_VARIABLE QT_IMPORTS_DIR
110- OUTPUT_STRIP_TRAILING_WHITESPACE
111- )
112- set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
113- set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
114- set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
115- set(APPLICATION_DIR ${CMAKE_INSTALL_DATADIR}/accounts/applications)
116-endif(CLICK_MODE)
117-
118-file(GLOB_RECURSE I18N_SRC_FILES
119- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/po
120- *.qml *.js *.cpp)
121-list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/po/${DESKTOP_FILE}.in.in.h)
122-list(SORT I18N_SRC_FILES)
123-message("Found ${I18N_SRC_FILES}")
124-
125-file(GLOB SRC_FILES
126- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
127- *.qml *.js)
128-add_custom_target(ubuntu-docviewer-app_QMlFiles ALL SOURCES ${SRC_FILES})
129-
130-file(GLOB RESOURCE_FILES
131- RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
132- *.png *.svg)
133-install(FILES ${SRC_FILES} ${RESOURCE_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
134-
135-configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in)
136-
137-add_custom_target(${DESKTOP_FILE} ALL
138- COMMENT "Merging translations into ${DESKTOP_FILE}"
139- COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po ${DESKTOP_FILE}.in ${DESKTOP_FILE}
140-)
141-
142-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
143- DESTINATION ${DESKTOP_DIR})
144-
145+# Find out the architecture for package building
146+# to determine the plugin's installation path
147+execute_process(
148+ COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
149+ OUTPUT_VARIABLE ARCH_TRIPLET
150+ OUTPUT_STRIP_TRAILING_WHITESPACE
151+)
152+execute_process(
153+ COMMAND dpkg-architecture -qDEB_HOST_ARCH
154+ OUTPUT_VARIABLE CLICK_ARCH
155+ OUTPUT_STRIP_TRAILING_WHITESPACE
156+)
157+
158+include(Click)
159+
160 # Tests
161 enable_testing()
162
163+add_subdirectory(po)
164+add_subdirectory(click)
165+add_subdirectory(data)
166 add_subdirectory(src)
167 add_subdirectory(tests)
168-add_subdirectory(po)
169-
170-# If running in CLICK_MODE, include binary dependencies of docviewer
171-if(CLICK_MODE)
172- MESSAGE("Grabbing upstream libs to ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs")
173- execute_process(
174- COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
175- COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/get-click-deps -d ${CMAKE_CURRENT_SOURCE_DIR}/docviewer-libs.json -c ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-file-locking.sh ${CLICK_ARCH} ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs
176- )
177-
178- MESSAGE("Installing upstream libs from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
179- file(GLOB_RECURSE UPSTREAM_LIBS "${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/usr/lib/${ARCH_TRIPLET}/*")
180- foreach(ITEM ${UPSTREAM_LIBS})
181- IF( IS_DIRECTORY "${ITEM}" )
182- LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
183- ELSE()
184- LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
185- ENDIF()
186- endforeach()
187- MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
188- INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
189-
190-
191- MESSAGE("Installing LibreOffice from ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
192- INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/upstream-libs/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
193-endif(CLICK_MODE)
194
195=== added file 'click/CMakeLists.txt'
196--- click/CMakeLists.txt 1970-01-01 00:00:00 +0000
197+++ click/CMakeLists.txt 2015-11-24 16:01:42 +0000
198@@ -0,0 +1,18 @@
199+if(CLICK_MODE)
200+ if(NOT BZR_REVNO)
201+ set(BZR_REVNO "latest")
202+ endif(NOT BZR_REVNO)
203+
204+ configure_file(manifest.json.in ${CMAKE_CURRENT_BINARY_DIR}/manifest.json)
205+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/manifest.json DESTINATION ${CMAKE_INSTALL_PREFIX})
206+ install(FILES docviewer.apparmor docviewer-content.json com.ubuntu.docviewer.url-dispatcher DESTINATION ${CMAKE_INSTALL_PREFIX})
207+endif(CLICK_MODE)
208+
209+
210+# Make the click files visible in Qt Creator
211+file(GLOB CLICK_FILES
212+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
213+ *.json *.json.in *.apparmor
214+)
215+
216+add_custom_target(com_ubuntu_docviewer_CLICKFiles ALL SOURCES ${CLICK_FILES})
217
218=== added file 'click/com.ubuntu.docviewer.url-dispatcher'
219--- click/com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
220+++ click/com.ubuntu.docviewer.url-dispatcher 2015-11-24 16:01:42 +0000
221@@ -0,0 +1,5 @@
222+[
223+ {
224+ "protocol": "document"
225+ }
226+]
227
228=== added file 'click/docviewer-content.json'
229--- click/docviewer-content.json 1970-01-01 00:00:00 +0000
230+++ click/docviewer-content.json 2015-11-24 16:01:42 +0000
231@@ -0,0 +1,8 @@
232+{
233+ "destination": [
234+ "documents"
235+ ],
236+ "source": [
237+ "documents"
238+ ]
239+}
240
241=== added file 'click/docviewer-libs.json'
242--- click/docviewer-libs.json 1970-01-01 00:00:00 +0000
243+++ click/docviewer-libs.json 2015-11-24 16:01:42 +0000
244@@ -0,0 +1,94 @@
245+{
246+ "armhf": [
247+ {
248+ "url": "http://ports.ubuntu.com/ubuntu-ports",
249+ "dist": "vivid",
250+ "component": "main",
251+ "packages": [
252+ "libboost-date-time1.55.0",
253+ "libgl1-mesa-glx",
254+ "libxcb-dri3-0",
255+ "libxcb-glx0",
256+ "libxcb-present0",
257+ "libxshmfence1",
258+ "libxslt1.1",
259+ "libxt6",
260+ "libxxf86vm1",
261+ "gconf-service",
262+ "gconf-service-backend",
263+ "gconf2-common",
264+ "libgconf-2-4"
265+ ]
266+ },
267+ {
268+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
269+ "dist": "vivid",
270+ "component": "main",
271+ "packages": [
272+ "libreoffice-vanilla"
273+ ]
274+ }
275+ ],
276+
277+ "i386": [
278+ {
279+ "url": "http://archive.ubuntu.com/ubuntu",
280+ "dist": "vivid",
281+ "component": "main",
282+ "packages": [
283+ "libboost-date-time1.55.0",
284+ "libgl1-mesa-glx",
285+ "libxcb-dri3-0",
286+ "libxcb-glx0",
287+ "libxcb-present0",
288+ "libxshmfence1",
289+ "libxslt1.1",
290+ "libxt6",
291+ "libxxf86vm1",
292+ "gconf-service",
293+ "gconf-service-backend",
294+ "gconf2-common",
295+ "libgconf-2-4"
296+ ]
297+ },
298+ {
299+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
300+ "dist": "vivid",
301+ "component": "main",
302+ "packages": [
303+ "libreoffice-vanilla"
304+ ]
305+ }
306+ ],
307+
308+ "amd64": [
309+ {
310+ "url": "http://archive.ubuntu.com/ubuntu",
311+ "dist": "vivid",
312+ "component": "main",
313+ "packages": [
314+ "libboost-date-time1.55.0",
315+ "libgl1-mesa-glx",
316+ "libxcb-dri3-0",
317+ "libxcb-glx0",
318+ "libxcb-present0",
319+ "libxshmfence1",
320+ "libxslt1.1",
321+ "libxt6",
322+ "libxxf86vm1",
323+ "gconf-service",
324+ "gconf-service-backend",
325+ "gconf2-common",
326+ "libgconf-2-4"
327+ ]
328+ },
329+ {
330+ "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
331+ "dist": "vivid",
332+ "component": "main",
333+ "packages": [
334+ "libreoffice-vanilla"
335+ ]
336+ }
337+ ]
338+}
339
340=== added file 'click/docviewer.apparmor'
341--- click/docviewer.apparmor 1970-01-01 00:00:00 +0000
342+++ click/docviewer.apparmor 2015-11-24 16:01:42 +0000
343@@ -0,0 +1,16 @@
344+{
345+ "policy_groups": [
346+ "content_exchange_source",
347+ "content_exchange"
348+ ],
349+ "read_path": [
350+ "@{HOME}/Documents/",
351+ "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
352+ "@{PROC}/*/mounts",
353+ "/dev/disk/by-label/"
354+ ],
355+ "write_path": [
356+ "@{HOME}/Documents/"
357+ ],
358+ "policy_version": 1.2
359+}
360
361=== added file 'click/manifest.json.in'
362--- click/manifest.json.in 1970-01-01 00:00:00 +0000
363+++ click/manifest.json.in 2015-11-24 16:01:42 +0000
364@@ -0,0 +1,25 @@
365+{
366+ "name": "com.ubuntu.docviewer",
367+ "title": "Document Viewer",
368+ "description": "Document Viewer application for Ubuntu devices",
369+ "framework": "ubuntu-sdk-14.10",
370+ "architecture": "@CLICK_ARCH@",
371+ "icon": "@ICON@",
372+ "hooks": {
373+ "docviewer": {
374+ "apparmor": "docviewer.apparmor",
375+ "desktop": "com.ubuntu.docviewer.desktop",
376+ "content-hub": "docviewer-content.json",
377+ "urls": "@URLS_FILE@"
378+ }
379+ },
380+ "version": "0.3.@BZR_REVNO@",
381+ "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
382+ "x-source": {
383+ "vcs-bzr": "@BZR_SOURCE@",
384+ "vcs-bzr-revno": "@BZR_REVNO@"
385+ },
386+ "x-test": {
387+ "autopilot": "@AUTOPILOT_DIR@"
388+ }
389+}
390
391=== added directory 'cmake'
392=== added directory 'cmake/modules'
393=== added file 'cmake/modules/Click.cmake'
394--- cmake/modules/Click.cmake 1970-01-01 00:00:00 +0000
395+++ cmake/modules/Click.cmake 2015-11-24 16:01:42 +0000
396@@ -0,0 +1,48 @@
397+if(CLICK_MODE)
398+ if(NOT DEFINED BZR_SOURCE)
399+ set(BZR_SOURCE "lp:${LP_PROJECT}")
400+ message("-- Setting BZR_SOURCE to ${BZR_SOURCE}")
401+ endif(NOT DEFINED BZR_SOURCE)
402+
403+ set(QT_IMPORTS_DIR "/lib/${ARCH_TRIPLET}")
404+ set(CMAKE_INSTALL_PREFIX /)
405+ set(DATA_DIR /)
406+
407+ # Path for ubuntu-docviewer-app executable
408+ set(BIN_DIR ${DATA_DIR}lib/${ARCH_TRIPLET}/bin)
409+
410+ # If running in CLICK_MODE, include binary dependencies of docviewer
411+ set(GET_CLICK_DEPS_TOOL ${CMAKE_SOURCE_DIR}/tools/get-click-deps)
412+ set(DEPS_MANIFEST ${CMAKE_CURRENT_SOURCE_DIR}/click/docviewer-libs.json)
413+ set(CUSTOM_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/click/disable-file-locking.sh)
414+ set(UPSTREAM_LIBS_DIR ${CMAKE_BINARY_DIR}/upstream-libs)
415+
416+ MESSAGE("Grabbing upstream libs to ${UPSTREAM_LIBS_DIR}")
417+ execute_process(
418+ COMMAND mkdir ${UPSTREAM_LIBS_DIR}
419+ COMMAND ${GET_CLICK_DEPS_TOOL} -d ${DEPS_MANIFEST} -c ${CUSTOM_SCRIPT} ${CLICK_ARCH} ${UPSTREAM_LIBS_DIR}
420+ )
421+
422+ MESSAGE("Installing upstream libs from ${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/ to ${DATA_DIR}lib/${ARCH_TRIPLET}")
423+ file(GLOB_RECURSE UPSTREAM_LIBS "${UPSTREAM_LIBS_DIR}/usr/lib/${ARCH_TRIPLET}/*")
424+ foreach(ITEM ${UPSTREAM_LIBS})
425+ IF( IS_DIRECTORY "${ITEM}" )
426+ LIST( APPEND DIRS_TO_DEPLOY "${ITEM}" )
427+ ELSE()
428+ LIST( APPEND FILES_TO_DEPLOY "${ITEM}" )
429+ ENDIF()
430+ endforeach()
431+ MESSAGE("Following files to install:- ${FILES_TO_DEPLOY}")
432+ INSTALL( FILES ${FILES_TO_DEPLOY} DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET} )
433+
434+ MESSAGE("Installing LibreOffice from ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice to ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice")
435+ INSTALL( DIRECTORY ${UPSTREAM_LIBS_DIR}/opt/libreoffice/lib/libreoffice/ DESTINATION ${DATA_DIR}lib/${ARCH_TRIPLET}/libreoffice )
436+else(CLICK_MODE)
437+ execute_process(
438+ COMMAND qmake -query QT_INSTALL_QML
439+ OUTPUT_VARIABLE QT_IMPORTS_DIR
440+ OUTPUT_STRIP_TRAILING_WHITESPACE
441+ )
442+
443+ set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_NAME})
444+endif(CLICK_MODE)
445
446=== removed file 'com.ubuntu.docviewer.url-dispatcher'
447--- com.ubuntu.docviewer.url-dispatcher 2015-02-13 15:30:01 +0000
448+++ com.ubuntu.docviewer.url-dispatcher 1970-01-01 00:00:00 +0000
449@@ -1,5 +0,0 @@
450-[
451- {
452- "protocol": "document"
453- }
454-]
455
456=== added directory 'data'
457=== added file 'data/CMakeLists.txt'
458--- data/CMakeLists.txt 1970-01-01 00:00:00 +0000
459+++ data/CMakeLists.txt 2015-11-24 16:01:42 +0000
460@@ -0,0 +1,29 @@
461+if(CLICK_MODE)
462+ set(ICON ${ICON_FILE})
463+ set(DESKTOP_DIR ${DATA_DIR})
464+
465+ install(FILES ${ICON_FILE} DESTINATION ${DATA_DIR})
466+else(CLICK_MODE)
467+ set(ICON "${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE}")
468+ set(DESKTOP_DIR ${CMAKE_INSTALL_DATADIR}/applications)
469+
470+ install(DIRECTORY icons/hicolor DESTINATION ${CMAKE_INSTALL_DATADIR}/icons
471+ FILES_MATCHING PATTERN *.png
472+ )
473+endif(CLICK_MODE)
474+
475+set(EXEC "${APP_NAME}")
476+
477+configure_file(${DESKTOP_FILE}.in.in ${DESKTOP_FILE}.in @ONLY)
478+
479+add_custom_target(${DESKTOP_FILE} ALL
480+ COMMENT "Merging translations into ${DESKTOP_FILE}"
481+ COMMAND LC_ALL=C ${INTLTOOL_MERGE} -d -u ${CMAKE_SOURCE_DIR}/po
482+ ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in ${DESKTOP_FILE}
483+)
484+
485+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}
486+ DESTINATION ${DESKTOP_DIR}
487+)
488+
489+install(FILES ${URLS_FILE} DESTINATION ${CMAKE_INSTALL_PREFIX})
490
491=== renamed file 'com.ubuntu.docviewer.desktop.in.in' => 'data/com.ubuntu.docviewer.desktop.in.in'
492=== renamed file 'docviewer@30.png' => 'data/docviewer@30.png'
493=== modified file 'debian/control'
494--- debian/control 2015-09-19 14:54:11 +0000
495+++ debian/control 2015-11-24 16:01:42 +0000
496@@ -21,20 +21,52 @@
497 Standards-Version: 3.9.6
498 Section: misc
499 Homepage: https://launchpad.net/ubuntu-docviewer-app
500-Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/trunk
501+Vcs-Bzr: https://code.launchpad.net/~ubuntu-docviewer-dev/ubuntu-docviewer-app/reboot
502
503 Package: ubuntu-docviewer-app
504 Architecture: any
505-Depends: qtdeclarative5-qtquick2-plugin,
506+Depends: ${misc:Depends},
507+ qtdeclarative5-documentviewer-common (= ${source:Version}),
508+ qtdeclarative5-documentviewer-libreoffice (= ${source:Version}),
509+ qtdeclarative5-documentviewer-pdf (= ${source:Version}),
510+ suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
511+ qtdeclarative5-qtquick2-plugin,
512 qtdeclarative5-ubuntu-ui-toolkit-plugin,
513 qtdeclarative5-ubuntu-content1,
514 qtdeclarative5-quicklayouts-plugin,
515- qtdeclarative5-window-plugin,
516- suru-icon-theme (>= 14.04+15.10.20150707-0ubuntu1),
517- ${misc:Depends}
518+ qtdeclarative5-window-plugin
519 Description: Document Viewer application
520 Core Document Viewer application
521
522+Package: qtdeclarative5-documentviewer-common
523+Architecture: any
524+Depends: ${misc:Depends},
525+ ${shlibs:Depends},
526+ ${misc:Pre-Depends},
527+Description: Document Viewer QML plugin
528+ This package contains a plugin with some helper functions for the Ubuntu
529+ Document Viewer.
530+
531+Package: qtdeclarative5-documentviewer-libreoffice
532+Architecture: any
533+Depends: ${misc:Depends},
534+ ${shlibs:Depends},
535+ ${misc:Pre-Depends},
536+ libreoffice-vanilla (>= 5.0.0) | libreoffice (>= 5.0.0)
537+Description: LibreOffice QML plugin
538+ This package contains a plugin that enables QML apps to read
539+ and display any LibreOffice document.
540+
541+Package: qtdeclarative5-documentviewer-pdf
542+Architecture: any
543+Depends: ${misc:Depends},
544+ ${shlibs:Depends},
545+ ${misc:Pre-Depends},
546+ libpoppler-qt5-1
547+Description: Poppler PDF QML plugin
548+ This package contains a plugin that enables QML apps to read
549+ and display any PDF document, via the Poppler Qt5 bindings.
550+
551 Package: ubuntu-docviewer-app-autopilot
552 Architecture: all
553 Depends: libautopilot-qt,
554
555=== added file 'debian/qtdeclarative5-documentviewer-common.install'
556--- debian/qtdeclarative5-documentviewer-common.install 1970-01-01 00:00:00 +0000
557+++ debian/qtdeclarative5-documentviewer-common.install 2015-11-24 16:01:42 +0000
558@@ -0,0 +1,2 @@
559+usr/lib/*/qt5/qml/DocumentViewer/qmldir
560+usr/lib/*/qt5/qml/DocumentViewer/libfileqmlplugin.so
561
562=== added file 'debian/qtdeclarative5-documentviewer-libreoffice.install'
563--- debian/qtdeclarative5-documentviewer-libreoffice.install 1970-01-01 00:00:00 +0000
564+++ debian/qtdeclarative5-documentviewer-libreoffice.install 2015-11-24 16:01:42 +0000
565@@ -0,0 +1,1 @@
566+usr/lib/*/qt5/qml/DocumentViewer/LibreOffice
567
568=== added file 'debian/qtdeclarative5-documentviewer-pdf.install'
569--- debian/qtdeclarative5-documentviewer-pdf.install 1970-01-01 00:00:00 +0000
570+++ debian/qtdeclarative5-documentviewer-pdf.install 2015-11-24 16:01:42 +0000
571@@ -0,0 +1,1 @@
572+usr/lib/*/qt5/qml/DocumentViewer/PDF
573
574=== modified file 'debian/rules'
575--- debian/rules 2015-04-27 16:29:17 +0000
576+++ debian/rules 2015-11-24 16:01:42 +0000
577@@ -12,7 +12,7 @@
578
579 override_dh_auto_test:
580 dh_auto_test
581- ./run-pep8
582+ ./tools/run-pep8
583
584 override_dh_install:
585 dh_install --fail-missing
586
587=== modified file 'debian/ubuntu-docviewer-app.install'
588--- debian/ubuntu-docviewer-app.install 2015-01-29 19:23:09 +0000
589+++ debian/ubuntu-docviewer-app.install 2015-11-24 16:01:42 +0000
590@@ -1,5 +1,4 @@
591 usr/bin/ubuntu-docviewer-app
592-usr/lib/*/qt5
593 usr/share/applications
594 usr/share/locale
595 usr/share/ubuntu-docviewer-app
596
597=== removed file 'docviewer-content.json'
598--- docviewer-content.json 2015-02-13 15:30:01 +0000
599+++ docviewer-content.json 1970-01-01 00:00:00 +0000
600@@ -1,8 +0,0 @@
601-{
602- "destination": [
603- "documents"
604- ],
605- "source": [
606- "documents"
607- ]
608-}
609
610=== removed file 'docviewer-libs.json'
611--- docviewer-libs.json 2015-10-27 13:32:23 +0000
612+++ docviewer-libs.json 1970-01-01 00:00:00 +0000
613@@ -1,94 +0,0 @@
614-{
615- "armhf": [
616- {
617- "url": "http://ports.ubuntu.com/ubuntu-ports",
618- "dist": "vivid",
619- "component": "main",
620- "packages": [
621- "libboost-date-time1.55.0",
622- "libgl1-mesa-glx",
623- "libxcb-dri3-0",
624- "libxcb-glx0",
625- "libxcb-present0",
626- "libxshmfence1",
627- "libxslt1.1",
628- "libxt6",
629- "libxxf86vm1",
630- "gconf-service",
631- "gconf-service-backend",
632- "gconf2-common",
633- "libgconf-2-4"
634- ]
635- },
636- {
637- "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
638- "dist": "vivid",
639- "component": "main",
640- "packages": [
641- "libreoffice-vanilla"
642- ]
643- }
644- ],
645-
646- "i386": [
647- {
648- "url": "http://archive.ubuntu.com/ubuntu",
649- "dist": "vivid",
650- "component": "main",
651- "packages": [
652- "libboost-date-time1.55.0",
653- "libgl1-mesa-glx",
654- "libxcb-dri3-0",
655- "libxcb-glx0",
656- "libxcb-present0",
657- "libxshmfence1",
658- "libxslt1.1",
659- "libxt6",
660- "libxxf86vm1",
661- "gconf-service",
662- "gconf-service-backend",
663- "gconf2-common",
664- "libgconf-2-4"
665- ]
666- },
667- {
668- "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
669- "dist": "vivid",
670- "component": "main",
671- "packages": [
672- "libreoffice-vanilla"
673- ]
674- }
675- ],
676-
677- "amd64": [
678- {
679- "url": "http://archive.ubuntu.com/ubuntu",
680- "dist": "vivid",
681- "component": "main",
682- "packages": [
683- "libboost-date-time1.55.0",
684- "libgl1-mesa-glx",
685- "libxcb-dri3-0",
686- "libxcb-glx0",
687- "libxcb-present0",
688- "libxshmfence1",
689- "libxslt1.1",
690- "libxt6",
691- "libxxf86vm1",
692- "gconf-service",
693- "gconf-service-backend",
694- "gconf2-common",
695- "libgconf-2-4"
696- ]
697- },
698- {
699- "url": "http://ppa.launchpad.net/canonical-community/ppa/ubuntu",
700- "dist": "vivid",
701- "component": "main",
702- "packages": [
703- "libreoffice-vanilla"
704- ]
705- }
706- ]
707-}
708
709=== removed file 'docviewer.apparmor'
710--- docviewer.apparmor 2015-11-06 10:59:14 +0000
711+++ docviewer.apparmor 1970-01-01 00:00:00 +0000
712@@ -1,16 +0,0 @@
713-{
714- "policy_groups": [
715- "content_exchange_source",
716- "content_exchange"
717- ],
718- "read_path": [
719- "@{HOME}/Documents/",
720- "/media/*/*/[Dd][Oo][Cc][Uu][Mm][Ee][Nn][Tt][Ss]/",
721- "@{PROC}/*/mounts",
722- "/dev/disk/by-label/"
723- ],
724- "write_path": [
725- "@{HOME}/Documents/"
726- ],
727- "policy_version": 1.2
728-}
729
730=== removed file 'manifest.json.in'
731--- manifest.json.in 2015-02-13 15:30:01 +0000
732+++ manifest.json.in 1970-01-01 00:00:00 +0000
733@@ -1,25 +0,0 @@
734-{
735- "name": "com.ubuntu.docviewer",
736- "title": "Document Viewer",
737- "description": "Document Viewer application for Ubuntu devices",
738- "framework": "ubuntu-sdk-14.10",
739- "architecture": "@CLICK_ARCH@",
740- "icon": "@ICON@",
741- "hooks": {
742- "docviewer": {
743- "apparmor": "docviewer.apparmor",
744- "desktop": "com.ubuntu.docviewer.desktop",
745- "content-hub": "docviewer-content.json",
746- "urls": "@URLS_FILE@"
747- }
748- },
749- "version": "0.3.@BZR_REVNO@",
750- "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
751- "x-source": {
752- "vcs-bzr": "@BZR_SOURCE@",
753- "vcs-bzr-revno": "@BZR_REVNO@"
754- },
755- "x-test": {
756- "autopilot": "@AUTOPILOT_DIR@"
757- }
758-}
759
760=== modified file 'po/CMakeLists.txt'
761--- po/CMakeLists.txt 2015-04-29 16:09:12 +0000
762+++ po/CMakeLists.txt 2015-11-24 16:01:42 +0000
763@@ -17,12 +17,22 @@
764 set(POT_FILE ${DOMAIN}.pot)
765 file(GLOB PO_FILES *.po)
766
767+file(GLOB_RECURSE I18N_SRC_FILES
768+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
769+ ${CMAKE_SOURCE_DIR}/*.qml
770+ ${CMAKE_SOURCE_DIR}/*.js
771+ ${CMAKE_SOURCE_DIR}/*.cpp)
772+list(APPEND I18N_SRC_FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE}.in.in.h)
773+list(SORT I18N_SRC_FILES)
774+
775+message("Found ${I18N_SRC_FILES}")
776+
777 # Creates the .pot file containing the translations template
778 add_custom_target(${POT_FILE} ALL
779 COMMENT "Generating translation template"
780 # Extract the translatable messages from the desktop file
781 COMMAND ${INTLTOOL_EXTRACT} --update --type=gettext/ini
782- --srcdir=${CMAKE_SOURCE_DIR} ${DESKTOP_FILE}.in.in
783+ --srcdir=${CMAKE_SOURCE_DIR}/data ${DESKTOP_FILE}.in.in
784 # Update the translation file
785 COMMAND ${GETTEXT_XGETTEXT_EXECUTABLE} -o ${POT_FILE}
786 --from-code=UTF-8
787@@ -47,7 +57,6 @@
788 RENAME ${DOMAIN}.mo)
789 endforeach(PO_FILE)
790
791-
792 # make the translation files visible on qtcreator
793 file(GLOB TRANSLATION_FILES
794 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
795
796=== modified file 'po/com.ubuntu.docviewer.pot'
797--- po/com.ubuntu.docviewer.pot 2015-11-21 19:24:07 +0000
798+++ po/com.ubuntu.docviewer.pot 2015-11-24 16:01:42 +0000
799@@ -8,7 +8,7 @@
800 msgstr ""
801 "Project-Id-Version: \n"
802 "Report-Msgid-Bugs-To: \n"
803-"POT-Creation-Date: 2015-11-21 22:13+0300\n"
804+"POT-Creation-Date: 2015-11-24 17:00+0100\n"
805 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
806 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
807 "Language-Team: LANGUAGE <LL@li.org>\n"
808@@ -68,15 +68,11 @@
809 msgid "MIME type"
810 msgstr ""
811
812-#: ../src/app/qml/common/FileNotFoundDialog.qml:24
813+#: ../src/app/qml/common/ErrorDialog.qml:23
814 msgid "Error"
815 msgstr ""
816
817-#: ../src/app/qml/common/FileNotFoundDialog.qml:25
818-msgid "File does not exist"
819-msgstr ""
820-
821-#: ../src/app/qml/common/FileNotFoundDialog.qml:28
822+#: ../src/app/qml/common/ErrorDialog.qml:26
823 #: ../src/app/qml/common/PickImportedDialog.qml:53
824 #: ../src/app/qml/common/RejectedImportDialog.qml:38
825 #: ../src/app/qml/documentPage/DocumentPageSelectionModeHeader.qml:33
826@@ -245,7 +241,7 @@
827
828 #: ../src/app/qml/documentPage/DocumentPageSearchHeader.qml:27
829 #: ../src/app/qml/loView/LOViewDefaultHeader.qml:70
830-#: ../src/app/qml/loView/LOViewPage.qml:208
831+#: ../src/app/qml/loView/LOViewPage.qml:233
832 #: ../src/app/qml/pdfView/PdfViewDefaultHeader.qml:61
833 #: ../src/app/qml/textView/TextViewDefaultHeader.qml:61
834 msgid "Back"
835@@ -379,10 +375,24 @@
836 msgstr ""
837
838 #: ../src/app/qml/loView/LOViewPage.qml:35
839-#: ../src/app/qml/loView/LOViewPage.qml:206
840+#: ../src/app/qml/loView/LOViewPage.qml:231
841 msgid "Slides"
842 msgstr ""
843
844+#: ../src/app/qml/loView/LOViewPage.qml:188
845+msgid "LibreOffice binaries not found."
846+msgstr ""
847+
848+#: ../src/app/qml/loView/LOViewPage.qml:191
849+msgid "Error while loading LibreOffice."
850+msgstr ""
851+
852+#: ../src/app/qml/loView/LOViewPage.qml:194
853+msgid ""
854+"Document not loaded.\n"
855+"The requested document may be corrupt."
856+msgstr ""
857+
858 #: ../src/app/qml/loView/LOViewZoomHeader.qml:42
859 msgid "Hide zoom controls"
860 msgstr ""
861@@ -444,6 +454,10 @@
862 msgid "Choose a page between 1 and %1"
863 msgstr ""
864
865+#: ../src/app/qml/ubuntu-docviewer-app.qml:130
866+msgid "File does not exist."
867+msgstr ""
868+
869 #. TRANSLATORS: This string is used for renaming a copied file,
870 #. when a file with the same name already exists in user's
871 #. Documents folder.
872@@ -458,10 +472,10 @@
873 msgid "copy %1"
874 msgstr ""
875
876-#: /home/qtros/dev/build-ubuntu-docviewer-app-zoom-final-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
877+#: /tmp/build-reboot-cmake-refactor-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:1
878 msgid "Document Viewer"
879 msgstr ""
880
881-#: /home/qtros/dev/build-ubuntu-docviewer-app-zoom-final-UbuntuSDK_for_armhf_GCC_ubuntu_sdk_15_04_vivid-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
882+#: /tmp/build-reboot-cmake-refactor-Desktop-Default/po/com.ubuntu.docviewer.desktop.in.in.h:2
883 msgid "documents;viewer;pdf;reader;"
884 msgstr ""
885
886=== modified file 'src/CMakeLists.txt'
887--- src/CMakeLists.txt 2015-01-29 16:35:28 +0000
888+++ src/CMakeLists.txt 2015-11-24 16:01:42 +0000
889@@ -1,6 +1,2 @@
890-find_package(Qt5Core)
891-find_package(Qt5Qml)
892-find_package(Qt5Quick)
893-
894 add_subdirectory(app)
895 add_subdirectory(plugin)
896
897=== modified file 'src/app/CMakeLists.txt'
898--- src/app/CMakeLists.txt 2015-10-20 11:58:48 +0000
899+++ src/app/CMakeLists.txt 2015-11-24 16:01:42 +0000
900@@ -1,6 +1,11 @@
901 file(GLOB_RECURSE QML_SRCS *.qml *.js)
902 file(GLOB_RECURSE IMAGE_FILES *.qml *.js)
903
904+find_package(Qt5Core)
905+find_package(Qt5Gui)
906+find_package(Qt5Qml)
907+find_package(Qt5Quick)
908+
909 add_definitions(
910 -DGETTEXT_PACKAGE=\"${PROJECT_NAME}\"
911 -DGETTEXT_LOCALEDIR=\"${CMAKE_INSTALL_LOCALEDIR}\"
912@@ -23,7 +28,7 @@
913
914 add_executable(ubuntu-docviewer-app ${docviewer_SRCS})
915
916-qt5_use_modules(ubuntu-docviewer-app Widgets Gui Qml Quick DBus Concurrent)
917+qt5_use_modules(ubuntu-docviewer-app Gui Qml Quick)
918
919 if(NOT "${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
920 add_custom_target(docviewer-qmlfiles ALL
921
922=== modified file 'src/plugin/file-qml-plugin/CMakeLists.txt'
923--- src/plugin/file-qml-plugin/CMakeLists.txt 2015-09-19 15:40:22 +0000
924+++ src/plugin/file-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
925@@ -1,6 +1,10 @@
926 set(PLUGIN_DIR DocumentViewer)
927 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
928
929+find_package(Qt5Core)
930+find_package(Qt5Qml)
931+find_package(Qt5Quick)
932+
933 #add the sources to compile
934 set(fileqmlplugin_SRCS
935 backend.cpp
936
937=== modified file 'src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt'
938--- src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt 2015-11-11 19:59:15 +0000
939+++ src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
940@@ -1,5 +1,10 @@
941 set(PLUGIN_DIR DocumentViewer/LibreOffice)
942
943+find_package(Qt5Core)
944+find_package(Qt5Gui)
945+find_package(Qt5Qml)
946+find_package(Qt5Quick)
947+
948 file(GLOB_RECURSE QML_SRCS
949 qml/*.qml
950 qml/*.js
951
952=== modified file 'src/plugin/poppler-qml-plugin/CMakeLists.txt'
953--- src/plugin/poppler-qml-plugin/CMakeLists.txt 2015-07-14 15:43:11 +0000
954+++ src/plugin/poppler-qml-plugin/CMakeLists.txt 2015-11-24 16:01:42 +0000
955@@ -1,4 +1,12 @@
956 set(PLUGIN_DIR DocumentViewer/PDF)
957+
958+find_package(Qt5Core)
959+find_package(Qt5Gui)
960+find_package(Qt5Qml)
961+find_package(Qt5Quick)
962+find_package(Qt5Xml)
963+find_package(Qt5Concurrent)
964+
965 include_directories(
966 ${CMAKE_CURRENT_SOURCE_DIR}
967 ${CMAKE_CURRENT_BINARY_DIR}
968
969=== added directory 'tools'
970=== renamed file 'get-click-deps' => 'tools/get-click-deps'
971=== renamed file 'run-pep8' => 'tools/run-pep8'
972--- run-pep8 2015-04-27 16:29:17 +0000
973+++ tools/run-pep8 2015-11-24 16:01:42 +0000
974@@ -2,7 +2,7 @@
975 set -e
976
977 echo "= pep8 ="
978-for i in `find . -iname '*.py'` ; do
979+for i in `find .. -iname '*.py'` ; do
980 echo "Checking $i"
981 pep8 $i
982 done

Subscribers

People subscribed via source and target branches