libdbusmenu-qt

Merge lp:~sil2100/libdbusmenu-qt/fix_pkg-config_for_qt5 into lp:libdbusmenu-qt

  1. fix_pkg-config_for_qt5
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 246
Merged at revision: 246
Proposed branch: lp:~sil2100/libdbusmenu-qt/fix_pkg-config_for_qt5
Merge into: lp:libdbusmenu-qt
Diff against target: 12 lines (+1/-1)
1 file modified
dbusmenu-qt.pc.in (+1/-1)
To merge this branch: bzr merge lp:~sil2100/libdbusmenu-qt/fix_pkg-config_for_qt5
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Mathieu Trudel-Lapierre Approve
Review via email: mp+171369@code.launchpad.net

Commit message

Fix the pkg-config file for the libdbusmenu-qt5 case, as the includedir was missing the correct QT_SUFFIX

Description of the change

Fix the pkg-config file for the libdbusmenu-qt5 case, as the includedir was missing the correct QT_SUFFIX. Otherwise pkg-config will select the wrong include directory.

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

Approve.

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

PASSED: Continuous integration, rev:246
http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/libdbusmenu-qt-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/libdbusmenu-qt-ci/4/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 'dbusmenu-qt.pc.in'
2--- dbusmenu-qt.pc.in 2013-03-28 15:51:14 +0000
3+++ dbusmenu-qt.pc.in 2013-06-25 17:27:33 +0000
4@@ -1,7 +1,7 @@
5 prefix=@CMAKE_INSTALL_PREFIX@
6 exec_prefix=@CMAKE_INSTALL_PREFIX@
7 libdir=@CMAKE_INSTALL_PREFIX@/lib
8-includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-qt
9+includedir=@CMAKE_INSTALL_PREFIX@/include/dbusmenu-@QT_SUFFIX@
10
11 Name: libdbusmenu-@QT_SUFFIX@
12 Description: Qt implementation of dbusmenu spec

Subscribers

People subscribed via source and target branches