migration to Qt5.2

22 files changed, 189 insertions, 163 deletions

diff --git a/src/navigation/README b/src/navigation/README
index 0a05a77..3456ff4 100644
--- a/src/navigation/README
+++ b/src/navigation/README
@@ -1,5 +1,5 @@
-Release date of the file: 11-04-2014 
-Status: to be completed
+Release date of the file: 4-06-2014 
+Status: OK
 
 Project:
 Navigation software based on Navit and compliant with the Navigation APIs standardized by the GENIVI Alliance
@@ -22,7 +22,7 @@ License:
 See headers and LICENSE file
 
 Test target: 
-Ubuntu 12.04.1 LTS
+Ubuntu 14.04 LTS
 
 To get the code:
 git clone http://git.projects.genivi.org/lbs/navigation-service.git $WORKING-DIR
diff --git a/src/navigation/script/0positioning.mk b/src/navigation/script/0positioning.mk
index 0259acf..d1f8e6d 100644
--- a/src/navigation/script/0positioning.mk
+++ b/src/navigation/script/0positioning.mk
@@ -8,8 +8,9 @@
 # \brief This file is part of the Build System.
 #
 # \author Martin Schaller <martin.schaller@it-schaller.de>
+# \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
-# \version 1.0
+# \version 1.1
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
@@ -20,7 +21,7 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
 positioning_BIN=$(BIN_DIR)/positioning
@@ -33,9 +34,13 @@ positioning_API=$(positioning_SRC)/enhanced-position-service/api
 
 ALL+=positioning
 
+SRC_CLEAN+=clean-positioning_SRC
+
 help::
 	@echo "positioning: Build positioning"
 
+clean-positioning_SRC::
+	rm -rf $(positioning_SRC)
 
 positioning: $(positioning_BIN)/enhanced-position-service/src/server/position-daemon
 
diff --git a/src/navigation/script/1navit.mk b/src/navigation/script/1navit.mk
index a689558..0935c2f 100644
--- a/src/navigation/script/1navit.mk
+++ b/src/navigation/script/1navit.mk
@@ -8,6 +8,7 @@
 # \brief This file is part of the Build System.
 #
 # \author Martin Schaller <martin.schaller@it-schaller.de>
+# \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
 # \version 1.0
 #
@@ -20,7 +21,7 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
 navit_SRC=$(SRC_DIR)/navit
@@ -32,11 +33,15 @@ navit_DEPS=gtk2.0-dev
 
 DEPS+=$(navit_DEPS)
 ALL+=navit navit_map
+SRC_CLEAN+=clean-navit_SRC
 
 help::
 	@echo "navit: Build navit"
 	@echo "navit_map: Download and install navit map"
 
+clean-navit_SRC::
+	rm -rf $(navit_SRC)
+
 navit: $(navit_BIN)/navit/navit
 
 $(navit_BIN)/navit/navit: $(navit_BIN)/Makefile
diff --git a/src/navigation/script/Makefile b/src/navigation/script/Makefile
index 24b138e..13e7fa7 100644
--- a/src/navigation/script/Makefile
+++ b/src/navigation/script/Makefile
@@ -8,6 +8,7 @@
 # \brief This file is part of the Build System.
 #
 # \author Martin Schaller <martin.schaller@it-schaller.de>
+# \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
 # \version 1.0
 #
@@ -20,7 +21,7 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
 SRC_DIR=$(CURDIR)/../../navigation
@@ -38,12 +39,16 @@ help::
 	@echo "The following targets exist"
 	@echo "all: Build $(ALL)"
 	@echo "all2: Install all necessary dependencies and build all"
+	@echo "clean: Clean up build dir"
+	@echo "src-clean: Clean up all checked out sources"
 
 
 include *.mk
 
 all: $(ALL)
 
+src-clean: $(SRC_CLEAN)
+
 deps::
 	sudo apt-get install $(DEPS)
 	# See https://bugs.launchpad.net/ubuntu/+source/freetype/+bug/1319642 why this is necessary
@@ -51,4 +56,8 @@ deps::
 
 
 all2: deps all
+
 navit-plugins: all
+
+clean:
+	rm -rf $(BIN_DIR)
diff --git a/src/poi-service/README b/src/poi-service/README
index d5dadc5..f477f59 100644
--- a/src/poi-service/README
+++ b/src/poi-service/README
@@ -1,5 +1,5 @@
-Release date of the file: 11-04-2014 
-Status: to be completed
+Release date of the file: 4-06-2014 
+Status: OK
 
 Project:
 Search engine for Point Of Interest with a content access module mechanism to extend to additional sources of data
