Merge lp:~juhapekka-piiroinen/ubuntu-qtcreator-plugins/ubuntuprojectmanager into lp:ubuntu-qtcreator-plugins

[Juhapekka Piiroinen]

Introduces Ubuntu Project Manager and Ubuntu Run Control extensions.
Added new project type .ubuntuproject.
Adds missing license headers to CordovaQt plugin.
Disable cordovaqt menu item when a cordovaqt project is not opened.
Added support for ubuntuProjectRequired flag to menu.json.
Fixed issue in application wizard with "compatible platforms: Desktop", now Ubuntu Touch templates identifies as Platform Independent.

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json'
--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-06-12 07:51:25 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/projectypes.json	2013-06-18 02:43:28 +0000
@@ -1,6 +1,6 @@
 [
     {
-       "type": "qmlproject",
+       "type": "ubuntuproject",
        "folder": "simple",
        "displayName": "Simple UI",
        "id": "UbuntuAppSimple",
@@ -35,7 +35,7 @@
        ]
     },
     {
-       "type": "qmlproject",
+       "type": "ubuntuproject",
        "folder": "tabs",
        "displayName": "Tabbed UI",
        "id": "UbuntuAppTabs",
@@ -82,7 +82,7 @@
        ]
     },
     {
-       "type": "htmlproject",
+       "type": "ubuntuproject",
        "folder": "html5",
        "displayName": "HTML5 UI",
        "id": "UbuntuAppWebView",

=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json'
--- ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json	2013-06-03 19:05:20 +0000
+++ ubuntu-qtcreator-plugins/share/qtcreator/ubuntu/menu.json	2013-06-18 02:43:28 +0000
@@ -12,7 +12,7 @@
                 "projectRequired": true,
                 "keysequence": "Ctrl+F12",
                 "deviceRequired": true,
-                "qmlProjectRequired": true,
+                "ubuntuProjectRequired": true,
                 "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_device_run_app %SERIALNUMBER% %FOLDERNAME% %DISPLAYNAME%.desktop %DISPLAYNAME%.qml /home/phablet/dev_tmp /home/phablet/.local/share/applications"
@@ -24,7 +24,7 @@
                 "keysequence": "Ctrl+Shift+F12",
                 "projectRequired": true,
                 "deviceRequired": true,
-                "qmlProjectRequired": true,
+                "ubuntuProjectRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_device_close_all_apps %SERIALNUMBER% %DISPLAYNAME%"
                 ]
@@ -47,7 +47,7 @@
                 "workingDirectory": "%0",
                 "projectRequired": true,
                 "deviceRequired": true,
-                "qmlProjectRequired": true,
+                "ubuntuProjectRequired": true,
                 "saveRequired": true,
                 "actions": [
                     "%SCRIPTDIRECTORY%/qtc_project_create_package",
@@ -154,6 +154,7 @@
                         "name": "Export \".pot\" File",
                         "id": "Ubuntu.Menu.i18n.pot",
                         "projectRequired": true,
+                        "ubuntuProjectRequired": true,
                         "saveRequired": true,
                         "actions": [
                             "mkdir -p po",
@@ -164,6 +165,7 @@
                         "name": "Generate \".mo\" File",
                         "id": "Ubuntu.Menu.i18n.mo",
                         "projectRequired": true,
+                        "ubuntuProjectRequired": true,
                         "saveRequired": true,
                         "actions": [
                             "msgfmt po/*.po"

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/common.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/common.h	2013-04-10 00:20:30 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/common.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef COMMON_H_FDSFSDFAF543534534
-#define COMMON_H_FDSFSDFAF543534534
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef COMMON_H
+#define COMMON_H
 
 #include <coreplugin/actionmanager/command.h>
 #include <coreplugin/actionmanager/actioncontainer.h>

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/constants.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/constants.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/constants.h	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #ifndef CORDOVAQTPROJECTMANAGERCONSTANTS_H
 #define CORDOVAQTPROJECTMANAGERCONSTANTS_H
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.cpp	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "cproject.h"
 #include "cprojectmanager.h"
 #include "cruncontrol.h"

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cproject.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef CPROJECT_H_FFDSA35523523
-#define CPROJECT_H_FFDSA35523523
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef CPROJECT_H
+#define CPROJECT_H
 
 #include "global.h"
 #include "constants.h"

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.cpp	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "cprojectfile.h"
 
 namespace CordovaqtProjectManager {

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectfile.h	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #ifndef CPROJECTFILE_H
 #define CPROJECTFILE_H
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectmanager.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectmanager.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectmanager.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef PROJECTMANAGER_H_FEDEDFDS071421
-#define PROJECTMANAGER_H_FEDEDFDS071421
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef PROJECTMANAGER_H
+#define PROJECTMANAGER_H
 
 #include "common.h"
 #include "cproject.h"

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.cpp	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "cprojectnode.h"
 #include "cproject.h"
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cprojectnode.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef CPROJECTNODE_H_JLMBIHLKKNKLHFVYI
-#define CPROJECTNODE_H_JLMBIHLKKNKLHFVYI
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef CPROJECTNODE_H
+#define CPROJECTNODE_H
 
 #include "common.h"
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.cpp	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "crunconfiguration.h"
 #include "constants.h"
 #include "cproject.h"

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/crunconfiguration.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef CRUNCONFIGURATION_H_LHJLTGIGJEKLWBFXZM
-#define CRUNCONFIGURATION_H_LHJLTGIGJEKLWBFXZM
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef CRUNCONFIGURATION_H
+#define CRUNCONFIGURATION_H
 
 #include "common.h"
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.cpp	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "cruncontrol.h"
 #include "cproject.h"
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/cruncontrol.h	2013-06-18 02:43:28 +0000
@@ -1,5 +1,22 @@
-#ifndef CRUNCONTROL_H_FDSADASDASDHNUHTYV
-#define CRUNCONTROL_H_FDSADASDASDHNUHTYV
+/*
+ * 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/>.
+ *
+ */
+
+#ifndef CRUNCONTROL_H
+#define CRUNCONTROL_H
 
 #include "common.h"
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/global.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/global.h	2013-04-05 23:49:29 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/global.h	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #ifndef CORDOVAQTPROJECTMANAGER_GLOBAL_H
 #define CORDOVAQTPROJECTMANAGER_GLOBAL_H
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.cpp	2013-04-10 00:20:30 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.cpp	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #include "plugin.h"
 #include "constants.h"
 #include "cprojectmanager.h"
@@ -36,11 +53,12 @@
     addAutoReleasedObject(new CRunConfigurationFactory);
     addAutoReleasedObject(new CRunControlFactory);
 
-    QAction *act= new QAction(QLatin1String("Run Cordovaqt app on Ubuntu Phone"), this);
-    Core::Command *cmd = Core::ActionManager::registerAction(act, Core::Id("Cordovaqt.TOTTTT"), Core::Context(Core::Constants::C_GLOBAL));
-    connect(act, SIGNAL(triggered()), this, SLOT(menuItemTriggered()));
+    m_actionMenu = new QAction(QLatin1String("Run Cordovaqt app on Ubuntu Phone"), this);
+    Core::Command *cmd = Core::ActionManager::registerAction(m_actionMenu, Core::Id("Cordovaqt.TOTTTT"), Core::Context(Core::Constants::C_GLOBAL));
+    connect(m_actionMenu, SIGNAL(triggered()), this, SLOT(menuItemTriggered()));
+    connect(ProjectExplorer::ProjectExplorerPlugin::instance(),SIGNAL(updateRunActions()),this,SLOT(slotUpdateActions()));
 
-    Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT)->addAction(cmd/*,group*/);
+    Core::ActionManager::actionContainer(ProjectExplorer::Constants::M_BUILDPROJECT)->addAction(cmd,Core::Id(ProjectExplorer::Constants::G_BUILD_RUN));
 
     connect(&m_ubuntuProcess,SIGNAL(message(QString)),this,SLOT(onMessage(QString)));
     connect(&m_ubuntuProcess,SIGNAL(finished(QString,int)),this,SLOT(onFinished(QString,int)));
@@ -50,6 +68,17 @@
     return true;
 }
 
+void CordovaqtProjectManagerPlugin::slotUpdateActions() {
+    ProjectExplorer::ProjectExplorerPlugin* projectExplorerInstance = ProjectExplorer::ProjectExplorerPlugin::instance();
+    ProjectExplorer::Project* currentProject = projectExplorerInstance->currentProject();
+    if (currentProject == NULL || !qobject_cast<CProject *>(currentProject)) {
+        m_actionMenu->setEnabled(false);
+        return;
+    }
+
+    m_actionMenu->setEnabled(currentProject->projectManager()->mimeType() == QLatin1String(CORDOVAQTPROJECT_MIMETYPE));
+}
+
 void CordovaqtProjectManagerPlugin::onStarted(QString cmd) {
     printToOutputPane(QString::fromLatin1("Started %0").arg(cmd));
 }

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.h'
--- ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.h	2013-04-10 00:20:30 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/cordovaqtprojectmanager/plugin.h	2013-06-18 02:43:28 +0000
@@ -1,3 +1,20 @@
+/*
+ * 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/>.
+ *
+ */
+
 #ifndef CORDOVAQTPROJECTMANAGER_H
 #define CORDOVAQTPROJECTMANAGER_H
 
@@ -25,9 +42,11 @@
     void onMessage(QString);
     void onError(QString);
     void onFinished(QString cmd, int code);
+    void slotUpdateActions();
 
 private:
     Ubuntu::Internal::UbuntuProcess m_ubuntuProcess;
+    QAction* m_actionMenu;
 };
 
 }

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/UbuntuProject.mimetypes.xml'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/UbuntuProject.mimetypes.xml	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/UbuntuProject.mimetypes.xml	2013-06-18 02:43:28 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0"?>
+
+<mime-info xmlns='http://www.freedesktop.org/standards/shared-mime-info'>
+  <mime-type type="application/x-ubuntuproject">
+    <sub-class-of type="application/x-qml"/>
+    <comment>Ubuntu Project file</comment>
+    <glob pattern="*.ubuntuproject"/>
+  </mime-type>
+</mime-info>

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/resources.qrc'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/resources.qrc	2013-02-19 12:16:52 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/resources.qrc	2013-06-18 02:43:28 +0000
@@ -5,5 +5,6 @@
         <file>images/ubuntu-qtcreator.png</file>
         <file>images/ubuntu-48.png</file>
         <file>images/device.png</file>
