Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/merge-flipped-and-scope-and-fixed-with-flipped-image into lp:ubuntu-qtcreator-plugins

[Juhapekka Piiroinen]

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-06-24 14:33:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-06-25 19:33:25 +0000
@@ -133,12 +133,12 @@
            {
                "fileName": "config.h"
            },
-	   {
-	       "fileName": "openclipart-rss.h"
-	   },
-	   {
-               "fileName": "openclipart-rss.c"
-	   }
+           {
+               "fileName": "displayName-parser.c"
+           },
+           {
+               "fileName": "displayName-parser.h"
+           }
        ]
     }
 

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/config.h'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/config.h	2013-06-23 09:18:37 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/config.h	2013-06-25 19:33:25 +0000
@@ -1,2 +1,9 @@
+#ifndef __CONFIG_H__
+#define __CONFIG_H__
+
+#define GROUP_NAME "com.canonical.Unity.Scope.%DISPLAYNAME_CAPITAL%"
+#define UNIQUE_NAME "/com/canonical/unity/scope/%DISPLAYNAME_LOWER%"
+
 #define CATEGORY_ICON_PATH "/usr/share/icons/unity-icon-theme/places/svg/service-%DISPLAYNAME_LOWER%.svg"
 
+#endif /* __CONFIG_H__ */

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/displayName_lower.scope'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/displayName_lower.scope	2013-06-23 09:18:37 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/displayName_lower.scope	2013-06-25 19:33:25 +0000
@@ -1,6 +1,6 @@
 [Scope]
-DBusName=com.canonical.Unity.Scope.%DISPLAYNAME_CAPITAL%
-DBusPath=/com/canonical/unity/scope/%DISPLAYNAME_LOWER%
+GroupName=com.canonical.Unity.Scope.%DISPLAYNAME_CAPITAL%
+UniqueName=/com/canonical/unity/scope/%DISPLAYNAME_LOWER%
 Icon=
 QueryBinary=
 Keywords=%DISPLAYNAME_LOWER%;

=== renamed file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/unity-scope-displayName_lower.service' => 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/unity-scope-displayName_lower.service.in'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/unity-scope-displayName_lower.service	2013-06-23 09:18:37 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/data/unity-scope-displayName_lower.service.in	2013-06-25 19:33:25 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.Unity.Scope.%DISPLAYNAME_CAPITAL%
-Exec=/usr/lib/*/unity-scope-%DISPLAYNAME_LOWER%/%DISPLAYNAME%
+Exec=

=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.c'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.c	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.c	2013-06-25 19:33:25 +0000
@@ -0,0 +1,87 @@
+/*
+ * Feed parser backend
+ *
+ * In this module you'll be implementing the feed parser backend.
+ * This code will not be Unity-specific, and it will vary depending
+ * on the type of data returned by your source. Common feed types
+ * returned when doing search queries to sources are JSON, RSS, XML.
+ *
+ * You'll simply need to implement a parser for the type of feed your
+ * source returns and send the results back to Unity via the get_results()
+ * function.
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <glib.h>
+#include "%DISPLAYNAME_LOWER%-parser.h"
+
+/*
+ * This is the URI against which you'll be submitting your
+ * search query from the Dash, which you'll need to adapt
+ * to your source.
+ */
+#define BASE_URI "http://%DISPLAYNAME_LOWER%.org/api/search/?query="
+
+/**
+ * @brief Cleans up (frees the memory allocated memory)
+ *        of the given results structure
+ * @param data Structure that contains the data to free
+ */
+void
+result_cleanup(gpointer data) {
+    /* This is specific to a type of result, so you'll
+     * need to adapt it to the results sent by your
+     * source.
+     */
+    result_t *result = (result_t *)data;
+    if (result->link) {
+        free(result->link);
+    }
+    if (result->icon_url) {
+        free(result->icon_url);
+    }
+    if (result->title) {
+        free(result->title);
+    }
+    if (result->description) {
+        free(result->description);
+    }
+    if (result->creation_date) {
+        free(result->creation_date);
+    }
+    if (result->author) {
+        free(result->author);
+    }
+}
+
+/**
+ * @brief get_results Get and parse the results from a search query
+ * @param search_term String submitted as the search term
+ * @return Search results
+ */
+GSList *
+get_results(const char *search_term) {
+    GString *url = NULL;
+    GSList *results = NULL;
+
+    /* Check if an actual search term was submitted, return otherwise */
+    if (search_term == NULL) {
+        g_warning("get_results: search_term cannot be null");
+        return results;
+    }
+
+    /* Construct the full search query */
+    url = g_string_new(BASE_URI);
+    g_string_append(url, search_term);
+    g_debug("Searching %s", url->str);
+    g_string_free(url, TRUE);
+
+    /*
+     * Submit the query to the source, parse the results and populate
+     * the results list here.
+     */
+
+    return results;
+}

=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h	2013-06-25 19:33:25 +0000
@@ -0,0 +1,21 @@
+#ifndef __%DISPLAYNAME_UPPER%_PARSER_H__
+#define __%DISPLAYNAME_UPPER%_PARSER_H__
+
+GSList *get_results(const char *search_term);
+void result_cleanup(gpointer data);
+
+/**
+ * This is just an example result type with some sample
+ * fields. You should modify the fields to match the
+ * data you are expecting from your search source
+ */
+typedef struct {
+    gchar *link;
+    gchar *icon_url;
+    gchar *title;
+    gchar *description;
+    gchar *creation_date;
+    gchar *author;
+} result_t;
+
+#endif /* __%DISPLAYNAME:u%_PARSER_H__ */

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.c'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.c	2013-06-24 14:33:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.c	2013-06-25 19:33:25 +0000
@@ -1,3 +1,14 @@
+/*
+ * Unity %DISPLAYNAME_CAPITAL% scope
+ *
+ * This module implements the interface to the Unity Dash and
+ * constitutes the frontend of the scope.
+ *
+ * Follow the scopes tutorial to learn how to create a scope:
+ * http://developer.ubuntu.com/resources/tutorials/unity-scopes/writing-a-unity-scope/
+ *
+ */
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -6,15 +17,15 @@
 #include <glib.h>
 #include <gio/gio.h>
 #include "config.h"
