uonedb-qt team mailing list archive

[Olivier Tilloy <olivier.tilloy@xxxxxxxxxxxxx>]

Olivier Tilloy has proposed merging lp:~osomon/u1db-qt/fix-pkgconfig-requires into lp:u1db-qt.

Commit message:
Fix pkg-config requirements.

Requested reviews:
  U1DB Qt developers (uonedb-qt)
Related bugs:
  Bug #1167247 in U1DB Qt/ QML: "libu1db-qt5.pc requires are incorrect"
  https://bugs.launchpad.net/u1db-qt/+bug/1167247

For more details, see:
https://code.launchpad.net/~osomon/u1db-qt/fix-pkgconfig-requires/+merge/158035
-- 
https://code.launchpad.net/~osomon/u1db-qt/fix-pkgconfig-requires/+merge/158035
Your team U1DB Qt developers is requested to review the proposed merge of lp:~osomon/u1db-qt/fix-pkgconfig-requires into lp:u1db-qt.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-04 13:54:32 +0000
+++ CMakeLists.txt	2013-04-10 11:13:23 +0000
@@ -14,7 +14,7 @@
 set(OUR_QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS})
 set(OUR_QT_CORE_LIB ${Qt5Core_LIBRARIES})
 set(OUR_QT_SQL_LIB ${Qt5Sql_LIBRARIES})
-set(QT_PKGCONFIG_DEPENDENCIES "QtCore QtQuick QtSql")
+set(QT_PKGCONFIG_DEPENDENCIES "Qt5Core Qt5Quick Qt5Sql")
 
 set(QT_U1DB_PKGCONFIG_FILE lib${U1DB_QT_LIBNAME}.pc)
 

=== modified file 'modules/U1db/CMakeLists.txt'
--- modules/U1db/CMakeLists.txt	2013-02-26 08:53:23 +0000
+++ modules/U1db/CMakeLists.txt	2013-04-10 11:13:23 +0000
@@ -8,7 +8,6 @@
 file(TO_CMAKE_PATH "${QT_IMPORTS_DIR}" QT_IMPORTS_DIR)
 
 set(OUR_QT_QUICK_INCLUDE ${Qt5Quick_INCLUDE_DIRS})
-LIST(APPEND QT_PKGCONFIG_DEPENDENCIES "QtQuick")
 
 set(U1DBPlugin_SRCS
     plugin.cpp