+        <file>UbuntuProject.mimetypes.xml</file>
     </qresource>
 </RCC>

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro	2013-06-13 09:41:23 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntu.pro	2013-06-18 02:43:28 +0000
@@ -18,7 +18,15 @@
 SOURCES   += ubuntuplugin.cpp \
              ubuntuwelcomemode.cpp \
              ubuntuprojectapplicationwizard.cpp \
-             ubuntumenu.cpp
+             ubuntumenu.cpp \
+    ubuntuprojectmanager.cpp \
+    ubuntuproject.cpp \
+    ubuntuprojectfile.cpp \
+    ubuntuprojectnode.cpp \
+    ubunturunconfiguration.cpp \
+    ubunturunconfigurationfactory.cpp \
+    ubunturuncontrol.cpp \
+    ubunturuncontrolfactory.cpp
 
 HEADERS   += ubuntuplugin.h \
              ubuntu_global.h \
@@ -26,7 +34,15 @@
              ubuntuwelcomemode.h \
              ubuntuprojectapplicationwizard.h \
              ubuntumenu.h \
-             ubuntushared.h
+             ubuntushared.h \
+    ubuntuprojectmanager.h \
+    ubuntuproject.h \
+    ubuntuprojectfile.h \
+    ubuntuprojectnode.h \
+    ubunturunconfiguration.h \
+    ubunturunconfigurationfactory.h \
+    ubunturuncontrol.h \
+    ubunturuncontrolfactory.h
 
 RESOURCES += resources.qrc
 