-#include "openclipart-rss.h"
-
-#define DBUS_NAME "com.canonical.Unity.Scope.%DISPLAYNAME_CAPITAL%"
-#define DBUS_PATH "/com/canonical/unity/scope/%DISPLAYNAME_LOWER%"
-
+#include "%DISPLAYNAME_LOWER%-parser.h"
 
 /**
  * In this function the results from the backend are obtained and
  * added to the search results in the Dash
+ *
+ * @brief Search function
+ * @param search Search term
+ * @param user_data Additional user data
  */
 static void
 search_func(UnityScopeSearchBase* search, void* user_data)
@@ -25,11 +36,21 @@
     result_t *result = NULL;
     UnityScopeResult scope_result = { 0, };
 
-    /* The get_results() function is implemented in the backend */
+    /* Avoid compiler warning if we're not using the parameter */
+    user_data = user_data;
+
+    /* Fetch the results from the backend */
     results = get_results(search->search_context->search_query);
 
+    /* Iterate through the returned results and add them to the
+     * Unity's result set
+     */
     for (iter = results; iter; iter = iter->next) {
+
+        /* Get the result */
         result = (result_t *)iter->data;
+
+        /* Build and populate a scope result from the source data */
         scope_result.uri = result->link;
         scope_result.title = result->title;
         scope_result.icon_hint = result->icon_url;
@@ -43,19 +64,26 @@
         metadata = g_hash_table_new(g_str_hash, g_str_equal);
         if (result->author) {
             g_hash_table_insert(metadata, "author",
-                g_variant_new_string(result->author));
+                                g_variant_new_string(result->author));
         }
         if (result->creation_date) {
             g_hash_table_insert(metadata, "creation_date",
-                g_variant_new_string(result->creation_date));
+                                g_variant_new_string(result->creation_date));
         }
         scope_result.metadata = metadata;
 
-        /* Add the returned result to the search results list */
+        /*
+         * Add the returned result to the search results list, taking a
+         * copy of the data passed in via scope_result
+         */
         unity_result_set_add_result(search->search_context->result_set,
-            &scope_result);
+                                    &scope_result);
         g_hash_table_unref(metadata);
     }
+
+    /*
+     * Clear out the data copied to the result set earlier on
+     */
     g_slist_free_full(results, (GDestroyNotify) result_cleanup);
 }
 
@@ -64,6 +92,11 @@
  * its preview is shown in the Dash.
  * There are a set of predefined preview types: simply pick one, instantiate
  * it, add metadata to it if available, and return it.
+ *
+ * @brief Dash preview function
+ * @param previewer Result previewer
+ * @param user_data Additional user data
+ * @return Preview populated with the result's data
  */
 static UnityAbstractPreview *
 preview_func(UnityResultPreviewer *previewer, void *user_data)
@@ -74,15 +107,22 @@
     GVariant *gv_author, *gv_creation_date = NULL;
     const char *creation_date = NULL;
 
+    /* Avoid compiler warning if we're not using the parameter */
+    user_data = user_data;
+
+    /* Create a generic preview */
     preview = UNITY_PREVIEW(unity_generic_preview_new(
-        previewer->result.title,
-        previewer->result.comment,
-        g_icon_new_for_string(previewer->result.icon_hint, NULL)));
+                                previewer->result.title,
+                                previewer->result.comment,
+                                g_icon_new_for_string(previewer->result.icon_hint, NULL)));
 
+    /* Set up the preview's action */
     action = unity_preview_action_new_with_uri(previewer->result.uri, "Open",
-        NULL);
+                                               NULL);
     unity_preview_add_action(preview, action);
+    unity_object_unref(action);
 
+    /* If the result contains metadata, add it to the preview */
     if (previewer->result.metadata) {
         gv_author = g_hash_table_lookup(previewer->result.metadata, "author");
 
@@ -91,7 +131,7 @@
          * first, which might be useful for debugging. */
         if (gv_author) {
             author_hint = unity_info_hint_new_with_variant("author", "Author",
-                NULL, gv_author);
+                                                           NULL, gv_author);
             /* The ref call here and unref below are to work-around a bug in
              * libunity, see:
              *   http://code.launchpad.net/~mhr3/libunity/floating-fixes */
@@ -100,11 +140,11 @@
             g_object_unref(author_hint);
         }
         gv_creation_date = g_hash_table_lookup(previewer->result.metadata,
-            "creation_date");
+                                               "creation_date");
         if (gv_creation_date) {
             g_variant_get(gv_creation_date, "&s", &creation_date);
             creation_date_hint = unity_info_hint_new("creation_date",
-                "Creation Date", NULL, creation_date);
+                                                     "Creation Date", NULL, creation_date);
             /* The ref call here and unref below are to work-around a bug in
              * libunity, see:
              *   http://code.launchpad.net/~mhr3/libunity/floating-fixes */
@@ -129,20 +169,32 @@
     UnityCategory *cat = NULL;
     GIcon *icon = NULL;
 
+    /* Create and set a category for the scope, including an icon */
     icon = g_themed_icon_new(CATEGORY_ICON_PATH);
 
     cat = unity_category_new("global", "%DISPLAYNAME_CAPITAL%", icon,
-        UNITY_CATEGORY_RENDERER_HORIZONTAL_TILE);
+                             UNITY_CATEGORY_RENDERER_HORIZONTAL_TILE);
     cats = unity_category_set_new();
     unity_category_set_add(cats, cat);
 
+    /* Create and set up the scope */
     scope = unity_simple_scope_new();
-    unity_simple_scope_set_group_name(scope, DBUS_NAME);
-    unity_simple_scope_set_unique_name(scope, DBUS_PATH);
+    unity_simple_scope_set_group_name(scope, GROUP_NAME);
+    unity_simple_scope_set_unique_name(scope, UNIQUE_NAME);
     unity_simple_scope_set_search_func(scope, search_func, NULL, NULL);
     unity_simple_scope_set_preview_func(scope, preview_func, NULL, NULL);
     unity_simple_scope_set_category_set(scope, cats);
 
+    g_object_unref (icon);
+    unity_object_unref (cat);
+    unity_object_unref (cats);
+
+    /*
+     * Setting up the connector is an action that will not be required
+     * in future revisions of the API. In particular, we only need it here
+     * since the scope is running locally on the device as opposed to
+     * running on the Smart Scopes server
+     */
     connector = unity_scope_dbus_connector_new(UNITY_ABSTRACT_SCOPE(scope));
     unity_scope_dbus_connector_export(connector, NULL);
     unity_scope_dbus_connector_run();

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro	2013-06-24 14:33:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro	2013-06-25 19:33:25 +0000
@@ -16,27 +16,46 @@
 
 ###########################################################
 # To install dependencies:
-#   sudo apt-get install libunity-dev libglib2.0-dev libmrss0-dev
+#   sudo apt-get install libunity-dev
 PKGCONFIG += \
-    glib-2.0 \
-    mrss \
     unity
 
+# Pkg-config takes care of the includes for the build, so the following variable is not
+# strictly needed. We need this simply for Qt Creator to find the
+# headers in the editor, as it seems not to use the PGKCONFIG variable.
+INCLUDEPATH += \
+    /usr/include/glib-2.0 \
+    /usr/include/unity/unity
+
+TARGET = %DISPLAYNAME%
 DAEMON_PATH = $$[QT_INSTALL_LIBS]/unity-scope-$${TARGET}
-TARGET = %DISPLAYNAME%
-target.path = $$DAEMON_PATH 
 
-QMAKE_CFLAGS += -Wno-unused-parameter
+DATA_DIR = $$_PRO_FILE_PWD_/data
+SCOPE_FILE = $$DATA_DIR/$${TARGET}.scope
+SERVICE_FILE = $$DATA_DIR/unity-scope-$${TARGET}.service
 
 SOURCES += \
-     %DISPLAYNAME%.c
+    %DISPLAYNAME%.c \
+    %DISPLAYNAME%-parser.c
 
 HEADERS += \
-    config.h 
+    config.h \  
+    %DISPLAYNAME%-parser.h
 
 OTHER_FILES += \
-    data/%DISPLAYNAME_LOWER%.scope \
-    data/unity-scope-%DISPLAYNAME_LOWER%.service
+    $$SCOPE_FILE \
+    $${SERVICE_FILE}.in
+
+# Rule to generate the DBUS .service file, including the architecture-dependent installation path
+# generated at build time
+servicefilegen.target = servicefilegen
+servicefilegen.commands = sed -e \"s,\\(Exec=\\).*\$$,\1$$DAEMON_PATH/$$TARGET,\" $${SERVICE_FILE}.in > $$SERVICE_FILE
+QMAKE_EXTRA_TARGETS += servicefilegen
+QMAKE_CLEAN += $$SERVICE_FILE
+QMAKE_CLEAN += $$DATA_DIR/*~
+
+# Rule to install the scope's binary
+target.path = $$DAEMON_PATH
 
 # Rule to install the DBUS .service file
 servicefile.path = /usr/share/dbus-1/services
@@ -47,5 +66,6 @@
 scopefile.files = $$SCOPE_FILE
 
 INSTALLS += \
+    target \
     scopefile \
     servicefile

=== removed file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.c'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.c	2013-06-24 14:33:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.c	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <mrss.h>
-#include <glib.h>
-#include "openclipart-rss.h"
-
-#define BASE_URI "http://openclipart.org/api/search/?query="
-
-void
-result_cleanup(gpointer data) {
-    result_t *result = (result_t *)data;
-    if (result->link) {
-        free(result->link);
-    }
-    if (result->icon_url) {
-        free(result->icon_url);
-    }
-    if (result->title) {
-        free(result->title);
-    }
-    if (result->description) {
-        free(result->description);
-    }
-    if (result->creation_date) {
-        free(result->creation_date);
-    }
-    if (result->author) {
-        free(result->author);
-    }
-}
-
-/* Returns a value for a given tag and attribute. If attr_name is null,
- * then it returns the tag value, otherwise it returns the attribute value.
- * Returns NULL on any error or unfound tag/attribute.
- *
- * XXX - it would be more efficient to collect stuff from this loop all at
- * once.
- */
-char *
-get_other_tags_attribute(mrss_tag_t *tag, const char *tag_name, const char *attr_name) {
-    mrss_attribute_t *attribute;
-
-    if ((tag_name == NULL) && (attr_name == NULL)) {
-        return NULL;
-    }
-
-    while (tag) {
-        if (!strcmp(tag->name, tag_name)) {
-            if (attr_name == NULL) {
-                return tag->value;
-            }
-            for (attribute = tag->attributes; attribute;
-                attribute = attribute->next) {
-                if (!strcmp(attribute->name, attr_name)) {
-                    return attribute->value;
-                }
-            }
-        }
-        tag = tag->next;
-    }
-    return NULL;
-}
-
-GSList *
-get_results(const char *search_term) {
-    mrss_t *data;
-    mrss_error_t ret;
-    mrss_item_t *item;
-    CURLcode code;
-    GString *url = NULL;
-    GSList *results = NULL;
-    result_t *result = NULL;
-    char *tmp = NULL;
-
-    if (search_term == NULL) {
-        g_warning("get_results: search_term cannot be null");
-        return results;
-    }
-
-    url = g_string_new(BASE_URI);
-    g_string_append(url, search_term);
-    g_debug("searching %s", url->str);
-    ret = mrss_parse_url_with_options_and_error(url->str, &data, NULL, &code);
-    g_string_free(url,TRUE);
-
-    if (ret) {
-        g_warning("MRSS return error: %s\n", ret == MRSS_ERR_DOWNLOAD ? mrss_curl_strerror (code) : mrss_strerror (ret));
-        return results;
-    }
-
-    /*
-     * Parse the results from the RSS feed returned by a search query submitted to openclipart.org
-     * See "Clipart Search" in http://openclipart.org/developers
-     */
-    item = data->item;
-    while (item) {
-        result = (result_t*)malloc(sizeof(result_t));
-        bzero((result_t*)result, sizeof(result_t));
-        if (item->link) {
-            result->link = (char *)malloc(strlen(item->link)+1);
-            strcpy(result->link,item->link);
-        }
-        if (item->title) {
-            result->title = (char *)malloc(strlen(item->title)+1);
-            strcpy(result->title,item->title);
-        }
-        if (item->description) {
-            result->description = (char *)malloc(strlen(item->description)+1);
-            strcpy(result->description,item->description);
-        }
-        if (item->pubDate) {
-            result->creation_date = (char *)malloc(strlen(item->pubDate)+1);
-            strcpy(result->creation_date,item->pubDate);
-        }
-        tmp = get_other_tags_attribute(item->other_tags, "thumbnail", "url");
-        if (tmp) {
-            result->icon_url = (char *)malloc(strlen(tmp)+1);
-            strcpy(result->icon_url,tmp);
-        }
-        tmp = get_other_tags_attribute(item->other_tags, "creator", NULL);
-        if (tmp) {
-            result->author = (char *)malloc(strlen(tmp)+1);
-            strcpy(result->author,tmp);
-        }
-        results = g_slist_append(results, result);
-        item = item->next;
-    }
-    mrss_free (data);
-    return results;
-}

=== removed file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.h'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.h	2013-06-24 14:33:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/openclipart-rss.h	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#ifndef __OPENCLIPART_RSS_H__
-#define __OPENCLIPART_RSS_H__
-
-char *get_other_tags_attribute(mrss_tag_t *tag,
-    const char *tag_name, const char *attr_name);
-GSList *get_results(const char *search_term);
-void result_cleanup(gpointer data);
-
-typedef struct {
-    gchar *link;
-    gchar *icon_url;
-    gchar *title;
-    gchar *description;
-    gchar *creation_date;
-    gchar *author;
-} result_t;
-
-#endif

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json	2013-06-24 13:42:17 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json	2013-06-25 19:33:25 +0000
@@ -9,9 +9,7 @@
             {
                 "name": "check",
                 "id": "Ubuntu.Make.Check",
-                "parent": "Build",
                 "projectRequired": true,
-                "group": "ProjectExplorer.Group.Run",
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_make check"
                 ]
@@ -19,12 +17,26 @@
             {
                 "name": "autopilot",
                 "id": "Ubuntu.Make.Autopilot",
-                "parent": "Build",
                 "projectRequired": true,
-                "group": "ProjectExplorer.Group.Run",
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_make autopilot"
                 ]
+            },
+            {
+                "name": "install",
+                "id": "Ubuntu.Make.Install",
+                "projectRequired": true,
+                "actions": [
+                    "%SCRIPTDIRECTORY%/qtc_project_make install"
+                ]
+            },
+            {
+                "name": "uninstall",
+                "id": "Ubuntu.Make.Uninstall",
+                "projectRequired": true,
+                "actions": [
+                    "%SCRIPTDIRECTORY%/qtc_project_make uninstall"
+                ]
             }
         ]
     },
@@ -78,7 +90,7 @@
                 "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_create_package",