@@ -24,7 +24,7 @@ License:
 See headers and LICENSE file
 
 Test target: 
-Ubuntu 12.04.1 LTS
+Ubuntu 14.04 LTS
 
 To get the code:
 Code is part of the navigation-service repository, so you need to clone all:
diff --git a/src/poi-service/script/Makefile b/src/poi-service/script/Makefile
index 5ee66bf..3ecf142 100644
--- a/src/poi-service/script/Makefile
+++ b/src/poi-service/script/Makefile
@@ -9,7 +9,7 @@
 #
 # \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
-# \version 1.0
+# \version 1.1
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
@@ -20,7 +20,7 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
 
@@ -41,6 +41,7 @@ help::
 	@echo "The following targets exist"
 	@echo "all: Build $(ALL)"
 	@echo "clean: Clean up build dir"
+	@echo "src-clean: Clean up all checked out sources"
 
 #Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
 include get-positioning.mk
@@ -50,6 +51,8 @@ include poi-server.mk
 
 all: $(ALL)
 
+src-clean: $(SRC_CLEAN)
+
 deps::
 	sudo apt-get install $(DEPS)
 
diff --git a/src/poi-service/script/get-positioning.mk b/src/poi-service/script/get-positioning.mk
index 42f0206..53f6a7a 100644
--- a/src/poi-service/script/get-positioning.mk
+++ b/src/poi-service/script/get-positioning.mk
@@ -22,6 +22,7 @@
 # List of changes:
 # 
 # 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature
+# 4/6/2014, Philippe Colliot, complete src-clean option
 # 
 # @licence end@
 positioning_SRC=$(ROOT_DIR)/positioning
@@ -30,14 +31,14 @@ positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
 positioning_VERSION=c97c3e10cb0f38dfed5e17b995e33173567d2dbf
 
 ALL+=positioning
-CLEAN+=clean-get-positioning
+SRC_CLEAN+=clean-positioning_SRC
 
 help::
 	@echo "positioning: Get positioning"
 
 positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
 
-clean-get-positioning:: 
+clean-positioning_SRC:: 
 	rm -rf $(positioning_SRC)
 
 $(positioning_API)/genivi-positioning-enhancedposition.xml:
diff --git a/test/poi-service/README b/test/poi-service/README
index 9753e58..08ae83d 100644
--- a/test/poi-service/README
+++ b/test/poi-service/README
@@ -1,5 +1,5 @@
-Release date of the file: 26-05-2014 
-Status: to be completed
+Release date of the file: 4-06-2014 
+Status: OK
 
 Project:
 Search engine for Point Of Interest with a content access module mechanism to extend to additional sources of data
@@ -24,11 +24,10 @@ License:
 See headers and LICENSE file (mainly MPL V2)
 
 Test target: 
-Ubuntu 12.04.1 LTS
 Ubuntu 14.04 LTS
 
 Qt version:
-Qt4 (to get the version -> qtchooser -print-env, to set the version -> export QT-SELECT=<version>)
+Qt5 (to get the version -> qtchooser -print-env, to set the version -> export QT-SELECT=<version>)
 
 To get the code:
 Code is part of the navigation-service repository, so you need to clone all:
diff --git a/test/poi-service/poi-client/about-dialog.h b/test/poi-service/poi-client/about-dialog.h
index 94c3c9f..8814454 100644
--- a/test/poi-service/poi-client/about-dialog.h
+++ b/test/poi-service/poi-client/about-dialog.h
@@ -28,7 +28,7 @@
 #ifndef ABOUTDIALOG_H
 #define ABOUTDIALOG_H
 
-#include <QtGui/QDialog>
+#include <QDialog>
 
 namespace Ui {
 class aboutDialog;
diff --git a/test/poi-service/poi-client/main.cpp b/test/poi-service/poi-client/main.cpp
index eea3c6f..9dd691b 100644
--- a/test/poi-service/poi-client/main.cpp
+++ b/test/poi-service/poi-client/main.cpp
@@ -28,7 +28,7 @@
 #include "mainwindow.h"
 #include "../poi-common/poi-marshal-handler.h"
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QTranslator>
 #include <QSettings>
 
diff --git a/test/poi-service/poi-client/mainwindow.h b/test/poi-service/poi-client/mainwindow.h
index 000fe85..240acdb 100644
--- a/test/poi-service/poi-client/mainwindow.h
+++ b/test/poi-service/poi-client/mainwindow.h
@@ -28,7 +28,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 #include "QStandardItemModel"
 #include <QtDBus>
 #include <QDBusArgument>
diff --git a/test/poi-service/poi-client/poi-client.pro b/test/poi-service/poi-client/poi-client.pro
index 8429d52..65dc109 100644
--- a/test/poi-service/poi-client/poi-client.pro
+++ b/test/poi-service/poi-client/poi-client.pro
@@ -1,5 +1,5 @@
 
-QT += dbus
+QT += dbus widgets
 
 SOURCES += main.cpp mainwindow.cpp \
     about-dialog.cpp \
diff --git a/test/poi-service/poi-client/ui_about-dialog.h b/test/poi-service/poi-client/ui_about-dialog.h
index ba2c21d..12b0d17 100644
--- a/test/poi-service/poi-client/ui_about-dialog.h
+++ b/test/poi-service/poi-client/ui_about-dialog.h
@@ -11,14 +11,14 @@
 #define UI_ABOUT_2D_DIALOG_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QDialog>
-#include <QtGui/QHeaderView>
-#include <QtGui/QPushButton>
-#include <QtGui/QTextBrowser>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QDialog>
+#include <QHeaderView>
+#include <QPushButton>
+#include <QTextBrowser>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,8 +58,8 @@ public:
 
     void retranslateUi(QDialog *aboutDialog)
     {
-        aboutDialog->setWindowTitle(QApplication::translate("aboutDialog", "About", 0, QApplication::UnicodeUTF8));
-        pushButton->setText(QApplication::translate("aboutDialog", "OK", 0, QApplication::UnicodeUTF8));
+        aboutDialog->setWindowTitle(QApplication::translate("aboutDialog", "About", 0));
+        pushButton->setText(QApplication::translate("aboutDialog", "OK", 0));
     } // retranslateUi
 
 };
diff --git a/test/poi-service/poi-client/ui_mainwindow.h b/test/poi-service/poi-client/ui_mainwindow.h
index b205d14..05a09ac 100644
--- a/test/poi-service/poi-client/ui_mainwindow.h
+++ b/test/poi-service/poi-client/ui_mainwindow.h
@@ -11,26 +11,26 @@
 #define UI_MAINWINDOW_H
 
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QFrame>
-#include <QtGui/QGraphicsView>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHBoxLayout>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenuBar>
-#include <QtGui/QPushButton>
-#include <QtGui/QSpacerItem>
-#include <QtGui/QTabWidget>
-#include <QtGui/QTableView>
-#include <QtGui/QVBoxLayout>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QFrame>
+#include <QGraphicsView>
+#include <QGroupBox>
+#include <QHBoxLayout>
+#include <QHeaderView>
+#include <QLabel>
+#include <QLineEdit>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QSpacerItem>
+#include <QTabWidget>
+#include <QTableView>
+#include <QVBoxLayout>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -1093,88 +1093,88 @@ public:
 
     void retranslateUi(QMainWindow *MainWindow)
     {
-        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "POI Search Proof Of Concept", 0, QApplication::UnicodeUTF8));
-        label_2->setText(QApplication::translate("MainWindow", "Search mode", 0, QApplication::UnicodeUTF8));
-        searchMode->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        label->setText(QApplication::translate("MainWindow", "<html><head/><body><p>Search around </p><p>     a location</p></body></html>", 0, QApplication::UnicodeUTF8));
-        checkLocation->setText(QApplication::translate("MainWindow", "Current", 0, QApplication::UnicodeUTF8));
-        label_16->setText(QApplication::translate("MainWindow", "Lat:", 0, QApplication::UnicodeUTF8));
-        currentLocationLatitude->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        label_17->setText(QApplication::translate("MainWindow", "Lon:", 0, QApplication::UnicodeUTF8));
-        currentLocationLongitude->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "POI Search Proof Of Concept", 0));
+        label_2->setText(QApplication::translate("MainWindow", "Search mode", 0));
+        searchMode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        label->setText(QApplication::translate("MainWindow", "<html><head/><body><p>Search around </p><p>     a location</p></body></html>", 0));
+        checkLocation->setText(QApplication::translate("MainWindow", "Current", 0));
+        label_16->setText(QApplication::translate("MainWindow", "Lat:", 0));
+        currentLocationLatitude->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        label_17->setText(QApplication::translate("MainWindow", "Lon:", 0));
+        currentLocationLongitude->setText(QApplication::translate("MainWindow", "TextLabel", 0));
         latitude_direction->clear();
         latitude_direction->insertItems(0, QStringList()
-         << QApplication::translate("MainWindow", "NORTH", 0, QApplication::UnicodeUTF8)
-         << QApplication::translate("MainWindow", "SOUTH", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "NORTH", 0)
+         << QApplication::translate("MainWindow", "SOUTH", 0)
         );
         longitude_direction->clear();
         longitude_direction->insertItems(0, QStringList()
-         << QApplication::translate("MainWindow", "EAST", 0, QApplication::UnicodeUTF8)
-         << QApplication::translate("MainWindow", "WEST", 0, QApplication::UnicodeUTF8)
+         << QApplication::translate("MainWindow", "EAST", 0)
+         << QApplication::translate("MainWindow", "WEST", 0)
         );
-        startSearch->setText(QApplication::translate("MainWindow", "SEARCH", 0, QApplication::UnicodeUTF8));
-        cancelSearch->setText(QApplication::translate("MainWindow", "CANCEL", 0, QApplication::UnicodeUTF8));
-        label_4->setText(QApplication::translate("MainWindow", "Set proximity alert", 0, QApplication::UnicodeUTF8));
-        setProximity->setText(QApplication::translate("MainWindow", "SET", 0, QApplication::UnicodeUTF8));
-        cancelProximity->setText(QApplication::translate("MainWindow", "UNSET", 0, QApplication::UnicodeUTF8));
-        label_5->setText(QApplication::translate("MainWindow", "Manage poi handle", 0, QApplication::UnicodeUTF8));
-        poiHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        createpoiHandle->setText(QApplication::translate("MainWindow", "CREATE", 0, QApplication::UnicodeUTF8));
-        deletepoiHandle->setText(QApplication::translate("MainWindow", "DELETE", 0, QApplication::UnicodeUTF8));
-        label_8->setText(QApplication::translate("MainWindow", "Search status", 0, QApplication::UnicodeUTF8));
-        search_status->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        totalSize->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
+        startSearch->setText(QApplication::translate("MainWindow", "SEARCH", 0));
+        cancelSearch->setText(QApplication::translate("MainWindow", "CANCEL", 0));
+        label_4->setText(QApplication::translate("MainWindow", "Set proximity alert", 0));
+        setProximity->setText(QApplication::translate("MainWindow", "SET", 0));
+        cancelProximity->setText(QApplication::translate("MainWindow", "UNSET", 0));
+        label_5->setText(QApplication::translate("MainWindow", "Manage poi handle", 0));
+        poiHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        createpoiHandle->setText(QApplication::translate("MainWindow", "CREATE", 0));
+        deletepoiHandle->setText(QApplication::translate("MainWindow", "DELETE", 0));
+        label_8->setText(QApplication::translate("MainWindow", "Search status", 0));
+        search_status->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        totalSize->setText(QApplication::translate("MainWindow", "TextLabel", 0));
 #ifndef QT_NO_ACCESSIBILITY
         searchSettings->setAccessibleName(QString());
 #endif // QT_NO_ACCESSIBILITY