@@ -54,3 +70,6 @@
 ###################################
 # make sure that the required scripts under share/ubuntu/scripts are executable
 system( chmod +x ../../../share/qtcreator/ubuntu/scripts/* )
+
+OTHER_FILES += \
+    UbuntuProject.mimetypes.xml

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h	2013-06-10 18:18:42 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuconstants.h	2013-06-18 02:43:28 +0000
@@ -25,9 +25,17 @@
 namespace Ubuntu {
 namespace Constants {
 
+const char UBUNTUPROJECT_MIMETYPE[] = "application/x-ubuntuproject";
+const char UBUNTUPROJECT_ID[] = "UbuntuProjectManager.UbuntuProject";
+const char UBUNTUPROJECT_PROJECTCONTEXT[] = "UbuntuProject.ProjectContext";
+const char UBUNTUPROJECT_SUFFIX[] = ".ubuntuproject";
 const char UBUNTU_PROJECT_WIZARD_CATEGORY[] = "A.UbuntuProjects";
+const char UBUNTUPROJECT_DISPLAYNAME[] = "Ubuntu Project";
+const char UBUNTUPROJECT_RUNCONTROL_ID[] = "UbuntuProjectManager.UbuntuRunConfiguration";
+
 const char UBUNTU_PROJECT_WIZARD_CATEGORY_DISPLAY[] = QT_TRANSLATE_NOOP("ProjectExplorer", "Ubuntu Touch");
 
+const char UBUNTU_UBUNTUPROJECT_TYPE[] = "ubuntuproject";
 const char UBUNTU_HTMLPROJECT_TYPE[] = "htmlproject";
 const char UBUNTU_AUTOPILOTPROJECT_TYPE[] = "autopilotproject";
 const char UBUNTU_QMLPROJECT_TYPE[] = "qmlproject";
@@ -58,6 +66,7 @@
 const char UBUNTU_MENUJSON_DEVICEREQUIRED[] = "deviceRequired";
 const char UBUNTU_MENUJSON_QMLPROJECTREQUIRED[] = "qmlProjectRequired";
 const char UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED[] = "qmakeProjectRequired";
+const char UBUNTU_MENUJSON_UBUNTUPROJECTREQUIRED[] = "ubuntuProjectRequired";
 const char UBUNTU_MENUJSON_SAVEREQUIRED[] = "saveRequired";
 const char UBUNTU_MENUJSON_MESSAGEDIALOG[] = "messageDialog";
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudevicemode.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudevicemode.h	2013-04-08 13:34:07 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntudevicemode.h	2013-06-18 02:43:28 +0000
@@ -41,8 +41,9 @@
     UbuntuDevicesWidget m_ubuntuDevicesWidget;
 };
 
-}
-}
+
+} // Internal
+} // Ubuntu
 
 
 #endif // UBUNTUDEVICEMODE_H

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.cpp	2013-05-04 21:41:03 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.cpp	2013-06-18 02:43:28 +0000
@@ -68,10 +68,12 @@
     ProjectExplorer::Project* currentProject = projectExplorerInstance->currentProject();
     bool isQmlProject = false;
     bool isQmakeProject = false;
+    bool isUbuntuProject = false;
 
     if (currentProject) {
         isQmlProject = (currentProject->projectManager()->mimeType() == QLatin1String("application/x-qmlproject"));
         isQmakeProject = (currentProject->projectManager()->mimeType() == QLatin1String("application/vnd.nokia.qt.qmakeprofile"));
+        isUbuntuProject = (currentProject->projectManager()->mimeType() == QLatin1String(Constants::UBUNTUPROJECT_MIMETYPE));
     }
 
     //bool canRun = projectExplorerInstance->canRun(currentProject,ProjectExplorer::NormalRunMode);
@@ -83,7 +85,8 @@
         bool requiresProject = act->property(Constants::UBUNTU_MENUJSON_PROJECTREQUIRED).toBool();
         bool requiresQmlProject = act->property(Constants::UBUNTU_MENUJSON_QMLPROJECTREQUIRED).toBool();
         bool requiresQmakeProject = act->property(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED).toBool();
-        bool actionEnabled = ( (requiresQmakeProject ? isQmakeProject : true) && (requiresQmlProject ? isQmlProject : true) && (requiresDevice ? deviceDetected : true) && (requiresProject ? projectOpen : true));
+        bool requiresUbuntuProject = act->property(Constants::UBUNTU_MENUJSON_UBUNTUPROJECTREQUIRED).toBool();
+        bool actionEnabled = ( (requiresQmakeProject ? isQmakeProject : true) && (requiresQmlProject ? isQmlProject : true) && (requiresDevice ? deviceDetected : true) && (requiresProject ? projectOpen : true) && (requiresUbuntuProject ? isUbuntuProject : true));
 
         act->setEnabled( actionEnabled );
     }
@@ -160,6 +163,7 @@
         bool actionDeviceRequired = false;
         bool actionQmlProjectRequired = false;
         bool actionQmakeProjectRequired = false;
+        bool actionUbuntuProjectRequired = false;
         bool actionSaveRequired = false;
 
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_NAME))) {
@@ -186,6 +190,11 @@
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED))) {
             actionQmakeProjectRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED)).toBool();
         }
+
+        if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_UBUNTUPROJECTREQUIRED))) {
+            actionUbuntuProjectRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_UBUNTUPROJECTREQUIRED)).toBool();
+        }
+
         if (obj.contains(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED))) {
             actionSaveRequired = obj.value(QLatin1String(Constants::UBUNTU_MENUJSON_SAVEREQUIRED)).toBool();
         }
@@ -217,6 +226,7 @@
         act->setProperty(Constants::UBUNTU_MENUJSON_DEVICEREQUIRED,actionDeviceRequired);
         act->setProperty(Constants::UBUNTU_MENUJSON_QMAKEPROJECTREQUIRED,actionQmakeProjectRequired);
         act->setProperty(Constants::UBUNTU_MENUJSON_QMLPROJECTREQUIRED,actionQmlProjectRequired);
+        act->setProperty(Constants::UBUNTU_MENUJSON_UBUNTUPROJECTREQUIRED,actionUbuntuProjectRequired);
         act->setProperty(Constants::UBUNTU_MENUJSON_SAVEREQUIRED,actionSaveRequired);
 
         connect(act, SIGNAL(triggered()), this, SLOT(menuItemTriggered()));

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.h	2013-04-24 16:56:03 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntumenu.h	2013-06-18 02:43:28 +0000
@@ -22,6 +22,7 @@
 #include <coreplugin/actionmanager/actionmanager.h>
 
 #include "ubuntuprocess.h"
+#include "ubuntuconstants.h"
 
 #include <QObject>
 #include <QString>
@@ -66,8 +67,9 @@
 
 };
 
-}
-}
+
+} // Internal
+} // Ubuntu
 
 
 #endif // UBUNTUMENU_H

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp	2013-06-06 15:56:05 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.cpp	2013-06-18 02:43:28 +0000
@@ -44,6 +44,13 @@
     Q_UNUSED(arguments)
     Q_UNUSED(errorString)
 
+    Core::MimeDatabase *mimeDB = Core::ICore::mimeDatabase();
+
+    const QLatin1String mimetypesXml(":/ubuntu/UbuntuProject.mimetypes.xml");
+
+    if (!mimeDB->addMimeTypes(mimetypesXml, errorString))
+        return false;
+
     QJsonDocument jsonDoc = QJsonDocument::fromJson(Internal::UbuntuProjectApplicationWizard::getProjectTypesJSON());
     if (jsonDoc.isArray()) {
         QJsonArray array = jsonDoc.array();
@@ -65,6 +72,10 @@
     addAutoReleasedObject(m_ubuntuDeviceMode);
     addAutoReleasedObject(m_ubuntuMenu);
 
+    addAutoReleasedObject(new UbuntuProjectManager);
+    addAutoReleasedObject(new UbuntuRunConfigurationFactory);
+    addAutoReleasedObject(new UbuntuRunControlFactory);
+
     return true;
 }
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.h	2013-04-08 13:34:07 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuplugin.h	2013-06-18 02:43:28 +0000
@@ -23,9 +23,14 @@
 #include "ubuntuwelcomemode.h"
 #include "ubuntudevicemode.h"
 #include "ubuntumenu.h"
+#include "ubuntuprojectmanager.h"
+#include "ubunturunconfiguration.h"
+#include "ubunturunconfigurationfactory.h"
+#include "ubunturuncontrolfactory.h"
 
 #include <extensionsystem/iplugin.h>
 #include <QProcess>
+#include <coreplugin/mimedatabase.h>
 
 namespace Ubuntu {
 namespace Internal {
@@ -48,8 +53,9 @@
     UbuntuMenu*         m_ubuntuMenu;
 };
 
-}
-} // namespace Ubuntu
+
+} // Internal
+} // Ubuntu
 
 #endif // UBUNTU_H
 

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprocess.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprocess.h	2013-04-10 00:20:30 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprocess.h	2013-06-18 02:43:28 +0000
@@ -61,7 +61,8 @@
 
 };
 
-}
-}
+
+} // Internal
+} // Ubuntu
 
 #endif // UBUNTUPROCESS_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,82 @@
+/*
+ * 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]>
+ */
+
+#include "ubuntuproject.h"
+
+using namespace Ubuntu;
+using namespace Ubuntu::Internal;
+
+UbuntuProject::UbuntuProject(UbuntuProjectManager *manager, const QString &fileName)
+    : m_manager(manager),
+      m_fileName(fileName) {
+    setProjectContext(Core::Context(Constants::UBUNTUPROJECT_PROJECTCONTEXT));
+
+    QFileInfo fileInfo(m_fileName);
+    m_projectName = fileInfo.completeBaseName();
+
+    m_file = QSharedPointer<UbuntuProjectFile>(new UbuntuProjectFile(this, fileName));
+
+    Core::DocumentManager::addDocument(m_file.data(), true);
+
+    m_rootNode = QSharedPointer<UbuntuProjectNode>(new UbuntuProjectNode(this, m_file.data()));
+    m_manager->registerProject(this);
+
+    QList<ProjectExplorer::Kit *> kits = ProjectExplorer::KitManager::instance()->kits();
+    foreach (ProjectExplorer::Kit *kit, kits) {
+        addTarget(createTarget(kit));
+    }
+
+}
+
+QString UbuntuProject::displayName() const {
+    return m_projectName;
+}
+
+Core::Id UbuntuProject::id() const {
+    return Core::Id(Constants::UBUNTUPROJECT_ID);
+}
+
+Core::IDocument *UbuntuProject::document() const {
+    return m_file.data();
+}
+
+ProjectExplorer::IProjectManager *UbuntuProject::projectManager() const {
+    return m_manager;
+}
+
+ProjectExplorer::ProjectNode *UbuntuProject::rootProjectNode() const {
+    return m_rootNode.data();
+}
+
+static void enumChild(const QDir &dir, QStringList &res) {
+    foreach (const QFileInfo &info, dir.entryInfoList(QDir::NoDotAndDotDot|QDir::Dirs|QDir::Files)) {
+        if (info.fileName().indexOf(QLatin1String(Constants::UBUNTUPROJECT_SUFFIX)) != -1)
+            continue;
+        if (info.isFile()) {
+            res.append(info.absoluteFilePath());
+        } else if (info.isDir()) {
+            enumChild(QDir(info.absoluteFilePath()), res);
+        }
+    }
+}
+
+QStringList UbuntuProject::files(FilesMode) const {
+    QStringList files;
+    enumChild(projectDir(), files);
+    return files;
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuproject.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,88 @@
+/*
+ * 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]>
+ */
+
+#ifndef UBUNTUPROJECT_H
+#define UBUNTUPROJECT_H
+
+#include "ubuntuprojectmanager.h"
+#include "ubuntuprojectfile.h"
+#include "ubuntuprojectnode.h"
+#include "ubuntuconstants.h"
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuProjectManager;
+class UbuntuProjectFile;
+class UbuntuProjectNode;
+class UbuntuProject : public ProjectExplorer::Project
+{
+    Q_OBJECT
+
+public:
+    UbuntuProject(UbuntuProjectManager *manager, const QString &fileName);
+
+    QString displayName() const;
+    Core::Id id() const;
+    Core::IDocument *document() const;
+    ProjectExplorer::IProjectManager *projectManager() const;
+
+    ProjectExplorer::ProjectNode *rootProjectNode() const;
+    QStringList files(FilesMode fileMode) const;
+
+    QDir projectDir() const {
+        return QFileInfo(document()->fileName()).dir();
+    }
+
+    QString filesFileName() const {
+        return m_fileName;
+    }
+
+private:
+    UbuntuProjectManager *m_manager;
+    QString m_projectName;
+    QSharedPointer<UbuntuProjectFile> m_file;
+
+    QString m_fileName;
+    QSharedPointer<UbuntuProjectNode> m_rootNode;
+    
+};
+}
+}
+
+#endif // UBUNTUPROJECT_H

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-06-10 18:37:52 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectapplicationwizard.cpp	2013-06-18 02:43:28 +0000
@@ -37,8 +37,7 @@
 #include <QDeclarativeEngine>
 #include <QJsonArray>
 