-                    "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%*.deb phablet@127.0.0.1 2222 /home/phablet"
+                    "%SCRIPTDIRECTORY%/qtc_device_deploy_package %SERIALNUMBER% ../%FOLDERNAME%_*.deb phablet@127.0.0.1 2222 /home/phablet"
                 ]
             },
             {
@@ -168,12 +180,34 @@
         "submenu": [
              {
                 "name": "Ubuntu Touch Showcase Gallery",
+                "keysequence": "Ctrl+Shift+S",
                 "id": "Ubuntu.Menu.Showcase",
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_launch_gallery"
                 ]
             },
             {
+                "name": "Take a screenshot",
+                "id": "Ubuntu.Menu.Screenshot",
+                "keysequence": "Ctrl+Shift+P",
+                "deviceRequired": true,
+                "actions": [
+                    "adb -s %SERIALNUMBER% root",
+                    "adb -s %SERIALNUMBER% shell /system/bin/screencap -p /sdcard/screenshot.png",
+                    "adb -s %SERIALNUMBER% pull /sdcard/screenshot.png screenshot.png",
+                    "eog -s %SERIALNUMBER% screenshot.png"
+                ]
+            },
+            {
+                "name": "Mount Device Filesystem",
+                "id": "Ubuntu.Menu.MountDeviceFileSystem",
+                "keysequence": "Ctrl+Shift+F1",
+                "deviceRequired": true,
+                "actions": [
+                    "nautilus ssh://phablet@127.0.0.1:2222"
+                ]
+            },
+            {
                 "name": "Translations",
                 "id": "Ubuntu.Menu.i18n",
                 "submenu": [
@@ -360,18 +394,6 @@
                         "actions": [
                             "%SCRIPTDIRECTORY%/device_set_persist-sys-usb-config %SERIALNUMBER%"
                         ]
-                    },
-                    {
-                        "name": "Take a screenshot",
-                        "id": "Ubuntu.Menu.Device.Screenshot",
-                        "keysequence": "Ctrl+Shift+P",
-                        "deviceRequired": true,
-                        "actions": [
-                            "adb -s %SERIALNUMBER% root",
-                            "adb -s %SERIALNUMBER% shell /system/bin/screencap -p /sdcard/screenshot.png",
-                            "adb -s %SERIALNUMBER% pull /sdcard/screenshot.png screenshot.png",
-                            "eog -s %SERIALNUMBER% screenshot.png"
-                        ]
                     }
                 ]
             }

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-05-01 23:49:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily	2013-06-25 19:33:25 +0000
@@ -14,10 +14,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root
-adb -s ${SERIALNUMBER} wait-for-device
-x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}'"
+
+. `dirname $0`/functions.inc
+
+if [[ !does_device_hw_match_image_hw ]]; then
+	IMAGE_HARDWARE=`device_image_hardware`
+	DEVICE_HARDWARE=`device_hardware`
+	echo
+	echo " WARNING! Device image hardware version"
+	echo "          does not match the detected device hardware."
+	echo
+	echo -n "          Device Image Version: "
+	echo ${IMAGE_HARDWARE}
+	echo -n "          Device Version: "
+	echo ${DEVICE_HARDWARE}
+ 	echo
+ 	echo "          In order to flash your device, you must do it manually:"
+ 	echo "             phablet-flash -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE}"
+ 	echo
+else
+	x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}'"
+fi
\ No newline at end of file

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-05-01 23:49:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_flashdaily_bootstrap	2013-06-25 19:33:25 +0000
@@ -14,10 +14,24 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root
-adb -s ${SERIALNUMBER} wait-for-device
-x-terminal-emulator -e "bash -ic 'phablet-flash -b -s ${SERIALNUMBER}'"
+
+. `dirname $0`/functions.inc
+
+if [[ !does_device_hw_match_image_hw ]]; then
+	IMAGE_HARDWARE=`device_image_hardware`
+	DEVICE_HARDWARE=`device_hardware`
+	echo
+	echo " WARNING! Device image hardware version"
+	echo "          does not match the detected device hardware."
+	echo
+	echo -n "          Device Image Version: "
+	echo ${IMAGE_HARDWARE}
+	echo -n "          Device Version: "
+	echo ${DEVICE_HARDWARE}
+ 	echo
+ 	echo "          In order to flash your device, you must do it manually:"
+ 	echo "             phablet-flash -s ${SERIALNUMBER} -d ${IMAGE_HARDWARE} -b"
+ 	echo
+else
+	x-terminal-emulator -e "bash -ic 'phablet-flash -s ${SERIALNUMBER}' -b"
+fi
\ No newline at end of file

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_hasnetwork'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_hasnetwork	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_hasnetwork	2013-06-25 19:33:25 +0000
@@ -14,16 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-NM_STATE=`adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin nmcli nm | head -n+2 | awk '{print $2}'`
-if [[ $NM_STATE != *disconnected* ]]; then
-  echo "1"
-else
-  echo "0"
-fi
-
+
+. `dirname $0`/functions.inc
+
+device_network_state_connected

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_network_clone'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_network_clone	2013-05-01 18:53:35 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_network_clone	2013-06-25 19:33:25 +0000
@@ -14,17 +14,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-gksudo phablet-network-setup -s ${SERIALNUMBER}
-
-SCRIPTPATH=`dirname $0`
-HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}`
-while [[ ${HASNETWORK} == "0" ]]; do
-sleep 1
-echo -n .
-HASNETWORK=`${SCRIPTPATH}/device_hasnetwork ${SERIALNUMBER}`
-done
-echo "The device has connected to a network."
+
+. `dirname $0`/functions.inc
+
+clone_network_setup_from_host_to_device
+wait_for_network_state_switch_on
+
+echo "The device has connected to a network."
\ No newline at end of file

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_portforward'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_portforward	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_portforward	2013-06-25 19:33:25 +0000
@@ -14,9 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
+
+. `dirname $0`/functions.inc
+
 SSHPORT=$2
 QMLPORT=$3
 
@@ -28,7 +28,6 @@
   QMLPORT=3768
 fi
 
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} forward tcp:$SSHPORT tcp:22
-adb -s ${SERIALNUMBER} forward tcp:$QMLPORT tcp:3768
+adb_forward_tcp ${SSHPORT} 22
+adb_forward_tcp ${QMLPORT} 3768
+

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot	2013-06-25 19:33:25 +0000
@@ -14,10 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin reboot
+
+. `dirname $0`/functions.inc
+
+device_reboot

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2bootloader'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2bootloader	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2bootloader	2013-06-25 19:33:25 +0000
@@ -14,10 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} reboot-bootloader
+
+. `dirname $0`/functions.inc
+
+device_reboot_bootloader
+

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2recovery'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2recovery	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_reboot2recovery	2013-06-25 19:33:25 +0000
@@ -14,10 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} reboot recovery
+
+. `dirname $0`/functions.inc
+
+device_reboot_recovery

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_rootshell'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_rootshell	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_rootshell	2013-06-25 19:33:25 +0000
@@ -14,10 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-x-terminal-emulator -e "adb -s ${SERIALNUMBER} shell ubuntu_chroot shell"
+
+. `dirname $0`/functions.inc
+
+adb_shell

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search	2013-06-03 14:59:43 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_search	2013-06-25 19:33:25 +0000
@@ -14,7 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
+
 adb kill-server &> /dev/null
 adb start-server &> /dev/null
 adb devices -l

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_set_persist-sys-usb-config	2013-06-25 19:33:25 +0000
@@ -15,6 +15,6 @@
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
 
-SERIALNUMBER=$1
+. `dirname $0`/functions.inc
 
-adb -s ${SERIALNUMBER} shell setprop persist.sys.usb.config ptp,adb
+adb_shell setprop persist.sys.usb.config ptp,adb

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_shutdown'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_shutdown	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_shutdown	2013-06-25 19:33:25 +0000
@@ -14,10 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin shutdown -h now
+
+. `dirname $0`/functions.inc
+
+device_shutdown

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_time_clone'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_time_clone	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_time_clone	2013-06-25 19:33:25 +0000
@@ -14,16 +14,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Zoltán Balogh <[e-mail]>
-set -e
-
-SERIALNUMBER=$1
-
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+#         Juhapekka Piiroinen <[e-mail]>
+
+. `dirname $0`/functions.inc
+
 LOCAL_DATE=`date +%Y%m%d`
 LOCAL_TIME=`date +%T`
 TIMEZONE=`cat /etc/timezone`
-${ADB} sed -i "s#.*/.*#${TIMEZONE=}#" /etc/timezone
-${ADB} dpkg-reconfigure --frontend noninteractive tzdata >/dev/null
-${ADB} date +%Y%m%d -s "${LOCAL_DATE}" >/dev/null
-${ADB} date +%T -s "${LOCAL_TIME}" >/dev/null
+
+adb_shell sed -i "s#.*/.*#${TIMEZONE=}#" /etc/timezone
+adb_shell dpkg-reconfigure --frontend noninteractive tzdata > /dev/null
+adb_shell date +%Y%m%d -s "${LOCAL_DATE}" > /dev/null
+adb_shell date +%T -s "${LOCAL_TIME}" > /dev/null
 

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_version'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_version	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/device_version	2013-06-25 19:33:25 +0000
@@ -14,10 +14,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} shell cat /system/*ubuntu_stamp
+
+. `dirname $0`/functions.inc
+
+device_image_hardware
+device_image_version

=== added file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/functions.inc'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/functions.inc	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/functions.inc	2013-06-25 19:33:25 +0000
@@ -0,0 +1,137 @@
+#!/bin/bash
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 2.1.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Juhapekka Piiroinen <[e-mail]>
+
+set -e
+
+SCRIPTPATH=`dirname $0`
+SERIALNUMBER=$1
+SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
+USERNAME=phablet
+
+function adb_root {
+	adb -s ${SERIALNUMBER} root &> /dev/null
+	adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
+}
+
+function has_ubuntu_chroot {
+	local HAS_UBUNTU_CHROOT=`adb -s ${SERIALNUMBER} shell "which ubuntu_chroot"`
+	if [[ ${HAS_UBUNTU_CHROOT} ]]; then
+		echo 1
+	else
+		echo 0
+	fi
+}
+
+function adbd_restart {
+	adb kill-server &> /dev/null
+	adb start-server &> /dev/null
+}
+
+function adb_devices {
+	adb devices -l
+}
+
+function adb_forward_tcp {
+set +e
+	adb -s ${SERIALNUMBER} forward tcp:$1 tcp:$2
+set -e
+}
+
+function adb_shell {
+set +e
+	if [[ `has_ubuntu_chroot` -eq "1" ]]; then
+		adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin $@
+	else
+		adb -s ${SERIALNUMBER} shell $@
+	fi
+}
+
+function phablet_shell {
+	adb_shell "su ${USERNAME} -c \"$@\""
+}
+
+function ubuntu_stamp {
+	adb_shell cat /system/*ubuntu_stamp
+}
+
+function device_hardware {
+	adb_devices |grep -o device:.*|sed "s/device://"
+}
+
+function device_image_hardware {
+	ubuntu_stamp | grep HARDWARE|sed "s/HARDWARE=//g"
+}
+
+function does_device_hw_match_image_hw {
+	if [[ device_hardware == device_image_hardware ]]; then
+        	echo 1
+	else
+        	echo 0
+	fi
+}
+
+function device_image_version {
+	ubuntu_stamp | grep JENKINS|sed "s/JENKINS_BUILD=//g"
+}
+
+function device_network_state_connected {
+	local NM_STATE=`adb_shell nmcli nm | head -n+2 | awk '{print $2}'`
+	if [[ $NM_STATE != *disconnected* ]]; then
+	  echo 1
+	else
+	  echo 0
+	fi
+}
+
+function device_reboot {
+	adb_shell reboot
+}
+
+function device_reboot_bootloader {
+	adb -s ${SERIALNUMBER} reboot-bootloader
+}
+
+function device_reboot_recovery {
+	adb -s ${SERIALNUMBER} reboot recovery
+}
+
+function device_shutdown {
+	adb_shell shutdown -h now
+}
+
+function wait_for_network_state_switch_on {
+	local RESULT=`device_network_state_connected`
+	while [[ "$RESULT" -eq "0" ]]; do
+		sleep 1
+		echo -n .
+		RESULT=`device_network_state_connected`
+	done
+}
+
+function clone_network_setup_from_host_to_device {
+	gksudo phablet-network-setup -s ${SERIALNUMBER}
+}
+
+#############################################################
+if [[ -z ${SERIALNUMBER} ]]; then
+  echo "Please pass a device serial number."
+  echo
+  adb_devices
+  exit -1
+fi
+
+adb_root

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_connect'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_connect	2013-05-02 21:46:53 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_connect	2013-06-25 19:33:25 +0000
@@ -14,14 +14,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e; 
-
-SERIALNUMBER=$1
+
+. `dirname $0`/functions.inc
+
 PORT=$2
 USERNAME=$3
-SCRIPTPATH=`dirname $0`
-SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
-
-${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${PORT} 3768
-
-x-terminal-emulator -e "ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1 bash -i" &
+
+#$SCRIPTPATH/device_portforward ${PORT} 3768
+
+x-terminal-emulator -e "ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT $USERNAME@127.0.0.1" &

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_install'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_install	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_install	2013-06-25 19:33:25 +0000
@@ -14,9 +14,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e; 
-
-SERIALNUMBER=$1
-
-SCRIPTPATH=`dirname $0`
+
+. `dirname $0`/functions.inc
+
 ${SCRIPTPATH}/qtc_device_developertools ${SERIALNUMBER}

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_publickey'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_publickey	2013-05-01 22:36:21 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_publickey	2013-06-25 19:33:25 +0000
@@ -14,41 +14,51 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e; 
-
-USERNAME=$1
-SERIALNUMBER=$2
-KEYPATH=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
-
-SHELL="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+
+. `dirname $0`/functions.inc
+
+USERNAME=$2
 
 function check_key {
-
-KEY=`cat $KEYPATH.pub`
-KEYS=`$SHELL su -c "cat ~/.ssh/authorized_keys2 | grep '$KEY'" $USERNAME`
-if [[ -z $KEYS || $KEYS == *No\ such* ]]; then
-  echo "Deploying key.."
-  deploy_key
-else
-  echo "Key has been already deployed"
-fi
+	echo "Checking for keys.."
+	KEY=`cat $SSHIDENTITY.pub`
+	set +e
+	PHABLET_KEYS=`adb_shell "cat /home/phablet/.ssh/authorized_keys2"`
+	KEYS=`echo $PHABLET_KEYS | grep "$KEY"`
+	set -e
+	echo
+	echo "Host key is:"
+	echo $KEY
+	echo
+	echo "We have following keys on the device: "
+	echo $KEYS
+	if [[ -z $KEYS || $KEYS == *No\ such* ]]; then
+		echo "*no keys*"
+		echo
+		deploy_key
+	else
+		echo
+		echo "The host key has been already deployed."
+	fi
 }
 
 function deploy_key {
- KEY=`cat $KEYPATH.pub`
-$SHELL su -c "mkdir -p ~/.ssh" $USERNAME
-$SHELL su -c "echo $KEY >> ~/.ssh/authorized_keys2" $USERNAME
+	echo "Deploy the host key to the device.."
+	KEY=`cat $SSHIDENTITY.pub`
+	phablet_shell "mkdir -p /home/phablet/.ssh"
+	echo "..key folder created"
+	phablet_shell "echo $KEY >> /home/phablet/.ssh/authorized_keys2"
+	echo "..key deployed!"
 }
 
 function generate_key {
-ssh-keygen -t rsa -N '' -f $KEYPATH -b 768
+	echo "Generating host key.."
+	ssh-keygen -t rsa -N '' -f $SSHIDENTITY -b 768
 }
 
 #################
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device > /dev/null
 
-if [[ -f $KEYPATH ]]; then
+if [[ -f $SSHIDENTITY ]]; then
   check_key
 else
   generate_key

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_remove'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_remove	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_remove	2013-06-25 19:33:25 +0000
@@ -14,12 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e; 
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get remove openssh-server -y
+
+. `dirname $0`/functions.inc
+
+adb_shell apt-get remove openssh-server -y
 
 

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_version'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_version	2013-05-01 22:44:56 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/openssh_version	2013-06-25 19:33:25 +0000
@@ -14,13 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-#set -e;
-
-SERIALNUMBER=$1
-
-adb -s ${SERIALNUMBER} root &> /dev/null
-adb -s ${SERIALNUMBER} wait-for-device &> /dev/null
-adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-get -f install &> /dev/null
-adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin apt-cache policy openssh-server|grep Installed|sed "s/Installed\://g"
-
+
+. `dirname $0`/functions.inc
+
+adb_shell apt-get -f install &> /dev/null
+adb_shell apt-cache policy openssh-server|grep Installed|sed "s/Installed\://g"
 

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage	2013-05-02 21:46:53 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildanddeploypackage	2013-06-25 19:33:25 +0000
@@ -14,34 +14,30 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
+
+. `dirname $0`/functions.inc
+
 FOLDERNAME=$2
 TARGET_DEVICE=$3
 TARGET_DEVICE_PORT=$4
 TARGET_DEVICE_HOME=$5
-SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
 
 if [[ -z ${TARGET_DEVICE_PORT} ]]; then
-        TARGET_DEVICE_PORT=2222
+    TARGET_DEVICE_PORT=2222
 fi
 
 if [[ -z ${TARGET_DEVICE} ]]; then
-        TARGET_DEVICE=phablet@127.0.0.1
+    TARGET_DEVICE=phablet@127.0.0.1
 fi
 
 if [[ -z ${TARGET_DEVICE_HOME} ]]; then
-        TARGET_DEVICE_HOME=/home/phablet/dev_tmp
+    TARGET_DEVICE_HOME=/home/phablet/dev_tmp
 fi
 
 SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
 SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-
-SCRIPTPATH=`dirname $0`
 
 ${SCRIPTPATH}/qtc_device_buildpackage ${SERIALNUMBER} ${FOLDERNAME}
 
 FILES=`$SSH "cd ${TARGET_DEVICE_HOME}; ls -1 *.deb"`
-echo $FILES | xargs -0 -I FILE $ADB gdebi --n ${TARGET_DEVICE_HOME}/FILE
+echo $FILES | xargs -0 -I FILE adb_shell gdebi --n ${TARGET_DEVICE_HOME}/FILE

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage	2013-05-02 21:46:53 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_buildpackage	2013-06-25 19:33:25 +0000
@@ -15,7 +15,6 @@
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
 
-
 DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc`
 DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc`
 
@@ -36,40 +35,34 @@
   fi
 fi
 
-set -e
+. `dirname $0`/functions.inc
 
-SERIALNUMBER=$1
 FOLDERNAME=$2
 TARGET_DEVICE=$3
 TARGET_DEVICE_PORT=$4
 TARGET_DEVICE_HOME=$5
 
 USAGE="$0 [serialnumber] [foldername] [target_device] [target_device_port] [target_device_home]"
-SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
 
 if [[ -z $FOLDERNAME ]]; then
- echo ${USAGE}
- exit
+  echo ${USAGE}
+  exit
 fi
 
 if [[ -z ${TARGET_DEVICE_PORT} ]]; then
-        TARGET_DEVICE_PORT=2222
+  TARGET_DEVICE_PORT=2222
 fi
 
 if [[ -z ${TARGET_DEVICE} ]]; then
-        TARGET_DEVICE=phablet@127.0.0.1
+  TARGET_DEVICE=phablet@127.0.0.1
 fi
 
 if [[ -z ${TARGET_DEVICE_HOME} ]]; then
-        TARGET_DEVICE_HOME=/home/phablet/dev_tmp
+  TARGET_DEVICE_HOME=/home/phablet/dev_tmp
 fi
 
 SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
 SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin "
-SCRIPTPATH=`dirname $0`
-
-${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
 
 pushd ${FOLDERNAME}
  set +e
@@ -101,7 +94,7 @@
 
 MISSING_DEPENDENCIES=`$SSH "cd ${TARGET_DEVICE_HOME}/${FOLDERNAME}; dpkg-checkbuilddeps 2>&1|sed 's/dpkg-checkbuilddeps: Unmet build dependencies://'"`
 
-$ADB apt-get --assume-yes install ${MISSING_DEPENDENCIES}
+adb_shell apt-get --assume-yes install ${MISSING_DEPENDENCIES}
 
 $SSH "cd ${TARGET_DEVICE_HOME}/${FOLDERNAME}; dpkg-buildpackage -us -uc -nc"
 
@@ -115,4 +108,4 @@
 echo
 echo "@ $PWD"
 echo
-$ADB apt-get --assume-yes remove ${MISSING_DEPENDENCIES}
+adb_shell apt-get --assume-yes remove ${MISSING_DEPENDENCIES}

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_close_all_apps	2013-06-25 19:33:25 +0000
@@ -14,23 +14,35 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-#set -e;
-#set -x
-
-SERIALNUMBER=$1
+
+. `dirname $0`/functions.inc
+
 APPLICATION=$2
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 if [[ -z ${APPLICATION} ]]; then
-  ${ADB} kill -s 9 \`pidof qmlscene\`
+  echo "Close all instances of running applications."
+  adb_shell kill -s 9 \`pidof qmlscene\`
 else
-  IS_MOUNTED=`${ADB} mount | grep proc`
-  if [[ -z ${IS_MOUNTED} ]]; then
-    ${ADB} mount -t proc proc /proc
-  fi
-  PID_OF_APP=`${ADB} COLUMNS=1000 ps -ef|grep qmlscene|grep ${APPLICATION}|awk '{print $2}'`
-  ${ADB} kill -s 9 ${PID_OF_APP}
-  if [[ -z ${IS_MOUNTED} ]]; then
-    ${ADB} umount /proc
-  fi
+  echo "Close the ${APPLICATION}."
+  set +e
+  IS_MOUNTED=`adb_shell mount | grep proc`
+  set -e
+  if [[ -z ${IS_MOUNTED} ]]; then
+    adb_shell mount -t proc proc /proc
+  fi
+
+  PID_OF_APP=`adb_shell COLUMNS=1000 ps -ef|grep qmlscene|grep ${APPLICATION}|awk '{print $2}'`
+  if [[ -z $PID_OF_APP ]]; then
+    echo "  *no running instances of application*"
+    exit 1
+  fi
+
+  echo " * application pid(s) is ${PID_OF_APP}."
+
+  adb_shell kill -s 9 ${PID_OF_APP}
+
+  if [[ -z ${IS_MOUNTED} ]]; then
+    adb_shell umount /proc
+  fi
+  echo "Application has been closed."
 fi

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package	2013-06-12 08:00:14 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_deploy_package	2013-06-25 19:33:25 +0000
@@ -14,16 +14,14 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
+
+. `dirname $0`/functions.inc
+
 PACKAGE=$2
 TARGET_DEVICE=$3
 TARGET_DEVICE_PORT=$4
 TARGET_DEVICE_HOME=$5
 
-SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
-
 echo
 echo "Deploying package to device with serial number of ${SERIALNUMBER}."
 echo "Using SSH identity from ${SSHIDENTITY}."
@@ -36,6 +34,12 @@
  exit
 fi
 
+# lets make the ssh port forwarding back on, as the developer might have rebooted the device
+echo "do port forwarding"
+set +e
+${SCRIPTPATH}/device_portforward ${TARGET_DEVICE_PORT} 3768
+set -e
+echo "done"
 # check if we have .pro files or cpp/h files, if we do lets exit, as this deployment method is for QML projects
 H_FILES=`find . -name *.h`
 CPP_FILES=`find . -name *.cpp`
@@ -53,13 +57,10 @@
 PLAIN_PACKAGE=`basename ${PACKAGE}`
 SCRIPTPATH=`dirname $0`
 
-${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
-
 SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
 SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
 
 # -- actions --
 $SCP ${PACKAGE} ${TARGET_DEVICE}:${TARGET_DEVICE_HOME}
-$ADB gdebi --n ${TARGET_DEVICE_HOME}/${PLAIN_PACKAGE}
+adb_shell gdebi --n ${TARGET_DEVICE_HOME}/${PLAIN_PACKAGE}
 $SCRIPTPATH/qtc_device_restart_appslense ${SERIALNUMBER}

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_developertools'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_developertools	2013-06-14 07:35:47 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_developertools	2013-06-25 19:33:25 +0000
@@ -14,19 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-
-SERIALNUMBER=$1
-
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
-
-adb -s ${SERIALNUMBER} root
-adb -s ${SERIALNUMBER} wait-for-device
-adb -s ${SERIALNUMBER} forward tcp:2222 tcp:22
-adb -s ${SERIALNUMBER} forward tcp:3768 tcp:3768
-$ADB apt-get -y -f install
-## Fix bug #1178242
-#$ADB apt-get install software-properties-common -y
-#$ADB apt-add-repository ppa:canonical-qt5-edgers/qt5-proper -y
-$ADB apt-get update
-$ADB apt-get install gdebi-core fakeroot dh-make build-essential qt5-default qtbase5-dev libqt5v8-5-dev qtdeclarative5-dev libqt5xmlpatterns5-dev qtscript5-dev qttools5-dev qt3d5-dev qtmultimedia5-dev libqt5svg5-dev libqt5graphicaleffects5 qtdeclarative5-dev-tools qttools5-dev-tools qtlocation5-dev qtsensors5-dev qtpim5-dev qt-components-ubuntu ubuntu-dev-tools debhelper openssh-server -y
+
+. `dirname $0`/functions.inc
+
+adb_shell apt-get -y -f install
+adb_shell apt-get update
+adb_shell apt-get install gdebi-core fakeroot dh-make build-essential qt5-default qtbase5-dev libqt5v8-5-dev qtdeclarative5-dev libqt5xmlpatterns5-dev qtscript5-dev qttools5-dev qt3d5-dev qtmultimedia5-dev libqt5svg5-dev libqt5graphicaleffects5 qtdeclarative5-dev-tools qttools5-dev-tools qtlocation5-dev qtsensors5-dev qtpim5-dev qt-components-ubuntu ubuntu-dev-tools debhelper openssh-server -y

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense	2013-05-01 18:19:31 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_restart_appslense	2013-06-25 19:33:25 +0000
@@ -14,11 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
 
-SERIALNUMBER=$1
-ADB="adb -s ${SERIALNUMBER} shell chroot /data/ubuntu /usr/bin/env -i PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin"
+. `dirname $0`/functions.inc
 
 # -- actions --
-$ADB kill -s 9 \`pidof unity-applications-daemon\`
-$ADB bash -c "/usr/lib/arm-linux-gnueabihf/unity-lens-applications/unity-applications-daemon > /dev/null &"
+#adb_shell kill -s 9 \`pidof unity-applications-daemon\`
+#adb_shell bash -c "/usr/lib/arm-linux-gnueabihf/unity-lens-applications/unity-applications-daemon > /dev/null &"

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_run_app'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-05-02 21:46:53 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_device_run_app	2013-06-25 19:33:25 +0000
@@ -14,11 +14,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Author: Juhapekka Piiroinen <[e-mail]>
-set -e;
-#set -x
-
-SERIALNUMBER=$1
-SSHIDENTITY=~/.ssh/ubuntudevice_${SERIALNUMBER}_id_rsa
+
+. `dirname $0`/functions.inc
+
 FOLDERNAME=$2
 DESKTOP_FILENAME=$3
 MAIN_QML=$4
@@ -56,11 +54,9 @@
 
 SCP="scp -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -P${TARGET_DEVICE_PORT}"
 SSH="ssh -i ${SSHIDENTITY} -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p${TARGET_DEVICE_PORT} ${TARGET_DEVICE}"
-SCRIPTPATH=`dirname $0`
+
 COMMAND="qmlscene ${TARGET_DEVICE_HOME}/${FOLDERNAME}/${MAIN_QML} --desktop_file_hint=${TARGET_DEVICE_DESKTOP_PATH}/${DESKTOP_FILENAME}"
 
-${SCRIPTPATH}/device_portforward ${SERIALNUMBER} ${TARGET_DEVICE_PORT} 3768
-
 # make a tar package
 tar -cjf ${FOLDERNAME}.tar.bz2 ${FOLDERNAME}
 

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery	2013-06-06 15:59:11 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_launch_gallery	2013-06-25 19:33:25 +0000
@@ -1,2 +1,18 @@
 #!/bin/bash
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 2.1.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Juhapekka Piiroinen <[e-mail]>
+
 /usr/bin/qmlscene $@ /usr/lib/ubuntu-ui-toolkit/examples/ubuntu-ui-toolkit-gallery/ubuntu-ui-toolkit-gallery.qml &

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings	2013-06-03 19:25:13 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/scripts/qtc_read_bazaar_settings	2013-06-25 19:33:25 +0000
@@ -1,4 +1,19 @@
 #!/bin/bash
+# Copyright 2013 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; version 2.1.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Author: Juhapekka Piiroinen <[e-mail]>
 
 DEBEMAIL=`grep -G "^DEBEMAIL" ~/.bashrc`
 DEBFULLNAME=`grep -G "^DEBFULLNAME" ~/.bashrc`

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudeviceswidget.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-06-24 12:58:28 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudeviceswidget.cpp	2013-06-25 19:33:25 +0000
@@ -291,7 +291,7 @@
 void UbuntuDevicesWidget::on_pushButtonSshSetupPublicKey_clicked() {
     beginAction(QString::fromLatin1("Setting up public key authentication.."));
     m_ubuntuProcess.stop();
-    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_publickey %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(ui->lineEditUserName->text()).arg(m_deviceSerialNumber) << QApplication::applicationDirPath());
+    m_ubuntuProcess.append(QStringList() << QString::fromLatin1("%0/openssh_publickey %1 %2").arg(Ubuntu::Constants::UBUNTU_SCRIPTPATH).arg(serialNumber()).arg(ui->lineEditUserName->text()) << QApplication::applicationDirPath());
     m_ubuntuProcess.start(QString::fromLatin1("Setting up public key authentication.."));
 }