U1DB Qt/ QML

Merge lp:~osomon/u1db-qt/fix-pkgconfig-requires into lp:u1db-qt

  1. fix-pkgconfig-requires
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Cris Dywan
Approved revision: 67
Merged at revision: 66
Proposed branch: lp:~osomon/u1db-qt/fix-pkgconfig-requires
Merge into: lp:u1db-qt
Diff against target: 24 lines (+1/-2)
2 files modified
CMakeLists.txt (+1/-1)
modules/U1db/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~osomon/u1db-qt/fix-pkgconfig-requires
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Cris Dywan Approve
PS Jenkins bot Pending
Review via email: mp+158035@code.launchpad.net

Commit message

Fix pkg-config requirements.

To post a comment you must log in.
Revision history for this message
Cris Dywan (kalikiana) wrote :

Good catch!

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-04-04 13:54:32 +0000
3+++ CMakeLists.txt 2013-04-10 11:18:30 +0000
4@@ -14,7 +14,7 @@
5 set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS})
6 set(OUR_QT_CORE_LIB ${Qt5Core_LIBRARIES})
7 set(OUR_QT_SQL_LIB ${Qt5Sql_LIBRARIES})
8-set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtQuick QtSql")
9+set(QT_PKGCONFIG_DEPENDENCIES "Qt5Core Qt5Quick Qt5Sql")
10
11 set(QT_U1DB_PKGCONFIG_FILE lib${U1DB_QT_LIBNAME}.pc)
12
13
14=== modified file 'modules/U1db/CMakeLists.txt'
15--- modules/U1db/CMakeLists.txt 2013-02-26 08:53:23 +0000
16+++ modules/U1db/CMakeLists.txt 2013-04-10 11:18:30 +0000
17@@ -8,7 +8,6 @@
18 file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
19
20 set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
21-LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtQuick")
22
23 set(U1DBPlugin_SRCS
24 plugin.cpp

Subscribers

People subscribed via source and target branches

to all changes: