fix missing/updated patch

This commit is contained in:
Rex Dieter 2014-04-28 08:38:48 -05:00
parent ccb4a37507
commit d15337742f
2 changed files with 19 additions and 13 deletions

View File

@ -1,13 +0,0 @@
diff -up qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.0/features/deploy.pri
--- qt-mobility-opensource-src-1.2.0/features/deploy.pri.pkgconfig 2011-09-22 01:59:10.000000000 -0500
+++ qt-mobility-opensource-src-1.2.0/features/deploy.pri 2011-10-29 11:43:52.340550783 -0500
@@ -4,7 +4,7 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T
contains(TEMPLATE,.*lib) {
target.path=$$QT_MOBILITY_LIB
- maemo5|maemo6|meego {
+ linux-*|maemo5|maemo6|meego {
CONFIG += create_pc create_prl
QMAKE_PKGCONFIG_NAME = lib$$TARGET
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
diff -up qt-mobility-opensource-src-1.2.0/src/location/location.pro.pkgconfig qt-mobility-opensource-src-1.2.0/src/location/location.pro

View File

@ -0,0 +1,19 @@
diff -up qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig qt-mobility-opensource-src-1.2.2/features/deploy.pri
--- qt-mobility-opensource-src-1.2.2/features/deploy.pri.pkgconfig 2012-02-23 07:43:48.000000000 -0600
+++ qt-mobility-opensource-src-1.2.2/features/deploy.pri 2014-04-28 07:08:10.030082137 -0500
@@ -4,13 +4,14 @@ headers.path = $$QT_MOBILITY_INCLUDE/$$T
contains(TEMPLATE,.*lib) {
target.path=$$QT_MOBILITY_LIB
- maemo5|maemo6|meego {
+ linux-*|maemo5|maemo6|meego {
CONFIG += create_pc create_prl
QMAKE_PKGCONFIG_NAME = lib$$TARGET
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$headers.path
QMAKE_PKGCONFIG_CFLAGS = -I$${QT_MOBILITY_INCLUDE}/QtMobility
+ QMAKE_PKGCONFIG_REQUIRES_PRIVATE = QtCore
pkgconfig.files = $${TARGET}.pc
pkgconfig.path = $$QT_MOBILITY_LIB/pkgconfig