-namespace Ubuntu {
-namespace Internal {
+using namespace Ubuntu::Internal;
 
 UbuntuProjectApplicationWizardDialog::UbuntuProjectApplicationWizardDialog(QWidget *parent,
                                                                      const Core::WizardDialogParameters &parameters) :
@@ -90,6 +89,7 @@
     parameters.setIcon(QIcon(QLatin1String(QtSupport::Constants::QML_WIZARD_ICON)));
     parameters.setDisplayName(displayName);
     parameters.setId(id);
+    parameters.setFlags(Core::IWizard::PlatformIndependent);
     parameters.setDescription(description);
     parameters.setCategory(QLatin1String(Ubuntu::Constants::UBUNTU_PROJECT_WIZARD_CATEGORY));
     parameters.setDisplayCategory(QLatin1String(Ubuntu::Constants::UBUNTU_PROJECT_WIZARD_CATEGORY_DISPLAY));
@@ -136,10 +136,11 @@
         folder = tmp_folder.toString();
     }
 
-    if (projectType == QLatin1String(Constants::UBUNTU_QMLPROJECT_TYPE) || projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE) || projectType == QLatin1String(Constants::UBUNTU_HTMLPROJECT_TYPE)) {
+    if (projectType == QLatin1String(Constants::UBUNTU_QMLPROJECT_TYPE) || projectType == QLatin1String(Constants::UBUNTU_AUTOPILOTPROJECT_TYPE) || projectType == QLatin1String(Constants::UBUNTU_HTMLPROJECT_TYPE) || projectType == QLatin1String(Constants::UBUNTU_UBUNTUPROJECT_TYPE)) {
+
         const QString creatorFileName = Core::BaseFileWizard::buildFileName(projectPath,
                                                                             projectName,
-                                                                            QLatin1String(Constants::UBUNTU_QMLPROJECT_TYPE));
+                                                                            projectType);
 
         // load the mainFile
         QString mainFileName = Core::BaseFileWizard::buildFileName(projectPath,
@@ -334,5 +335,3 @@
     return contents;
 }
 
-} // Internal
-} // Ubuntu

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,79 @@
+/*
+ * 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]>
+ */
+
+#include "ubuntuprojectfile.h"
+
+using namespace Ubuntu::Internal;
+
+UbuntuProjectFile::UbuntuProjectFile(UbuntuProject *parent, QString fileName)
+    : Core::IDocument(parent),
+      m_project(parent),
+      m_fileName(fileName) {
+    QTC_CHECK(m_project);
+    QTC_CHECK(!fileName.isEmpty());
+}
+
+bool UbuntuProjectFile::save(QString *, const QString &, bool) {
+    return false;
+}
+
+void UbuntuProjectFile::rename(const QString &newName) {
+    // Can't happen...
+    Q_UNUSED(newName);
+    Q_ASSERT(false);
+}
+
+QString UbuntuProjectFile::fileName() const {
+    return m_fileName;
+}
+
+QString UbuntuProjectFile::defaultPath() const {
+    return QString();
+}
+
+QString UbuntuProjectFile::suggestedFileName() const {
+    return QString();
+}
+
+QString UbuntuProjectFile::mimeType() const {
+    return QLatin1String(Constants::UBUNTUPROJECT_MIMETYPE);
+}
+
+bool UbuntuProjectFile::isModified() const {
+    return false;
+}
+
+bool UbuntuProjectFile::isSaveAsAllowed() const {
+    return false;
+}
+
+Core::IDocument::ReloadBehavior UbuntuProjectFile::reloadBehavior(ChangeTrigger state, ChangeType type) const {
+    Q_UNUSED(state)
+    Q_UNUSED(type)
+    return BehaviorSilent;
+}
+
+bool UbuntuProjectFile::reload(QString *errorString, ReloadFlag flag, ChangeType) {
+    Q_UNUSED(errorString)
+    Q_UNUSED(flag)
+
+    /*if (type == TypeContents)
+        m_project->refreshProjectFile();
+*/
+    return true;
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectfile.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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]>
+ */
+
+#ifndef UBUNTUPROJECTFILE_H
+#define UBUNTUPROJECTFILE_H
+
+#include <QObject>
+#include "ubuntuconstants.h"
+#include "ubuntuproject.h"
+#include "ubuntuprojectmanager.h"
+
+#include <coreplugin/idocument.h>
+
+#include <utils/qtcassert.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+namespace Ubuntu {
+namespace Internal {
+class UbuntuProject;
+class UbuntuProjectFile : public Core::IDocument
+{
+    Q_OBJECT
+public:
+    UbuntuProjectFile(UbuntuProject *parent, QString fileName);
+    ~UbuntuProjectFile() {}
+
+    bool save(QString *errorString, const QString &fileName, bool autoSave);
+    QString fileName() const;
+    void rename(const QString &newName);
+
+    QString defaultPath() const;
+    QString suggestedFileName() const;
+    QString mimeType() const;
+
+    bool isModified() const;
+    bool isSaveAsAllowed() const;
+
+    ReloadBehavior reloadBehavior(ChangeTrigger state, ChangeType type) const;
+    bool reload(QString *errorString, ReloadFlag flag, ChangeType);
+
+private:
+    UbuntuProject *m_project;
+    QString m_fileName;
+    
+};
+}
+}
+
+#endif // UBUNTUPROJECTFILE_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,53 @@
+/*
+ * 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]>
+ */
+
+#include "ubuntuprojectmanager.h"
+
+using namespace Ubuntu::Internal;
+
+
+ProjectExplorer::Project* UbuntuProjectManager::openProject(const QString &fileName, QString *errorString) {
+    QFileInfo fileInfo(fileName);
+    ProjectExplorer::ProjectExplorerPlugin *projectExplorer = ProjectExplorer::ProjectExplorerPlugin::instance();
+
+    foreach (ProjectExplorer::Project *pi, projectExplorer->session()->projects()) {
+        if (fileName == pi->document()->fileName()) {
+            if (errorString)
+                *errorString = tr("Failed opening project '%1': Project already open") .arg(QDir::toNativeSeparators(fileName));
+            return 0;
+        }
+    }
+
+    if (fileInfo.isFile())
+        return new UbuntuProject(this, fileName);
+
+    *errorString = tr("Failed opening project '%1': Project file is not a file").arg(QDir::toNativeSeparators(fileName));
+    return 0;
+}
+
+void UbuntuProjectManager::registerProject(UbuntuProject *project) {
+    m_projects.append(project);
+}
+
+void UbuntuProjectManager::unregisterProject(UbuntuProject *project) {
+    m_projects.removeAll(project);
+}
+
+QString UbuntuProjectManager::mimeType() const {
+    return QLatin1String(Constants::UBUNTUPROJECT_MIMETYPE);
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectmanager.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,71 @@
+/*
+ * 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]>
+ */
+
+#ifndef UBUNTUPROJECTMANAGER_H
+#define UBUNTUPROJECTMANAGER_H
+
+#include <QObject>
+#include "ubuntuconstants.h"
+#include "ubuntuproject.h"
+#include <QFileInfo>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuProject;
+class UbuntuProjectManager : public ProjectExplorer::IProjectManager
+{
+    Q_OBJECT
+public:
+    UbuntuProjectManager() {}
+    virtual QString mimeType() const;
+
+    ProjectExplorer::Project* openProject(const QString &fileName, QString *errorString);
+    void registerProject(UbuntuProject *project);
+    void unregisterProject(UbuntuProject *project);
+
+private:
+    QList<UbuntuProject*> m_projects;
+    
+};
+
+
+} // Internal
+} // Ubuntu
+
+#endif // UBUNTUPROJECTMANAGER_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,173 @@
+/*
+ * 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]>
+ */
+
+#include "ubuntuprojectnode.h"
+
+using namespace Ubuntu::Internal;
+
+UbuntuProjectNode::UbuntuProjectNode(UbuntuProject *project, Core::IDocument *projectFile)
+    : ProjectExplorer::ProjectNode(QFileInfo(projectFile->fileName()).absoluteFilePath()),
+      m_project(project),
+      m_projectFile(projectFile) {
+    setDisplayName(QFileInfo(projectFile->fileName()).completeBaseName());
+    refresh();
+}
+
+Core::IDocument *UbuntuProjectNode::projectFile() const {
+    return m_projectFile;
+}
+
+QString UbuntuProjectNode::projectFilePath() const {
+    return m_projectFile->fileName();
+}
+
+void UbuntuProjectNode::refresh() {
+    using namespace ProjectExplorer;
+
+    removeFileNodes(fileNodes(), this);
+    removeFolderNodes(subFolderNodes(), this);
+
+    QStringList files = m_project->files(Project::AllFiles);
+    files.removeAll(m_project->filesFileName());
+
+    QHash<QString, QStringList> filesInDirectory;
+
+    foreach (const QString &fileName, files) {
+        QFileInfo fileInfo(fileName);
+
+        QString absoluteFilePath;
+        QString relativeDirectory;
+
+        if (fileInfo.isAbsolute()) {
+            absoluteFilePath = fileInfo.filePath();
+            relativeDirectory = m_project->projectDir().relativeFilePath(fileInfo.path());
+        } else {
+            absoluteFilePath = m_project->projectDir().absoluteFilePath(fileInfo.filePath());
+            relativeDirectory = fileInfo.path();
+            if (relativeDirectory == QLatin1String("."))
+                relativeDirectory.clear();
+        }
+
+        filesInDirectory[relativeDirectory].append(absoluteFilePath);
+    }
+
+    const QHash<QString, QStringList>::ConstIterator cend = filesInDirectory.constEnd();
+    for (QHash<QString, QStringList>::ConstIterator it = filesInDirectory.constBegin(); it != cend; ++it) {
+        FolderNode *folder = findOrCreateFolderByName(it.key());
+
+        QList<FileNode *> fileNodes;
+        foreach (const QString &file, it.value()) {
+            FileType fileType = SourceType; // ### FIXME
+            FileNode *fileNode = new FileNode(file, fileType, false);
+            fileNodes.append(fileNode);
+        }
+
+        addFileNodes(fileNodes, folder);
+    }
+
+    m_folderByName.clear();
+}
+
+ProjectExplorer::FolderNode *UbuntuProjectNode::findOrCreateFolderByName(const QStringList &components, int end) {
+    if (! end)
+        return 0;
+
+    QString baseDir = QFileInfo(path()).path();
+
+    QString folderName;
+    for (int i = 0; i < end; ++i) {
+        folderName.append(components.at(i));
+        folderName += QLatin1Char('/');
+    }
+
+    const QString component = components.at(end - 1);
+
+    if (component.isEmpty())
+        return this;
+
+    else if (FolderNode *folder = m_folderByName.value(folderName))
+        return folder;
+
+    FolderNode *folder = new FolderNode(baseDir + QLatin1Char('/') + folderName);
+    folder->setDisplayName(component);
+
+    m_folderByName.insert(folderName, folder);
+
+    FolderNode *parent = findOrCreateFolderByName(components, end - 1);
+    if (! parent)
+        parent = this;
+
+    addFolderNodes(QList<FolderNode*>() << folder, parent);
+
+    return folder;
+}
+
+ProjectExplorer::FolderNode *UbuntuProjectNode::findOrCreateFolderByName(const QString &filePath) {
+    QStringList components = filePath.split(QLatin1Char('/'));
+    return findOrCreateFolderByName(components, components.length());
+}
+
+bool UbuntuProjectNode::hasBuildTargets() const {
+    return true;
+}
+
+QList<ProjectExplorer::ProjectNode::ProjectAction> UbuntuProjectNode::supportedActions(Node *node) const {
+    Q_UNUSED(node);
+    QList<ProjectAction> actions;
+    actions.append(AddNewFile);
+    actions.append(EraseFile);
+    actions.append(Rename);
+    return actions;
+}
+
+bool UbuntuProjectNode::canAddSubProject(const QString &proFilePath) const {
+    Q_UNUSED(proFilePath)
+    return false;
+}
+
+bool UbuntuProjectNode::addSubProjects(const QStringList &proFilePaths) {
+    Q_UNUSED(proFilePaths)
+    return false;
+}
+
+bool UbuntuProjectNode::removeSubProjects(const QStringList &proFilePaths) {
+    Q_UNUSED(proFilePaths)
+    return false;
+}
+
+bool UbuntuProjectNode::addFiles(const ProjectExplorer::FileType, const QStringList &, QStringList *) {
+    //return m_project->addFiles(filePaths);
+    return false;
+}
+
+bool UbuntuProjectNode::removeFiles(const ProjectExplorer::FileType, const QStringList &, QStringList *) {
+    return false;
+}
+
+bool UbuntuProjectNode::deleteFiles(const ProjectExplorer::FileType, const QStringList &) {
+    return true;
+}
+
+bool UbuntuProjectNode::renameFile(const ProjectExplorer::FileType, const QString &, const QString &) {
+    return true;
+}
+
+QList<ProjectExplorer::RunConfiguration *> UbuntuProjectNode::runConfigurationsFor(Node *node) {
+    Q_UNUSED(node)
+    return QList<ProjectExplorer::RunConfiguration *>();
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuprojectnode.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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]>
+ */
+
+#ifndef UBUNTUPROJECTNODE_H
+#define UBUNTUPROJECTNODE_H
+
+#include <QObject>
+
+#include "ubuntuproject.h"
+#include "ubuntuprojectmanager.h"
+
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuProject;
+class UbuntuProjectNode : public ProjectExplorer::ProjectNode
+{
+    Q_OBJECT
+
+public:
+    UbuntuProjectNode(UbuntuProject *project, Core::IDocument *projectFile);
+
+    Core::IDocument *projectFile() const;
+    QString projectFilePath() const;
+
+    virtual bool hasBuildTargets() const;
+
+    virtual QList<ProjectExplorer::ProjectNode::ProjectAction> supportedActions(Node *node) const;
+
+    virtual bool canAddSubProject(const QString &proFilePath) const;
+
+    virtual bool addSubProjects(const QStringList &proFilePaths);
+    virtual bool removeSubProjects(const QStringList &proFilePaths);
+
+    virtual bool addFiles(const ProjectExplorer::FileType fileType,
+                          const QStringList &filePaths,
+                          QStringList *notAdded = 0);
+
+    virtual bool removeFiles(const ProjectExplorer::FileType fileType,
+                             const QStringList &filePaths,
+                             QStringList *notRemoved = 0);
+
+    virtual bool deleteFiles(const ProjectExplorer::FileType fileType,
+                             const QStringList &filePaths);
+
+    virtual bool renameFile(const ProjectExplorer::FileType fileType,
+                            const QString &filePath,
+                            const QString &newFilePath);
+    virtual QList<ProjectExplorer::RunConfiguration *> runConfigurationsFor(Node *node);
+
+
+    void refresh();
+
+private:
+    FolderNode *findOrCreateFolderByName(const QString &filePath);
+    FolderNode *findOrCreateFolderByName(const QStringList &components, int end);
+
+private:
+    UbuntuProject *m_project;
+    Core::IDocument *m_projectFile;
+    QHash<QString, FolderNode *> m_folderByName;
+    
+};
+}
+}
+
+#endif // UBUNTUPROJECTNODE_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,9 @@
+#include "ubunturunconfiguration.h"
+
+using namespace Ubuntu::Internal;
+
+ProjectExplorer::Abi UbuntuRunConfiguration::Qabi() const {
+    ProjectExplorer::Abi hostAbi = ProjectExplorer::Abi::hostAbi();
+    return ProjectExplorer::Abi(hostAbi.architecture(), hostAbi.os(), hostAbi.osFlavor(),
+                                ProjectExplorer::Abi::RuntimeQmlFormat, hostAbi.wordWidth());
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfiguration.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,56 @@
+#ifndef UBUNTURUNCONFIGURATION_H
+#define UBUNTURUNCONFIGURATION_H
+
+#include <QObject>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <debugger/debuggerrunner.h>
+#include <debugger/debuggerplugin.h>
+#include <debugger/debuggerconstants.h>
+#include <debugger/debuggerstartparameters.h>
+#include <debugger/debuggerruncontrolfactory.h>
+#include <extensionsystem/iplugin.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuRunConfiguration : public ProjectExplorer::RunConfiguration
+{
+    Q_OBJECT
+public:
+    UbuntuRunConfiguration(ProjectExplorer::Target *parent, Core::Id id) : ProjectExplorer::RunConfiguration(parent, id) {}
+
+    QWidget *createConfigurationWidget() {
+        return NULL;
+    }
+
+    bool isEnabled() const {
+        return true;
+    }
+
+    ProjectExplorer::Abi Qabi() const;
+};
+
+}
+}
+
+#endif // UBUNTURUNCONFIGURATION_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,72 @@
+#include "ubunturunconfigurationfactory.h"
+
+using namespace Ubuntu;
+using namespace Ubuntu::Internal;
+
+QList<Core::Id> UbuntuRunConfigurationFactory::availableCreationIds(ProjectExplorer::Target *parent) const {
+    if (!canHandle(parent))
+        return QList<Core::Id>();
+
+    QList<Core::Id> list;
+    list << Core::Id(Constants::UBUNTUPROJECT_RUNCONTROL_ID);
+
+    return list;
+}
+
+QString UbuntuRunConfigurationFactory::displayNameForId(const Core::Id id) const {
+    if (id == Constants::UBUNTUPROJECT_RUNCONTROL_ID)
+        return tr(Constants::UBUNTUPROJECT_DISPLAYNAME);
+    return QString();
+}
+
+bool UbuntuRunConfigurationFactory::canCreate(ProjectExplorer::Target *parent,
+                                         const Core::Id id) const {
+    if (!canHandle(parent))
+        return false;
+
+    if (id == Constants::UBUNTUPROJECT_RUNCONTROL_ID)
+        return true;
+
+    return false;
+}
+
+ProjectExplorer::RunConfiguration *UbuntuRunConfigurationFactory::create(ProjectExplorer::Target *parent, const Core::Id id) {
+    if (!canCreate(parent, id))
+        return NULL;
+    return new UbuntuRunConfiguration(parent, id);
+}
+
+bool UbuntuRunConfigurationFactory::canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const {
+    return parent && canCreate(parent, ProjectExplorer::idFromMap(map));
+}
+
+ProjectExplorer::RunConfiguration *UbuntuRunConfigurationFactory::restore(ProjectExplorer::Target *parent, const QVariantMap &map) {
+    if (!canRestore(parent, map))
+        return NULL;
+
+    /*    Core::Id id = ProjectExplorer::idFromMap(map);
+    QmlProjectRunConfiguration *rc = new QmlProjectRunConfiguration(parent, id);
+    if (rc->fromMap(map))
+        return rc;
+    delete rc;*/
+    return NULL;
+}
+
+bool UbuntuRunConfigurationFactory::canClone(ProjectExplorer::Target *, ProjectExplorer::RunConfiguration *) const {
+    return NULL;
+    //    return canCreate(parent, source->id());
+}
+
+ProjectExplorer::RunConfiguration *UbuntuRunConfigurationFactory::clone(ProjectExplorer::Target *parent,
+                                                                   ProjectExplorer::RunConfiguration *source) {
+    if (!canClone(parent, source))
+        return NULL;
+    //  return new ProjectExplorer::RunConfiguration(parent, qobject_cast<ProjectRunConfiguration *>(source));
+    return NULL;
+}
+
+bool UbuntuRunConfigurationFactory::canHandle(ProjectExplorer::Target *parent) const {
+    if (!qobject_cast<UbuntuProject *>(parent->project()))
+        return false;
+    return true;
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturunconfigurationfactory.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,59 @@
+#ifndef UBUNTURUNCONFIGURATIONFACTORY_H
+#define UBUNTURUNCONFIGURATIONFACTORY_H
+
+#include <QtGlobal>
+#include <QObject>
+#include "ubuntuproject.h"
+#include "ubuntuconstants.h"
+#include "ubunturunconfiguration.h"
+
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuRunConfigurationFactory : public ProjectExplorer::IRunConfigurationFactory
+{
+    Q_OBJECT
+public:
+    explicit UbuntuRunConfigurationFactory() {
+        setObjectName(QLatin1String("UbuntuRunConfigurationFactory"));
+    }
+
+    QList<Core::Id> availableCreationIds(ProjectExplorer::Target *parent) const;
+    QString displayNameForId(const Core::Id id) const;
+
+    bool canCreate(ProjectExplorer::Target *parent, const Core::Id id) const;
+    ProjectExplorer::RunConfiguration *create(ProjectExplorer::Target *parent, const Core::Id id);
+    bool canRestore(ProjectExplorer::Target *parent, const QVariantMap &map) const;
+    ProjectExplorer::RunConfiguration *restore(ProjectExplorer::Target *parent, const QVariantMap &map);
+    bool canClone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source) const;
+    ProjectExplorer::RunConfiguration *clone(ProjectExplorer::Target *parent, ProjectExplorer::RunConfiguration *source);
+
+private:
+    bool canHandle(ProjectExplorer::Target *parent) const;
+    
+};
+
+}
+}
+#endif // UBUNTURUNCONFIGURATIONFACTORY_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,82 @@
+#include "ubunturuncontrol.h"
+
+using namespace Ubuntu;
+using namespace Ubuntu::Internal;
+
+
+UbuntuRunControl::UbuntuRunControl(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode, bool debug)
+    : RunControl(runConfiguration, mode)
+{
+    Utils::Environment env = Utils::Environment::systemEnvironment();
+    /*if (debug) {
+        env.appendOrSet(QLatin1String("QTWEBKIT_INSPECTOR_SERVER"),QLatin1String("9222"));
+    }*/
+    m_applicationLauncher.setEnvironment(env);
+    UbuntuProject* ubuntuProject = qobject_cast<UbuntuProject*>(runConfiguration->target()->project());
+
+    m_applicationLauncher.setWorkingDirectory(ubuntuProject->projectDir().absolutePath());
+
+    m_executable = QtSupport::QtKitInformation::qtVersion(runConfiguration->target()->kit())->qmlsceneCommand();
+    m_commandLineArguments = QString(QLatin1String("%0.qml")).arg(ubuntuProject->displayName());
+
+    connect(&m_applicationLauncher, SIGNAL(appendMessage(QString,Utils::OutputFormat)),
+            this, SLOT(slotAppendMessage(QString,Utils::OutputFormat)));
+    connect(&m_applicationLauncher, SIGNAL(processExited(int)),
+            this, SLOT(processExited(int)));
+    connect(&m_applicationLauncher, SIGNAL(bringToForegroundRequested(qint64)),
+            this, SLOT(slotBringApplicationToForeground(qint64)));
+    /*if (debug) {
+        const char *command = CHROMIUM_COMMAND;
+        if (QFile(QLatin1String(GOOGLE_CHROME_PATH)).exists())
+            command = GOOGLE_CHROME_PATH;
+        m_browser = QSharedPointer<QProcess>(new QProcess());
+        m_browser->start(QLatin1String(command), QStringList() << QLatin1String("http://localhost:9222/"));
+    }*/
+}
+
+UbuntuRunControl::~UbuntuRunControl() {
+    stop();
+}
+
+void UbuntuRunControl::start() {
+    qDebug() << __PRETTY_FUNCTION__;
+    m_applicationLauncher.start(ProjectExplorer::ApplicationLauncher::Gui, m_executable,
+                                m_commandLineArguments);
+    setApplicationProcessHandle(ProjectExplorer::ProcessHandle(m_applicationLauncher.applicationPID()));
+    emit started();
+    QString msg = tr("Starting %1 %2\n")
+            .arg(QDir::toNativeSeparators(m_executable), m_commandLineArguments);
+    appendMessage(msg, Utils::NormalMessageFormat);
+}
+
+ProjectExplorer::RunControl::StopResult UbuntuRunControl::stop() {
+    m_applicationLauncher.stop();
+    return StoppedSynchronously;
+}
+
+bool UbuntuRunControl::isRunning() const {
+    return m_applicationLauncher.isRunning();
+}
+
+QIcon UbuntuRunControl::icon() const {
+    return QIcon(QLatin1String(ProjectExplorer::Constants::ICON_RUN_SMALL));
+}
+
+void UbuntuRunControl::slotBringApplicationToForeground(qint64 pid) {
+    bringApplicationToForeground(pid);
+}
+
+void UbuntuRunControl::slotAppendMessage(const QString &line, Utils::OutputFormat format) {
+    appendMessage(line, format);
+}
+
+void UbuntuRunControl::processExited(int exitCode) {
+    QString msg = tr("%1 exited with code %2\n")
+            .arg(QDir::toNativeSeparators(m_executable)).arg(exitCode);
+    appendMessage(msg, exitCode ? Utils::ErrorMessageFormat : Utils::NormalMessageFormat);
+    emit finished();
+}
+
+
+
+

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrol.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,70 @@
+#ifndef UBUNTURUNCONTROL_H
+#define UBUNTURUNCONTROL_H
+
+#include <QProcess>
+#include <QObject>
+#include <QString>
+
+#include "ubuntuproject.h"
+
+#include <utils/environment.h>
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+#include <projectexplorer/target.h>
+#include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
+#include <qtsupport/qtkitinformation.h>
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuRunControl : public ProjectExplorer::RunControl
+{
+    Q_OBJECT
+public:
+
+    UbuntuRunControl(ProjectExplorer::RunConfiguration *runConfiguration,
+                ProjectExplorer::RunMode mode, bool debug = false);
+    virtual ~UbuntuRunControl();
+
+    void start();
+    StopResult stop();
+    bool isRunning() const;
+    QIcon icon() const;
+
+private slots:
+    void processExited(int exitCode);
+    void slotBringApplicationToForeground(qint64 pid);
+    void slotAppendMessage(const QString &line, Utils::OutputFormat);
+
+private:
+    ProjectExplorer::ApplicationLauncher m_applicationLauncher;
+
+    QString m_executable;
+    QString m_commandLineArguments;
+    QSharedPointer<QProcess> m_browser;
+    
+};
+
+
+}
+}
+
+#endif // UBUNTURUNCONTROL_H

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.cpp'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.cpp	2013-06-18 02:43:28 +0000
@@ -0,0 +1,35 @@
+#include "ubunturuncontrolfactory.h"
+
+using namespace Ubuntu::Internal;
+
+bool UbuntuRunControlFactory::canRun(ProjectExplorer::RunConfiguration *runConfiguration,
+                                ProjectExplorer::RunMode mode) const {
+    if (!qobject_cast<UbuntuProject*>(runConfiguration->target()->project()))
+        return false;
+    if (mode == ProjectExplorer::NormalRunMode || mode == ProjectExplorer::DebugRunMode)
+        return true;
+    return false;
+}
+
+ProjectExplorer::RunControl *UbuntuRunControlFactory::create(ProjectExplorer::RunConfiguration *runConfiguration,
+                                                        ProjectExplorer::RunMode mode, QString *) {
+    QList<ProjectExplorer::RunControl *> runcontrols =
+            ProjectExplorer::ProjectExplorerPlugin::instance()->runControls();
+    foreach (ProjectExplorer::RunControl *rc, runcontrols) {
+        if (UbuntuRunControl *qrc = qobject_cast<UbuntuRunControl *>(rc)) {
+            //TODO: if (qrc->mainQmlFile() == config->mainScript())
+            qrc->stop();
+        }
+    }
+
+    ProjectExplorer::RunControl *runControl = 0;
+    if (mode == ProjectExplorer::NormalRunMode)
+        runControl = new UbuntuRunControl(runConfiguration, mode, false);
+    else if (mode == ProjectExplorer::DebugRunMode)
+        runControl = new UbuntuRunControl(runConfiguration, mode, true);
+    return runControl;
+}
+
+QString UbuntuRunControlFactory::displayName() const {
+    return tr("Run on Ubuntu Touch Device");
+}

