7 files changed, 17 insertions, 34 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index 085f0672..2bc9ce71 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS += declarative map3d
+SUBDIRS += declarative map3d logfilepositionsource
diff --git a/examples/logfilepositionsource/clientapplication.cpp b/examples/logfilepositionsource/clientapplication.cpp
index 34c13f23..dd89f2b7 100644
--- a/examples/logfilepositionsource/clientapplication.cpp
+++ b/examples/logfilepositionsource/clientapplication.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Mobility Components.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/logfilepositionsource/clientapplication.h b/examples/logfilepositionsource/clientapplication.h
index 7d9f97b6..862ffe23 100644
--- a/examples/logfilepositionsource/clientapplication.h
+++ b/examples/logfilepositionsource/clientapplication.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Mobility Components.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -40,19 +40,13 @@
 #ifndef CLIENTAPPLICATION_H
 #define CLIENTAPPLICATION_H
 
-#include <qmobilityglobal.h>
 #include <QMainWindow>
 
+QT_USE_NAMESPACE
 
-QTM_BEGIN_NAMESPACE
 class QGeoPositionInfo;
-QTM_END_NAMESPACE
-
-QT_BEGIN_NAMESPACE
 class QTextEdit;
-QT_END_NAMESPACE
 
-QTM_USE_NAMESPACE
 class ClientApplication : public QMainWindow
 {
     Q_OBJECT
diff --git a/examples/logfilepositionsource/logfilepositionsource.cpp b/examples/logfilepositionsource/logfilepositionsource.cpp
index be3c1d10..5a4d8774 100644
--- a/examples/logfilepositionsource/logfilepositionsource.cpp
+++ b/examples/logfilepositionsource/logfilepositionsource.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Mobility Components.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
diff --git a/examples/logfilepositionsource/logfilepositionsource.h b/examples/logfilepositionsource/logfilepositionsource.h
index fbc685e8..0d05af3c 100644
--- a/examples/logfilepositionsource/logfilepositionsource.h
+++ b/examples/logfilepositionsource/logfilepositionsource.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Mobility Components.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -42,12 +42,10 @@
 
 #include <qgeopositioninfosource.h>
 
-QTM_USE_NAMESPACE
+QT_USE_NAMESPACE
 
-QT_BEGIN_NAMESPACE
 class QFile;
 class QTimer;
-QT_END_NAMESPACE
 
 class LogFilePositionSource : public QGeoPositionInfoSource
 {
diff --git a/examples/logfilepositionsource/logfilepositionsource.pro b/examples/logfilepositionsource/logfilepositionsource.pro
index a1160d77..bca2efeb 100644
--- a/examples/logfilepositionsource/logfilepositionsource.pro
+++ b/examples/logfilepositionsource/logfilepositionsource.pro
@@ -1,5 +1,7 @@
-TEMPLATE=app
-INCLUDEPATH += ../../src/location
+TARGET = logfilepositionsource
+TEMPLATE = app
+QT = location core widgets
+
 
 HEADERS = logfilepositionsource.h \
           clientapplication.h
@@ -7,19 +9,12 @@ SOURCES = logfilepositionsource.cpp \
           clientapplication.cpp \
           main.cpp
 
-CONFIG += console
-
-include(../mobility_examples.pri)
-
-CONFIG += mobility
-MOBILITY = location
-
 wince* {
     addFiles.sources = ./simplelog.txt
     addFiles.path = .
     DEPLOYMENT += addFiles
 } else {
-    logfileexample.path = $$QT_MOBILITY_EXAMPLES
+    logfileexample.path = $$PWD
     logfileexample.files = simplelog.txt
     INSTALLS += logfileexample
 }
diff --git a/examples/logfilepositionsource/main.cpp b/examples/logfilepositionsource/main.cpp
index 2ebe0020..3a2ee5a0 100644
--- a/examples/logfilepositionsource/main.cpp
+++ b/examples/logfilepositionsource/main.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the examples of the Qt Mobility Components.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:BSD$
 ** You may use this file under the terms of the BSD license as follows:
@@ -46,11 +46,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
 
     ClientApplication client;
-#if defined(Q_OS_WINCE_WM) || defined(Q_WS_MAEMO_5) || defined(Q_WS_MAEMO_6)
-    client.showMaximized();
-#else
     client.show();
-#endif
 
     return app.exec();
 }