-        label_9->setText(QApplication::translate("MainWindow", "Category", 0, QApplication::UnicodeUTF8));
-        label_10->setText(QApplication::translate("MainWindow", "Radius", 0, QApplication::UnicodeUTF8));
-        label_3->setText(QApplication::translate("MainWindow", "Source", 0, QApplication::UnicodeUTF8));
-        label_7->setText(QApplication::translate("MainWindow", "WebSite", 0, QApplication::UnicodeUTF8));
-        label_11->setText(QApplication::translate("MainWindow", "Phone", 0, QApplication::UnicodeUTF8));
-        label_12->setText(QApplication::translate("MainWindow", "Stars", 0, QApplication::UnicodeUTF8));
-        label_6->setText(QApplication::translate("MainWindow", "Open hours", 0, QApplication::UnicodeUTF8));
-        label_18->setText(QApplication::translate("MainWindow", "Number", 0, QApplication::UnicodeUTF8));
-        label_21->setText(QApplication::translate("MainWindow", "Street", 0, QApplication::UnicodeUTF8));
-        label_22->setText(QApplication::translate("MainWindow", "Post code", 0, QApplication::UnicodeUTF8));
-        label_30->setText(QApplication::translate("MainWindow", "City", 0, QApplication::UnicodeUTF8));
-        label_31->setText(QApplication::translate("MainWindow", "Brand", 0, QApplication::UnicodeUTF8));
-        label_32->setText(QApplication::translate("MainWindow", "Operator", 0, QApplication::UnicodeUTF8));
-        label_23->setText(QApplication::translate("MainWindow", "Category", 0, QApplication::UnicodeUTF8));
-        label_28->setText(QApplication::translate("MainWindow", "Radius", 0, QApplication::UnicodeUTF8));
-        label_24->setText(QApplication::translate("MainWindow", "Source", 0, QApplication::UnicodeUTF8));
-        label_25->setText(QApplication::translate("MainWindow", "WebSite", 0, QApplication::UnicodeUTF8));
-        label_26->setText(QApplication::translate("MainWindow", "Phone", 0, QApplication::UnicodeUTF8));
-        label_27->setText(QApplication::translate("MainWindow", "Stars", 0, QApplication::UnicodeUTF8));
-        label_29->setText(QApplication::translate("MainWindow", "Open hours", 0, QApplication::UnicodeUTF8));
-        label_34->setText(QApplication::translate("MainWindow", "Number", 0, QApplication::UnicodeUTF8));
-        label_37->setText(QApplication::translate("MainWindow", "Street", 0, QApplication::UnicodeUTF8));
-        label_36->setText(QApplication::translate("MainWindow", "Post code", 0, QApplication::UnicodeUTF8));
-        label_35->setText(QApplication::translate("MainWindow", "City", 0, QApplication::UnicodeUTF8));
-        label_39->setText(QApplication::translate("MainWindow", "Brand", 0, QApplication::UnicodeUTF8));
-        label_38->setText(QApplication::translate("MainWindow", "Operator", 0, QApplication::UnicodeUTF8));
-        tabWidget->setTabText(tabWidget->indexOf(searchSettings), QApplication::translate("MainWindow", "Categories", 0, QApplication::UnicodeUTF8));
-        getTopList->setText(QApplication::translate("MainWindow", "TOP", 0, QApplication::UnicodeUTF8));
-        getPrevList->setText(QApplication::translate("MainWindow", "PREV", 0, QApplication::UnicodeUTF8));
-        getNextList->setText(QApplication::translate("MainWindow", "NEXT", 0, QApplication::UnicodeUTF8));
-        recordFrom->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        label_14->setText(QApplication::translate("MainWindow", "FROM:", 0, QApplication::UnicodeUTF8));
-        recordTo->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        label_15->setText(QApplication::translate("MainWindow", "TO:", 0, QApplication::UnicodeUTF8));
-        label_13->setText(QApplication::translate("MainWindow", "Attributes to get", 0, QApplication::UnicodeUTF8));
-        tabWidget->setTabText(tabWidget->indexOf(resultList), QApplication::translate("MainWindow", "Result list", 0, QApplication::UnicodeUTF8));
-        label_20->setText(QApplication::translate("MainWindow", "Route handle", 0, QApplication::UnicodeUTF8));
-        routeHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        label_19->setText(QApplication::translate("MainWindow", "Route segments", 0, QApplication::UnicodeUTF8));
-        routeTotalSegments->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        tabWidget->setTabText(tabWidget->indexOf(resultView), QApplication::translate("MainWindow", "Result view", 0, QApplication::UnicodeUTF8));
-        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0, QApplication::UnicodeUTF8));
-        VersionSearch->setText(QApplication::translate("MainWindow", "to be initialized", 0, QApplication::UnicodeUTF8));
-        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0, QApplication::UnicodeUTF8));
-        languageCode->setText(QApplication::translate("MainWindow", "languageCode", 0, QApplication::UnicodeUTF8));
-        countryCode->setText(QApplication::translate("MainWindow", "countryCode", 0, QApplication::UnicodeUTF8));
-        About->setText(QApplication::translate("MainWindow", "About", 0, QApplication::UnicodeUTF8));
-        tabWidget->setTabText(tabWidget->indexOf(settings), QApplication::translate("MainWindow", "Settings", 0, QApplication::UnicodeUTF8));
+        label_9->setText(QApplication::translate("MainWindow", "Category", 0));
+        label_10->setText(QApplication::translate("MainWindow", "Radius", 0));
+        label_3->setText(QApplication::translate("MainWindow", "Source", 0));
+        label_7->setText(QApplication::translate("MainWindow", "WebSite", 0));
+        label_11->setText(QApplication::translate("MainWindow", "Phone", 0));
+        label_12->setText(QApplication::translate("MainWindow", "Stars", 0));
+        label_6->setText(QApplication::translate("MainWindow", "Open hours", 0));
+        label_18->setText(QApplication::translate("MainWindow", "Number", 0));
+        label_21->setText(QApplication::translate("MainWindow", "Street", 0));
+        label_22->setText(QApplication::translate("MainWindow", "Post code", 0));
+        label_30->setText(QApplication::translate("MainWindow", "City", 0));
+        label_31->setText(QApplication::translate("MainWindow", "Brand", 0));
+        label_32->setText(QApplication::translate("MainWindow", "Operator", 0));
+        label_23->setText(QApplication::translate("MainWindow", "Category", 0));
+        label_28->setText(QApplication::translate("MainWindow", "Radius", 0));
+        label_24->setText(QApplication::translate("MainWindow", "Source", 0));
+        label_25->setText(QApplication::translate("MainWindow", "WebSite", 0));
+        label_26->setText(QApplication::translate("MainWindow", "Phone", 0));
+        label_27->setText(QApplication::translate("MainWindow", "Stars", 0));
+        label_29->setText(QApplication::translate("MainWindow", "Open hours", 0));
+        label_34->setText(QApplication::translate("MainWindow", "Number", 0));
+        label_37->setText(QApplication::translate("MainWindow", "Street", 0));
+        label_36->setText(QApplication::translate("MainWindow", "Post code", 0));
+        label_35->setText(QApplication::translate("MainWindow", "City", 0));
+        label_39->setText(QApplication::translate("MainWindow", "Brand", 0));
+        label_38->setText(QApplication::translate("MainWindow", "Operator", 0));
+        tabWidget->setTabText(tabWidget->indexOf(searchSettings), QApplication::translate("MainWindow", "Categories", 0));
+        getTopList->setText(QApplication::translate("MainWindow", "TOP", 0));
+        getPrevList->setText(QApplication::translate("MainWindow", "PREV", 0));
+        getNextList->setText(QApplication::translate("MainWindow", "NEXT", 0));
+        recordFrom->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        label_14->setText(QApplication::translate("MainWindow", "FROM:", 0));
+        recordTo->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        label_15->setText(QApplication::translate("MainWindow", "TO:", 0));
+        label_13->setText(QApplication::translate("MainWindow", "Attributes to get", 0));
+        tabWidget->setTabText(tabWidget->indexOf(resultList), QApplication::translate("MainWindow", "Result list", 0));
+        label_20->setText(QApplication::translate("MainWindow", "Route handle", 0));
+        routeHandle->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        label_19->setText(QApplication::translate("MainWindow", "Route segments", 0));
+        routeTotalSegments->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        tabWidget->setTabText(tabWidget->indexOf(resultView), QApplication::translate("MainWindow", "Result view", 0));
+        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0));
+        VersionSearch->setText(QApplication::translate("MainWindow", "to be initialized", 0));
+        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0));
+        languageCode->setText(QApplication::translate("MainWindow", "languageCode", 0));
+        countryCode->setText(QApplication::translate("MainWindow", "countryCode", 0));
+        About->setText(QApplication::translate("MainWindow", "About", 0));
+        tabWidget->setTabText(tabWidget->indexOf(settings), QApplication::translate("MainWindow", "Settings", 0));
     } // retranslateUi
 
 };