=== added file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.h	1970-01-01 00:00:00 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubunturuncontrolfactory.h	2013-06-18 02:43:28 +0000
@@ -0,0 +1,48 @@
+#ifndef UBUNTURUNCONTROLFACTORY_H
+#define UBUNTURUNCONTROLFACTORY_H
+
+#include <QObject>
+#include "ubunturuncontrol.h"
+#include "ubuntuproject.h"
+
+#include <coreplugin/actionmanager/command.h>
+#include <coreplugin/actionmanager/actioncontainer.h>
+#include <coreplugin/actionmanager/actionmanager.h>
+#include <coreplugin/coreconstants.h>
+#include <coreplugin/icontext.h>
+#include <coreplugin/mimedatabase.h>
+#include <coreplugin/messagemanager.h>
+#include <coreplugin/icore.h>
+#include <coreplugin/idocument.h>
+#include <coreplugin/documentmanager.h>
+#include <projectexplorer/iprojectmanager.h>
+#include <projectexplorer/projectexplorerconstants.h>
+#include <projectexplorer/projectexplorer.h>
+#include <projectexplorer/projectnodes.h>
+#include <projectexplorer/project.h>
+#include <projectexplorer/kitmanager.h>
+#include <projectexplorer/target.h>
+#include <projectexplorer/session.h>
+#include <projectexplorer/runconfiguration.h>
+#include <projectexplorer/applicationlauncher.h>
+
+namespace Ubuntu {
+namespace Internal {
+
+class UbuntuRunControlFactory : public ProjectExplorer::IRunControlFactory
+{
+    Q_OBJECT
+public:
+    explicit UbuntuRunControlFactory() = default;
+    virtual ~UbuntuRunControlFactory() {}
+
+    bool canRun(ProjectExplorer::RunConfiguration *runConfiguration, ProjectExplorer::RunMode mode) const;
+    ProjectExplorer::RunControl *create(ProjectExplorer::RunConfiguration *runConfiguration,
+                                        ProjectExplorer::RunMode mode, QString *);
+    QString displayName() const;
+    
+};
+
+}
+}
+#endif // UBUNTURUNCONTROLFACTORY_H

=== modified file 'ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuwelcomemode.h'
--- ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuwelcomemode.h	2013-06-03 18:12:08 +0000
+++ ubuntu-qtcreator-plugins/src/plugins/ubuntu/ubuntuwelcomemode.h	2013-06-18 02:43:28 +0000
@@ -41,7 +41,8 @@
     QWidget* m_modeWidget;
 };
 
-}
-}
+
+} // Internal
+} // Ubuntu
 
 #endif // UBUNTUWELCOMEMODE_H