Ubuntu Document Viewer App

Merge lp:~didrocks/ubuntu-docviewer-app/build-fix into lp:~chocanto/ubuntu-docviewer-app/plainText

  1. build-fix
  2. Merge into plainText
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Anthony Granger
Approved revision: 8
Merged at revision: 8
Proposed branch: lp:~didrocks/ubuntu-docviewer-app/build-fix
Merge into: lp:~chocanto/ubuntu-docviewer-app/plainText
Diff against target: 21 lines (+3/-2)
2 files modified
launcher/src/docviewer-launcher.pri (+2/-2)
main.pro (+1/-0)
To merge this branch: bzr merge lp:~didrocks/ubuntu-docviewer-app/build-fix
Reviewer Review Type Date Requested Status
Anthony Granger Approve
Review via email: mp+159823@code.launchpad.net

Commit message

add a .pro file at the root of the directory so that debhelper builds with it. Rename the .pro to .pri for the included qmake file as it's the rule, and change paths

Description of the change

add a .pro file at the root of the directory so that debhelper builds with it. Rename the .pro to .pri for the included qmake file as it's the rule, and change paths

---
Note that with distro flags (warnings being treated as errors), a small fix to main.cpp is needed.

To post a comment you must log in.
Revision history for this message
Anthony Granger (chocanto) wrote :

Thank you for your help !

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== renamed file 'launcher/src/docviewer-launcher.pro' => 'launcher/src/docviewer-launcher.pri'
2--- launcher/src/docviewer-launcher.pro 2013-04-18 05:43:11 +0000
3+++ launcher/src/docviewer-launcher.pri 2013-04-19 13:22:25 +0000
4@@ -6,9 +6,9 @@
5
6 QT += gui qml quick
7
8-TARGET = ../../ubuntu-docviewer-app
9+TARGET = ubuntu-docviewer-app
10
11 TEMPLATE = app
12
13
14-SOURCES += main.cpp
15+SOURCES += launcher/src/main.cpp
16
17=== added file 'main.pro'
18--- main.pro 1970-01-01 00:00:00 +0000
19+++ main.pro 2013-04-19 13:22:25 +0000
20@@ -0,0 +1,1 @@
21+include(launcher/src/docviewer-launcher.pri)

Subscribers

People subscribed via source and target branches