diff --git a/test/poi-service/poi-contentaccess-module/main.cpp b/test/poi-service/poi-contentaccess-module/main.cpp
index fa5efa2..58c343b 100644
--- a/test/poi-service/poi-contentaccess-module/main.cpp
+++ b/test/poi-service/poi-contentaccess-module/main.cpp
@@ -39,7 +39,7 @@
 
 #include "poi-contentaccess-module-class.h"
 
-#include <QtGui/QApplication>
+#include <QApplication>
 #include <QTranslator>
 #include "mainwindow.h"
 
diff --git a/test/poi-service/poi-contentaccess-module/mainwindow.h b/test/poi-service/poi-contentaccess-module/mainwindow.h
index d274230..8c216c8 100644
--- a/test/poi-service/poi-contentaccess-module/mainwindow.h
+++ b/test/poi-service/poi-contentaccess-module/mainwindow.h
@@ -28,7 +28,7 @@
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include <QtGui/QMainWindow>
+#include <QMainWindow>
 
 #define noValue "-------"
 
diff --git a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro
index 4b631d0..43f4ad4 100644
--- a/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro
+++ b/test/poi-service/poi-contentaccess-module/poi-contentaccess-module.pro
@@ -1,6 +1,6 @@
 TEMPLATE = app
 CONFIG += console
-QT       += core gui
+QT       += core gui widgets
 
 RESOURCES += \
     ../poi-common/poi-resource.qrc
diff --git a/test/poi-service/poi-contentaccess-module/ui_mainwindow.h b/test/poi-service/poi-contentaccess-module/ui_mainwindow.h
index eab23f8..bb13104 100644
--- a/test/poi-service/poi-contentaccess-module/ui_mainwindow.h
+++ b/test/poi-service/poi-contentaccess-module/ui_mainwindow.h
@@ -12,19 +12,19 @@
 
 #include <QtCore/QLocale>
 #include <QtCore/QVariant>
-#include <QtGui/QAction>
-#include <QtGui/QApplication>
-#include <QtGui/QButtonGroup>
-#include <QtGui/QFrame>
-#include <QtGui/QGroupBox>
-#include <QtGui/QHeaderView>
-#include <QtGui/QLabel>
-#include <QtGui/QMainWindow>
-#include <QtGui/QMenuBar>
-#include <QtGui/QPushButton>
-#include <QtGui/QStatusBar>
-#include <QtGui/QToolBar>
-#include <QtGui/QWidget>
+#include <QAction>
+#include <QApplication>
+#include <QButtonGroup>
+#include <QFrame>
+#include <QGroupBox>
+#include <QHeaderView>
+#include <QLabel>
+#include <QMainWindow>
+#include <QMenuBar>
+#include <QPushButton>
+#include <QStatusBar>
+#include <QToolBar>
+#include <QWidget>
 
 QT_BEGIN_NAMESPACE
 
@@ -170,19 +170,19 @@ public:
 
     void retranslateUi(QMainWindow *MainWindow)
     {
-        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Bicycle shop", 0, QApplication::UnicodeUTF8));
-        camID->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        poiCategoryName->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        poiCategoryID->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0, QApplication::UnicodeUTF8));
-        VersionCAM->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        addCAMCategory->setText(QApplication::translate("MainWindow", "ADDandREG", 0, QApplication::UnicodeUTF8));
-        removeCAMCategory->setText(QApplication::translate("MainWindow", "REMOVE", 0, QApplication::UnicodeUTF8));
-        unregisterCAM->setText(QApplication::translate("MainWindow", "UNREGISTER", 0, QApplication::UnicodeUTF8));
-        registerCAM->setText(QApplication::translate("MainWindow", "REGISTER", 0, QApplication::UnicodeUTF8));
-        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0, QApplication::UnicodeUTF8));
-        languageCode->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
-        countryCode->setText(QApplication::translate("MainWindow", "TextLabel", 0, QApplication::UnicodeUTF8));
+        MainWindow->setWindowTitle(QApplication::translate("MainWindow", "Bicycle shop", 0));
+        camID->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        poiCategoryName->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        poiCategoryID->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        groupBox_2->setTitle(QApplication::translate("MainWindow", "Version", 0));
+        VersionCAM->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        addCAMCategory->setText(QApplication::translate("MainWindow", "ADDandREG", 0));
+        removeCAMCategory->setText(QApplication::translate("MainWindow", "REMOVE", 0));
+        unregisterCAM->setText(QApplication::translate("MainWindow", "UNREGISTER", 0));
+        registerCAM->setText(QApplication::translate("MainWindow", "REGISTER", 0));
+        groupBox->setTitle(QApplication::translate("MainWindow", "Language", 0));
+        languageCode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
+        countryCode->setText(QApplication::translate("MainWindow", "TextLabel", 0));
     } // retranslateUi
 
 };
diff --git a/test/poi-service/script/Makefile b/test/poi-service/script/Makefile
index dec1f5e..b716e4c 100644
--- a/test/poi-service/script/Makefile
+++ b/test/poi-service/script/Makefile
@@ -20,7 +20,7 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 4/6/2014, Philippe Colliot, complete src-clean option
 #
 # @licence end@
 
