summaryrefslogtreecommitdiff
authorJohn Brooks <john.brooks@jollamobile.com>2014-06-19 11:35:51 (GMT)
committer David Edmundson <kde@davidedmundson.co.uk>2014-06-19 13:17:49 (GMT)
commit4fca056a8011ff14769f858e53ea65b47ded4b19 (patch) (side-by-side diff)
tree360780b7ecf08cf4f70c1b9a653e797677cd5c2f
parent1916533698d0212bad4e0af5168db4992ceef99d (diff)
downloadtelepathy-qt-master.zip
telepathy-qt-master.tar.gz
Fix Qt5 pkgconfig dependencies for FarstreamHEADmaster
0191a6dd fixed the pkgconfig dependencies for Qt5, but missed updating TelepathyQtFarstream and two other files. Reviewed-by: David Edmundson <davidedmundson@kde.org>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in2
-rw-r--r--TelepathyQt/Farstream/TelepathyQtFarstream.pc.in2
-rw-r--r--TelepathyQt/TelepathyQtService-uninstalled.pc.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
index 1c608ad..8861e36 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy)
Description: Qt Telepathy Farstream utility library for the Telepathy framework
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so
Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}
diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
index 1a66d6d..ccebb47 100644
--- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
+++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in
@@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR}Farstream
Description: Qt Telepathy Farstream utility library for the Telepathy framework
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream
Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}
diff --git a/TelepathyQt/TelepathyQtService-uninstalled.pc.in b/TelepathyQt/TelepathyQtService-uninstalled.pc.in
index 2a4b0bc..01cd1ba 100644
--- a/TelepathyQt/TelepathyQtService-uninstalled.pc.in
+++ b/TelepathyQt/TelepathyQtService-uninstalled.pc.in
@@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR}
Name: TelepathyQt${QT_VERSION_MAJOR}Service (uninstalled copy)
Description: Qt Telepathy Service side bindings
Version: ${PACKAGE_VERSION}
-Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
+Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION}
Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-service.so
Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR}