MOBILITY-381: logfilepositionsource looked inactive on S60.

The problem was that this example was a console application.

The application was changed to a GUI application so that the
example would be useful on mobile platforms.

4 files changed, 36 insertions, 16 deletions

diff --git a/examples/logfilepositionsource/clientapplication.cpp b/examples/logfilepositionsource/clientapplication.cpp
index 1003aa408f..e29f57dcb3 100644
--- a/examples/logfilepositionsource/clientapplication.cpp
+++ b/examples/logfilepositionsource/clientapplication.cpp
@@ -39,13 +39,17 @@
 **
 ****************************************************************************/
 #include <QtCore>
+#include <QTextEdit>
 
 #include "logfilepositionsource.h"
 #include "clientapplication.h"
 
-ClientApplication::ClientApplication(QObject *parent)
-    : QObject(parent)
+ClientApplication::ClientApplication(QWidget *parent)
+    : QMainWindow(parent)
 {
+    textEdit = new QTextEdit;
+    setCentralWidget(textEdit);
+
     LogFilePositionSource *source = new LogFilePositionSource(this);
     connect(source, SIGNAL(positionUpdated(QGeoPositionInfo)),
             this, SLOT(positionUpdated(QGeoPositionInfo)));
@@ -55,6 +59,5 @@ ClientApplication::ClientApplication(QObject *parent)
 
 void ClientApplication::positionUpdated(const QGeoPositionInfo &info)
 {
-    qDebug() << "Position updated: Date/time =" << info.dateTime()
-        << "Coordinate =" << info.coordinate();
+    textEdit->append(QString("Position updated: Date/time = %1, Coordinate = %2").arg(info.dateTime().toString()).arg(info.coordinate().toString()));
 }
diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h
index 5035aa442c..513531a76a 100644
--- a/examples/logfilepositionsource/clientapplication.h
+++ b/examples/logfilepositionsource/clientapplication.h
@@ -42,22 +42,27 @@
 #define CLIENTAPPLICATION_H
 
 #include <qmobilityglobal.h>
-#include <QObject>
+#include <QMainWindow>
 
 
 QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
 QTM_END_NAMESPACE
 
+class QTextEdit;
+
 QTM_USE_NAMESPACE
-class ClientApplication : public QObject
+class ClientApplication : public QMainWindow
 {
     Q_OBJECT
 public:
-    ClientApplication(QObject *parent = 0);
+    ClientApplication(QWidget *parent = 0);
 
 private slots:
     void positionUpdated(const QGeoPositionInfo &info);
+
+private:
+    QTextEdit *textEdit;
 };
 
 
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro
index 59e53915fb..93dbe5adcb 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/logfilepositionsource/logfilepositionsource.pro
@@ -10,14 +10,20 @@ SOURCES = logfilepositionsource.cpp \
 CONFIG += console
 
 include(../examples.pri)
-CONFIG += mobility
-MOBILITY = location
+qtAddLibrary(QtLocation)
 
-symbian: {
-    addFiles.sources = simplelog.txt
-    DEPLOYMENT += addFiles
+symbian|wince*: {
+    symbian: {
+        addFiles.sources = simplelog.txt
+        DEPLOYMENT += addFiles
     
-    TARGET.CAPABILITY = Location    
+        TARGET.CAPABILITY = Location
+    }
+    wince*: {
+        addFiles.sources = ./simplelog.txt
+        addFiles.path = .
+        DEPLOYMENT += addFiles
+    }
 } else {
     logfileexample.path = $$DESTDIR
     logfileexample.files = simplelog.txt
@@ -25,3 +31,4 @@ symbian: {
     INSTALLS += logfileexample
     build_pass:ALL_DEPS+=install_logfileexample
 }
+
diff --git a/examples/logfilepositionsource/main.cpp b/examples/logfilepositionsource/main.cpp
index 77c87b4bcc..5ba0745ca8 100644
--- a/examples/logfilepositionsource/main.cpp
+++ b/examples/logfilepositionsource/main.cpp
@@ -38,15 +38,20 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-#include <QCoreApplication>
+#include <QApplication>
 
 #include "clientapplication.h"
 
 int main(int argc, char *argv[])
 {
-    QCoreApplication app(argc, argv);
+    QApplication app(argc, argv);
 
     ClientApplication client;
+#ifdef Q_OS_SYMBIAN
+    client.showMaximized();
+#else
+    client.show();
+#endif
 
     return app.exec();
-}
\ No newline at end of file
+}