@@ -42,6 +42,7 @@ help::
 	@echo "The following targets exist"
 	@echo "all: Build $(ALL)"
 	@echo "clean: Clean up build dir"
+	@echo "src-clean: Clean up all checked out sources"
 
 #Clone the positioning repository for getting the API, generate the proxies and adaptors for the DBus APIs firstly
 include get-positioning.mk
@@ -58,5 +59,7 @@ deps::
 
 all2: deps all
 
+src-clean: $(SRC_CLEAN)
+
 clean: $(CLEAN)
 
diff --git a/test/poi-service/script/get-positioning.mk b/test/poi-service/script/get-positioning.mk
index 442ffc9..958a577 100644
--- a/test/poi-service/script/get-positioning.mk
+++ b/test/poi-service/script/get-positioning.mk
@@ -22,6 +22,7 @@
 # List of changes:
 # 
 # 28-04-2014, Philippe Colliot, link to the public repos of positioning, add clean feature
+# 4/6/2014, Philippe Colliot, complete src-clean option
 # 
 # @licence end@
 positioning_SRC=$(ROOT_DIR)/positioning
@@ -30,14 +31,14 @@ positioning_URL=http://git.projects.genivi.org/lbs/positioning.git
 positioning_VERSION=183d134e734e157c498f6cff367d104e4c5ad670
 
 ALL+=positioning
-CLEAN+=clean-get-positioning
+SRC_CLEAN+=clean-positioning_SRC
 
 help::
 	@echo "positioning: Get positioning"
 
 positioning: $(positioning_API)/genivi-positioning-enhancedposition.xml
 
-clean-get-positioning:: 
+clean-positioning_SRC:: 
 	rm -rf $(positioning_SRC)
 
 $(positioning_API)/genivi-positioning-enhancedposition.xml:
diff --git a/test/poi-service/script/poi-client.mk b/test/poi-service/script/poi-client.mk
index 4295ead..56bd9b2 100644
--- a/test/poi-service/script/poi-client.mk
+++ b/test/poi-service/script/poi-client.mk
@@ -9,7 +9,7 @@
 #
 # \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
-# \version 1.0
+# \version 1.1
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
@@ -20,11 +20,11 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 04/06/2014, Philippe Colliot, Migration to Qt5.2
 #
 # @licence end@
 POI_CLIENT_SRC_DIR=$(ROOT_DIR)/poi-client
-POI_CLIENT_DEPS=qt4-qmlviewer libqt4-dev libqt4-declarative
+POI_CLIENT_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5
 POI_CLIENT_BIN_DIR=$(BIN_DIR)/poi-client-bin
 
 DEPS+=$(POI_CLIENT_DEPS)
diff --git a/test/poi-service/script/poi-contentaccess-module.mk b/test/poi-service/script/poi-contentaccess-module.mk
index b43b0e0..0a36e8a 100644
--- a/test/poi-service/script/poi-contentaccess-module.mk
+++ b/test/poi-service/script/poi-contentaccess-module.mk
@@ -9,7 +9,7 @@
 #
 # \author Philippe Colliot <philippe.colliot@mpsa.com>
 #
-# \version 1.0
+# \version 1.1
 #
 # This Source Code Form is subject to the terms of the
 # Mozilla Public License (MPL), v. 2.0.
@@ -20,11 +20,11 @@
 #
 # List of changes:
 # 
-# <date>, <name>, <description of change>
+# 04/06/2014, Philippe Colliot, Migration to Qt5.2
 #
 # @licence end@
 POI_CONTENTACCESS_MODULE_SRC_DIR=$(ROOT_DIR)/poi-contentaccess-module
-POI_CONTENTACCESS_MODULE_DEPS=qt4-qmlviewer libqt4-dev libqt4-declarative libsqlite3-dev sqlite3
+POI_CONTENTACCESS_MODULE_DEPS=qt4-qmlviewer libqt5widgets5 libqt5dbus5 libqt5core5a libqt5gui5 libsqlite3-dev sqlite3
 POI_CONTENTACCESS_MODULE_BIN_DIR=$(BIN_DIR)/poi-contentaccess-module-bin
 
 DEPS+=$(POI_CONTENTACCESS_MODULE_DEPS)