qtubuntu

Merge lp:~aacid/qtubuntu/egl_link into lp:qtubuntu

  1. egl_link
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Merged
Approved by: Gerry Boland
Approved revision: 195
Merged at revision: 195
Proposed branch: lp:~aacid/qtubuntu/egl_link
Merge into: lp:qtubuntu
Diff against target: 43 lines (+6/-3)
3 files modified
src/platforms/ubuntu/ubuntu/ubuntu.pro (+2/-1)
src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro (+2/-1)
src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro (+2/-1)
To merge this branch: bzr merge lp:~aacid/qtubuntu/egl_link
Reviewer Review Type Date Requested Status
Daniel d'Andrada (community) Approve
Gerry Boland (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+196120@code.launchpad.net

Commit message

Link against EGL since we use it

It was probably being pulled by a dependency before

To post a comment you must log in.
lp:~aacid/qtubuntu/egl_link updated
195. By Albert Astals Cid

Link against EGL since we use it

It was probably being pulled by a dependency before

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:195
http://jenkins.qa.ubuntu.com/job/qtubuntu-ci/96/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/7
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-trusty-armhf-ci/7/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

What's the difference (pros/cons) between the pkgconfig usage here and this http://paste.ubuntu.com/6453587/ ?

review: Needs Information
Revision history for this message
Gerry Boland (gerboland) :
review: Approve
Revision history for this message
Albert Astals Cid (aacid) wrote :

@Daniel: My understanding is that this MR says "We are using EGL libs and want to link against the EGL libs", while what your patch says is "we want to use QT egl support", which also works, but is less according to what we are doing.

Revision history for this message
Daniel d'Andrada (dandrader) wrote :

Ok then.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/platforms/ubuntu/ubuntu/ubuntu.pro'
2--- src/platforms/ubuntu/ubuntu/ubuntu.pro 2013-08-23 14:07:09 +0000
3+++ src/platforms/ubuntu/ubuntu/ubuntu.pro 2013-11-21 14:53:38 +0000
4@@ -13,8 +13,9 @@
5
6 SOURCES = main.cc
7
8-CONFIG += plugin link_prl
9+CONFIG += plugin link_prl link_pkgconfig
10
11+PKGCONFIG += egl
12 INCLUDEPATH += ../../ ../
13 LIBS += -L../ubuntucommon -lqubuntucommon -lubuntu_application_api -L../../base -lubuntubase
14
15
16=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro'
17--- src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro 2013-08-08 15:27:37 +0000
18+++ src/platforms/ubuntu/ubuntumir/ubuntumirclient/ubuntumirclient.pro 2013-11-21 14:53:38 +0000
19@@ -13,8 +13,9 @@
20
21 SOURCES = main.cc
22
23-CONFIG += plugin link_prl
24+CONFIG += plugin link_prl link_pkgconfig
25
26+PKGCONFIG += egl
27 INCLUDEPATH += ../../../ ../../ ../
28 LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirclient
29
30
31=== modified file 'src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro'
32--- src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro 2013-08-08 15:27:37 +0000
33+++ src/platforms/ubuntu/ubuntumir/ubuntumirserver/ubuntumirserver.pro 2013-11-21 14:53:38 +0000
34@@ -13,8 +13,9 @@
35
36 SOURCES = main.cc
37
38-CONFIG += plugin link_prl
39+CONFIG += plugin link_prl link_pkgconfig
40
41+PKGCONFIG += egl
42 INCLUDEPATH += ../../../ ../../ ../
43 LIBS += -Wl,--whole-archive -L../../../base -lubuntubase -L../../ubuntucommon -lqubuntucommon -L../ubuntumircommon -lqubuntumircommon -Wl,--no-whole-archive -lubuntu_application_api_mirserver
44

Subscribers

People subscribed via source and target branches