Add config test to detect when to build geoclue backend.

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

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

7 files changed, 72 insertions, 6 deletions

diff --git a/config.tests/geoclue/geoclue.pro b/config.tests/geoclue/geoclue.pro
new file mode 100644
index 00000000..4d05166c
--- /dev/null
+++ b/config.tests/geoclue/geoclue.pro
@@ -0,0 +1,6 @@
+TEMPLATE = app
+unix {
+    CONFIG += link_pkgconfig
+    PKGCONFIG += geoclue gconf-2.0
+}
+SOURCES += main.cpp
diff --git a/config.tests/geoclue/main.cpp b/config.tests/geoclue/main.cpp
new file mode 100644
index 00000000..f4d8fb1c
--- /dev/null
+++ b/config.tests/geoclue/main.cpp
@@ -0,0 +1,52 @@
+/****************************************************************************
+**
+** 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 <geoclue/geoclue-position.h>
+#include <gconf/gconf-client.h>
+
+int main()
+{
+    GType type = geoclue_position_get_type();
+    GConfClient *client = gconf_client_get_default();
+    g_object_unref(client);
+
+    return 0;
+}
diff --git a/qtlocation.pro b/qtlocation.pro
index 7ee5fca5..911b3476 100644
--- a/qtlocation.pro
+++ b/qtlocation.pro
@@ -1,5 +1,6 @@
 load(configure)
 qtCompileTest(locationd)
+qtCompileTest(geoclue)
 
 TEMPLATE = subdirs
 
diff --git a/src/plugins/position/geoclue/geoclue.pro b/src/plugins/position/geoclue/geoclue.pro
index ea0522ab..fcbf600c 100644
--- a/src/plugins/position/geoclue/geoclue.pro
+++ b/src/plugins/position/geoclue/geoclue.pro
@@ -6,21 +6,19 @@ QT += location gui
 load(qt_plugin)
 
 DESTDIR = $$QT.location.plugins/position
-#QTDIR_build:REQUIRES += "contains(QT_CONFIG, location)"
 
 HEADERS += \
     qgeopositioninfosource_geocluemaster_p.h \
     qgeopositioninfosourcefactory_geoclue.h
 
 SOURCES += \
-    qgeopositioninfosource_geocluemaster_p.h \
+    qgeopositioninfosource_geocluemaster.cpp \
     qgeopositioninfosourcefactory_geoclue.cpp
 
 INCLUDEPATH += $$QT.location.includes
 
-CONFIG += qdbus link_pkgconfig
-DEFINES += GEOCLUE_MASTER_AVAILABLE=1
-PKGCONFIG += geoclue
+CONFIG += link_pkgconfig
+PKGCONFIG += geoclue gconf-2.0
 
 target.path += $$[QT_INSTALL_PLUGINS]/position
 INSTALLS += target
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
index d9a7f2dc..90577854 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster.cpp
@@ -552,5 +552,12 @@ QGeoPositionInfo QGeoPositionInfoSourceGeoclueMaster::geoclueToPositionInfo(
     return info;
 }
 
+
+QGeoPositionInfoSource::Error QGeoPositionInfoSourceGeoclueMaster::error() const
+{
+    return UnknownSourceError;
+}
+
 #include "moc_qgeopositioninfosource_geocluemaster_p.cpp"
+
 QT_END_NAMESPACE
diff --git a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
index cd4db044..d75cb6d1 100644
--- a/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
+++ b/src/plugins/position/geoclue/qgeopositioninfosource_geocluemaster_p.h
@@ -101,6 +101,8 @@ public:
     void velocityUpdateFailed();
     void velocityUpdateSucceeded(double speed);
 
+    Error error() const;
+
 public slots:
     virtual void startUpdates();
     virtual void stopUpdates();
diff --git a/src/plugins/position/position.pro b/src/plugins/position/position.pro
index 0b80ef24..c221e135 100644
--- a/src/plugins/position/position.pro
+++ b/src/plugins/position/position.pro
@@ -2,8 +2,8 @@ TEMPLATE = subdirs
 
 maemo6|meego:SUBDIRS += maemo
 meego {
-    contains (geoclue-master_enabled, yes):SUBDIRS += geoclue
     contains (gypsy_enabled, yes):SUBDIRS += gypsy
 }
+config_geoclue:SUBDIRS += geoclue
 config_locationd:!simulator:SUBDIRS += npe_backend
 simulator:SUBDIRS += simulator