Try to fix OBS + Aegis

[googlelatitude] / LatitudeUpdater-common.pri

diff --git a/LatitudeUpdater-common.pri b/LatitudeUpdater-common.pri
index 08adb36..1f6a2f1 100644 (file)
--- a/LatitudeUpdater-common.pri
+++ b/LatitudeUpdater-common.pri
@@ -1,53 +1,58 @@
-QT += network
-CONFIG += mobility
+QT       += network
+CONFIG   += mobility
 MOBILITY += location
 
-SOURCES += gpscontrol.cpp googlelatitude.cpp
+SOURCES        += gpscontrol.cpp googlelatitude.cpp
 HEADERS += gpscontrol.h   googlelatitude.h
 
-contains(QT_CONFIG, maemo5) {
+INCLUDEPATH    += libkqoauth
+SOURCES        += libkqoauth/kqoauthauthreplyserver.cpp \
+        libkqoauth/kqoauthrequest.cpp \
+        libkqoauth/kqoauthmanager.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
+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
+
+contains(QT_CONFIG, maemo5): {
     QT          += maemo5
     CONFIG      += link_pkgconfig
     PKGCONFIG   += glib-2.0 liblocation
+    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
 }
 
-INCLUDEPATH += libkqoauth
-SOURCES += libkqoauth/kqoauthauthreplyserver.cpp \
-libkqoauth/kqoauthrequest.cpp \
-libkqoauth/kqoauthmanager.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
-
-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
-
 # Please do not modify the following two lines. Required for deployment.
 include(deployment.pri)
 qtcAddDeployment()
 
 OTHER_FILES += \
-    qtc_packaging/debian_harmattan/rules \
-    qtc_packaging/debian_harmattan/README \
-    qtc_packaging/debian_harmattan/copyright \
-    qtc_packaging/debian_harmattan/control \
-    qtc_packaging/debian_harmattan/compat \
-    qtc_packaging/debian_harmattan/changelog \
-    qtc_packaging/debian_fremantle/rules \
-    qtc_packaging/debian_fremantle/README \
-    qtc_packaging/debian_fremantle/copyright \
-    qtc_packaging/debian_fremantle/control \
-    qtc_packaging/debian_fremantle/compat \
-    qtc_packaging/debian_fremantle/changelog
+        qtc_packaging/debian_harmattan/rules \
+        qtc_packaging/debian_harmattan/README \
+        qtc_packaging/debian_harmattan/copyright \
+        qtc_packaging/debian_harmattan/control \
+        qtc_packaging/debian_harmattan/compat \
+        qtc_packaging/debian_harmattan/changelog \
+        qtc_packaging/debian_fremantle/rules \
+        qtc_packaging/debian_fremantle/README \
+        qtc_packaging/debian_fremantle/copyright \
+        qtc_packaging/debian_fremantle/control \
+        qtc_packaging/debian_fremantle/compat \
+        qtc_packaging/debian_fremantle/changelog