qtcreator-plugin-ubuntu

Merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3 into lp:qtcreator-plugin-ubuntu

  1. bugfix3
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 385
Merged at revision: 389
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 115 lines (+12/-7)
8 files modified
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt (+1/-1)
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py (+1/-1)
share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py (+1/-1)
share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml (+1/-1)
share/qtcreator/ubuntu/qml/DevicesPage/NewEmulatorDialog.qml (+1/-1)
src/ubuntu/ubuntumanifesteditorwidget.cpp (+5/-0)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/bugfix3
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Zoltan Balogh Pending
Review via email: mp+258359@code.launchpad.net

Commit message

- Fix lp:1357237 "Inconsistent QML main files"
- Fix lp:1280631 "SDK should have same restrictions on version number"
- Fix lp:1450481 "Default password not displayed in emulator creation wizard"

Description of the change

- Fix lp:1357237 "Inconsistent QML main files"
- Fix lp:1280631 "SDK should have same restrictions on version number"
- Fix lp:1450481 "Default password not displayed in emulator creation wizard"

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:385
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-ci/537/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-amd64-ci/71
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-ubuntu-vivid-armhf-ci/71

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-ubuntu-ci/537/rebuild

review: Approve (continuous-integration)

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/backend-app-cmake/CMakeLists.txt'
2--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt 2015-01-07 10:50:28 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/CMakeLists.txt 2015-05-06 10:10:02 +0000
4@@ -27,7 +27,7 @@
5 set(APP_NAME %ProjectName%)
6 set(APP_ID "%ProjectName:l%.%ClickDomain:l%")
7 set(%ProjectName:u%_DIR "share/qml/%ProjectName%")
8-set(MAIN_QML "%ProjectName%.qml")
9+set(MAIN_QML "Main.qml")
10 set(ICON "graphics/%ProjectName%.png")
11
12 # Set install paths
13
14=== renamed file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/displayName.qml' => 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/Main.qml'
15=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py'
16--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py 2014-06-30 15:20:18 +0000
17+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/app/tests/autopilot/displayName/main/test_main.py 2015-05-06 10:10:02 +0000
18@@ -13,7 +13,7 @@
19 class MainTests(UbuntuTouchAppTestCase):
20 """Generic tests for the Hello World"""
21
22- test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%ProjectName%")
23+ test_qml_file = "%s/%s/Main.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../..")
24
25 def test_0_can_select_mainView(self):
26 """Must be able to select the mainview."""
27
28=== modified file 'share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml'
29--- share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml 2015-01-28 10:32:35 +0000
30+++ share/qtcreator/templates/wizards/ubuntu/backend-app-cmake/wizard.xml 2015-05-06 10:10:02 +0000
31@@ -34,7 +34,7 @@
32 <file source="cmake/Click.cmake" target="cmake/Click.cmake" openeditor="false"/>
33 <file source="manifest.json.in" target="manifest.json.in" openeditor="true"/>
34 <file source="../share/displayName.apparmor" target="%ClickHookName%.apparmor" openeditor="false"/>
35- <file source="app/displayName.qml" target="app/%ProjectName%.qml" openeditor="true"/>
36+ <file source="app/Main.qml" target="app/Main.qml" openeditor="true"/>
37 <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/>
38 </files>
39
40
41=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt'
42--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt 2015-01-07 10:50:28 +0000
43+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/CMakeLists.txt 2015-05-06 10:10:02 +0000
44@@ -36,7 +36,7 @@
45 set(APP_NAME %ProjectName%)
46 set(APP_ID "%ProjectName:l%.%ClickDomain:l%")
47 set(%ProjectName:u%_DIR "share/qml/%ProjectName%")
48-set(MAIN_QML "%ProjectName%.qml")
49+set(MAIN_QML "Main.qml")
50 set(ICON "graphics/%ProjectName%.png")
51
52 # Set install paths
53
54=== renamed file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/displayName.qml' => 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/Main.qml'
55=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py'
56--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py 2014-10-14 08:33:49 +0000
57+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/app/tests/autopilot/displayName/main/test_main.py 2015-05-06 10:10:02 +0000
58@@ -13,7 +13,7 @@
59 class MainTests(UbuntuTouchAppTestCase):
60 """Generic tests for the Hello World"""
61
62- test_qml_file = "%s/%s.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../../%ProjectName%")
63+ test_qml_file = "%s/%s/Main.qml" % (os.path.dirname(os.path.realpath(__file__)),"../../../..")
64
65 def test_0_can_select_mainView(self):
66 """Must be able to select the mainview."""
67
68=== modified file 'share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml'
69--- share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml 2015-01-16 11:11:30 +0000
70+++ share/qtcreator/templates/wizards/ubuntu/simple-i18n-cmake/wizard.xml 2015-05-06 10:10:02 +0000
71@@ -24,7 +24,7 @@
72 <file source="app/tests/autopilot/displayName/main/__init__.py" target="app/tests/autopilot/%ProjectName%/main/__init__.py" openeditor="false"/>
73 <file source="manifest.json.in" target="manifest.json.in" openeditor="true"/>
74 <file source="../share/displayName.apparmor" target="%ClickHookName%.apparmor" openeditor="false"/>
75- <file source="app/displayName.qml" target="app/%ProjectName%.qml" openeditor="true"/>
76+ <file source="app/Main.qml" target="app/Main.qml" openeditor="true"/>
77 <file source="po/CMakeLists.txt" target="po/CMakeLists.txt" openeditor="false"/>
78 </files>
79
80
81=== modified file 'share/qtcreator/ubuntu/qml/DevicesPage/NewEmulatorDialog.qml'
82--- share/qtcreator/ubuntu/qml/DevicesPage/NewEmulatorDialog.qml 2015-01-29 14:09:50 +0000
83+++ share/qtcreator/ubuntu/qml/DevicesPage/NewEmulatorDialog.qml 2015-05-06 10:10:02 +0000
84@@ -54,7 +54,7 @@
85
86 ListItem.ItemSelector {
87 id: custom_pwd
88- model: ["Use default password",
89+ model: ["Use default password (0000)",
90 "Set custom password"]
91 }
92
93
94=== modified file 'src/ubuntu/ubuntumanifesteditorwidget.cpp'
95--- src/ubuntu/ubuntumanifesteditorwidget.cpp 2015-01-13 10:19:03 +0000
96+++ src/ubuntu/ubuntumanifesteditorwidget.cpp 2015-05-06 10:10:02 +0000
97@@ -43,6 +43,7 @@
98 #include <QJsonDocument>
99 #include <QJsonObject>
100 #include <QJsonArray>
101+#include <QRegularExpressionValidator>
102
103 namespace Ubuntu {
104 namespace Internal {
105@@ -71,6 +72,10 @@
106 m_ui = new Ui::UbuntuManifestEditor();
107 m_ui->setupUi(w);
108
109+ QRegularExpressionValidator *versionValidator = new QRegularExpressionValidator(m_ui->lineEdit_version);
110+ versionValidator->setRegularExpression(QRegularExpression(QLatin1String("^\\d*(\\.\\d*)*$")));
111+ m_ui->lineEdit_version->setValidator(versionValidator);
112+
113 connect(m_ui->comboBoxFramework,SIGNAL(currentIndexChanged(int)),this,SLOT(onFrameworkChanged()));
114 connect(m_ui->lineEdit_description,SIGNAL(textChanged(QString)),this,SLOT(setDirty()));
115 connect(m_ui->lineEdit_maintainer,SIGNAL(textChanged(QString)),this,SLOT(setDirty()));

Subscribers

People subscribed via source and target branches