Add config test to detect when to build gypsy backend.

Previously the gypsy backend was only being built when CONFIG+=meego
was set.

Change-Id: Ia738ea270252206974f5fcdf146a53ba221925f0
Reviewed-by: Alex <alex.blasche@nokia.com>

7 files changed, 82 insertions, 9 deletions

diff --git a/config.tests/gypsy/gypsy.pro b/config.tests/gypsy/gypsy.pro
new file mode 100644
index 00000000..f9dcffa9
--- /dev/null
+++ b/config.tests/gypsy/gypsy.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+unix {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += gypsy gconf-2.0
+}
+SOURCES += main.cpp
diff --git a/config.tests/gypsy/main.cpp b/config.tests/gypsy/main.cpp
new file mode 100644
index 00000000..f39ebe2b
--- /dev/null
+++ b/config.tests/gypsy/main.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
+**
+** This file is part of the QtLocation module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** GNU Lesser General Public License Usage
+** This file may be used under the terms of the GNU Lesser General Public
+** License version 2.1 as published by the Free Software Foundation and
+** appearing in the file LICENSE.LGPL included in the packaging of this
+** file. Please review the following information to ensure the GNU Lesser
+** General Public License version 2.1 requirements will be met:
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU General
+** Public License version 3.0 as published by the Free Software Foundation
+** and appearing in the file LICENSE.GPL included in the packaging of this
+** file. Please review the following information to ensure the GNU General
+** Public License version 3.0 requirements will be met:
+** http://www.gnu.org/copyleft/gpl.html.
+**
+** Other Usage
+** Alternatively, this file may be used in accordance with the terms and
+** conditions contained in a signed written agreement between you and Nokia.
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <gypsy/gypsy-satellite.h>
+#include <gypsy/gypsy-control.h>
+#include <gypsy/gypsy-device.h>
+#include <gconf/gconf-client.h>
+
+int main()
+{
+    GypsyControl *control = gypsy_control_get_default();
+    GypsyDevice *device = gypsy_device_new("test");
+    GypsySatellite *satellite = gypsy_satellite_new("test");
+
+    GConfClient *client = gconf_client_get_default();
+    g_object_unref(client);
+
+    return 0;
+}
diff --git a/qtlocation.pro b/qtlocation.pro
index 911b3476..1885b81a 100644
--- a/qtlocation.pro
+++ b/qtlocation.pro
@@ -1,6 +1,7 @@
 load(configure)
 qtCompileTest(locationd)
 qtCompileTest(geoclue)
+qtCompileTest(gypsy)
 
 TEMPLATE = subdirs
 
diff --git a/src/plugins/position/gypsy/gypsy.pro b/src/plugins/position/gypsy/gypsy.pro
index 16141bb9..14eb1030 100644
--- a/src/plugins/position/gypsy/gypsy.pro
+++ b/src/plugins/position/gypsy/gypsy.pro
@@ -6,7 +6,6 @@ QT += location gui
 load(qt_plugin)
 
 DESTDIR = $$QT.location.plugins/position
-#QTDIR_build:REQUIRES += "contains(QT_CONFIG, location)"
 
 HEADERS += \
     qgeosatelliteinfosource_gypsy_p.h \
@@ -18,9 +17,8 @@ SOURCES += \
 
 INCLUDEPATH += $$QT.location.includes
 
-CONFIG += qdbus link_pkgconfig
-DEFINES += GYPSY_AVAILABLE=1
-PKGCONFIG += gypsy
+CONFIG += link_pkgconfig
+PKGCONFIG += gypsy gconf-2.0
 
 target.path += $$[QT_INSTALL_PLUGINS]/position
 INSTALLS += target
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
index 5f229cbb..c8ef51f7 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy.cpp
@@ -178,8 +178,8 @@ void QGeoSatelliteInfoSourceGypsy::satellitesChanged(GypsySatellite *satellite,
     // If a single updateRequest was active, send signals right away.
     // If a periodic timer was running (meaning that the client wishes
     // to have updates at defined intervals), store the data for later sending.
-    QList<QtMobility::QGeoSatelliteInfo> lastSatellitesInView;
-    QList<QtMobility::QGeoSatelliteInfo> lastSatellitesInUse;
+    QList<QGeoSatelliteInfo> lastSatellitesInView;
+    QList<QGeoSatelliteInfo> lastSatellitesInUse;
 
     unsigned int i;
     for (i = 0; i < satellites->len; i++) {
@@ -283,6 +283,16 @@ int QGeoSatelliteInfoSourceGypsy::init()
     return 0;
 }
 
+int QGeoSatelliteInfoSourceGypsy::minimumUpdateInterval() const
+{
+    return 1;
+}
+
+QGeoSatelliteInfoSource::Error QGeoSatelliteInfoSourceGypsy::error() const
+{
+    return UnknownSourceError;
+}
+
 void QGeoSatelliteInfoSourceGypsy::startUpdates()
 {
     if (m_updatesOngoing)
diff --git a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
index a6079a8e..ba456e69 100644
--- a/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
+++ b/src/plugins/position/gypsy/qgeosatelliteinfosource_gypsy_p.h
@@ -107,6 +107,9 @@ public:
       ~QGeoSatelliteInfoSourceGypsy();
       int init();
 
+      int minimumUpdateInterval() const;
+      Error error() const;
+
 public slots:
       virtual void startUpdates();
       void stopUpdates();
diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
index c221e135..c956019c 100644
--- a/src/plugins/position/position.pro
+++ b/src/plugins/position/position.pro
@@ -1,9 +1,7 @@
 TEMPLATE = subdirs
 
 maemo6|meego:SUBDIRS += maemo
-meego {
-    contains (gypsy_enabled, yes):SUBDIRS += gypsy
-}
 config_geoclue:SUBDIRS += geoclue
+config_gypsy:SUBDIRS += gypsy
 config_locationd:!simulator:SUBDIRS += npe_backend
 simulator:SUBDIRS += simulator