qtcreator-plugin-ubuntu

Merge lp:~bzoltan/qtcreator-plugin-ubuntu/revert_ubuntu-html5-launcher_deprecation into lp:qtcreator-plugin-ubuntu

  1. revert_ubuntu-html5-launcher_deprecation
  2. Merge into trunk
Proposed by Zoltan Balogh
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 319
Merged at revision: 319
Proposed branch: lp:~bzoltan/qtcreator-plugin-ubuntu/revert_ubuntu-html5-launcher_deprecation
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 56 lines (+5/-13)
3 files modified
share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop (+1/-3)
src/ubuntu/ubuntuconstants.h (+1/-2)
src/ubuntu/ubuntulocalrunconfiguration.cpp (+3/-8)
To merge this branch: bzr merge lp:~bzoltan/qtcreator-plugin-ubuntu/revert_ubuntu-html5-launcher_deprecation
Reviewer Review Type Date Requested Status
Ubuntu SDK team Pending
Review via email: mp+245170@code.launchpad.net

Commit message

Revert the deprecation of the ubuntu-html5-launcher for html5 apps because it needs to be synced with an apparmor update

Description of the change

Revert the deprecation of the ubuntu-html5-launcher for html5 apps because it needs to be synced with an apparmor update.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop'
2--- share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop 2014-12-17 17:27:38 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/html5-simple/displayName.desktop 2014-12-19 03:44:08 +0000
4@@ -1,9 +1,7 @@
5 [Desktop Entry]
6 Name=%ClickHookName%
7-Exec=webapp-container --inspector ./www/index.html
8+Exec=ubuntu-html5-app-launcher $@ --www=www --inspector
9 Icon=%ProjectName%.png
10 Terminal=false
11 Type=Application
12 X-Ubuntu-Touch=true
13-X-Ubuntu-Single-Instance=true
14-X-Ubuntu-Default-Department-ID=accessories
15
16=== modified file 'src/ubuntu/ubuntuconstants.h'
17--- src/ubuntu/ubuntuconstants.h 2014-12-17 17:27:21 +0000
18+++ src/ubuntu/ubuntuconstants.h 2014-12-19 03:44:08 +0000
19@@ -155,8 +155,7 @@
20 const char UBUNTUPROJECT_REMOTE_RUNCONTROL_SCOPE_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.Scope";
21 const char UBUNTUPROJECT_REMOTE_RUNCONTROL_APP_ID[] = "UbuntuProjectManager.RemoteRunConfiguration.App";
22
23-const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "webapp-container";
24-const char UBUNTUHTML_PROJECT_DEPRECATED_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher";
25+const char UBUNTUHTML_PROJECT_LAUNCHER_EXE[] = "ubuntu-html5-app-launcher";
26 const char UBUNTUWEBAPP_PROJECT_LAUNCHER_EXE[] = "webapp-container";
27 const char UBUNTUSCOPES_PROJECT_LAUNCHER_EXE[] = "unity-scope-tool";
28
29
30=== modified file 'src/ubuntu/ubuntulocalrunconfiguration.cpp'
31--- src/ubuntu/ubuntulocalrunconfiguration.cpp 2014-12-17 17:27:21 +0000
32+++ src/ubuntu/ubuntulocalrunconfiguration.cpp 2014-12-19 03:44:08 +0000
33@@ -345,12 +345,7 @@
34 }
35
36 m_args = QStringList()<<mainFileInfo.absoluteFilePath();
37- } else if(commInfo.completeBaseName().startsWith(
38- QLatin1String(
39- Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE))
40- || commInfo.completeBaseName().startsWith(
41- QLatin1String(
42- Ubuntu::Constants::UBUNTUHTML_PROJECT_DEPRECATED_LAUNCHER_EXE))) {
43+ } else if(commInfo.completeBaseName().startsWith(QLatin1String(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE))) {
44 if(errorMessage)
45 *errorMessage = tr("There is no local run support for html click apps using cmake yet.");
46 return false;
47@@ -430,8 +425,8 @@
48 if (ubuntuProject->mainFile().compare(QString::fromLatin1("www/index.html"), Qt::CaseInsensitive) == 0) {
49 Utils::Environment env = Utils::Environment::systemEnvironment();
50 m_executable = env.searchInPath(QString::fromLatin1(Ubuntu::Constants::UBUNTUHTML_PROJECT_LAUNCHER_EXE));
51- m_args = QStringList() << QString::fromLatin1("%0/www/index.html").arg(ubuntuProject->projectDirectory())
52- << QString::fromLatin1("--inspector");
53+ m_args = QStringList()<<QString::fromLatin1("--www=%0/www").arg(ubuntuProject->projectDirectory())
54+ <<QString::fromLatin1("--inspector");
55 } else if (ubuntuProject->mainFile().endsWith(QStringLiteral(".desktop"), Qt::CaseInsensitive)) {
56 Utils::Environment env = Utils::Environment::systemEnvironment();
57

Subscribers

People subscribed via source and target branches

to all changes: