Backport of QGeo*InfoSourceMaemo5 and others fixes

[googlelatitude] / LatitudeUpdater-common.pri

diff --git a/LatitudeUpdater-common.pri b/LatitudeUpdater-common.pri
index 08adb36..a8a781d 100644 (file)
--- a/LatitudeUpdater-common.pri
+++ b/LatitudeUpdater-common.pri
@@ -1,5 +1,5 @@
-QT += network
-CONFIG += mobility
+QT       += network
+CONFIG   += mobility

 MOBILITY += location
 
 SOURCES += gpscontrol.cpp googlelatitude.cpp
 MOBILITY += location
 
 SOURCES += gpscontrol.cpp googlelatitude.cpp

@@ -18,22 +18,30 @@ libkqoauth/kqoauthmanager.cpp \
 libkqoauth/kqoauthrequest_xauth.cpp \
 libkqoauth/kqoauthrequest_1.cpp \
 libkqoauth/kqoauthutils.cpp
 libkqoauth/kqoauthrequest_xauth.cpp \
 libkqoauth/kqoauthrequest_1.cpp \
 libkqoauth/kqoauthutils.cpp

-

 PUBLIC_HEADERS += libkqoauth/kqoauthmanager.h \
 libkqoauth/kqoauthrequest.h \
 libkqoauth/kqoauthrequest_1.h \
 libkqoauth/kqoauthrequest_xauth.h \
 libkqoauth/kqoauthglobals.h
 PUBLIC_HEADERS += libkqoauth/kqoauthmanager.h \
 libkqoauth/kqoauthrequest.h \
 libkqoauth/kqoauthrequest_1.h \
 libkqoauth/kqoauthrequest_xauth.h \
 libkqoauth/kqoauthglobals.h

-

 PRIVATE_HEADERS += libkqoauth/kqoauthrequest_p.h \
 libkqoauth/kqoauthmanager_p.h \
 libkqoauth/kqoauthauthreplyserver.h \
 libkqoauth/kqoauthauthreplyserver_p.h \
 libkqoauth/kqoauthutils.h \
 libkqoauth/kqoauthrequest_xauth_p.h
 PRIVATE_HEADERS += libkqoauth/kqoauthrequest_p.h \
 libkqoauth/kqoauthmanager_p.h \
 libkqoauth/kqoauthauthreplyserver.h \
 libkqoauth/kqoauthauthreplyserver_p.h \
 libkqoauth/kqoauthutils.h \
 libkqoauth/kqoauthrequest_xauth_p.h

-

 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 
 HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
 

+contains(QT_CONFIG, maemo5): {
+    SOURCES += liblocationmaemo5/gconfitem.cpp \
+    liblocationmaemo5/liblocationwrapper.cpp \
+    liblocationmaemo5/qgeopositioninfosource_maemo5.cpp \
+    liblocationmaemo5/qgeosatelliteinfosource_maemo5.cpp
+    HEADERS += liblocationmaemo5/gconfitem_p.h \
+    liblocationmaemo5/liblocationwrapper_p.h \
+    liblocationmaemo5/qgeopositioninfosource_maemo5_p.h \
+    liblocationmaemo5/qgeosatelliteinfosource_maemo5_p.h
+}
+

 # Please do not modify the following two lines. Required for deployment.
 include(deployment.pri)
 qtcAddDeployment()
 # Please do not modify the following two lines. Required for deployment.
 include(deployment.pri)
 qtcAddDeployment()