qtcreator-plugin-ubuntu

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

  1. fixqmlclickbuild
  2. Merge into trunk
Proposed by Benjamin Zeller
Status: Merged
Approved by: Zoltan Balogh
Approved revision: 370
Merged at revision: 374
Proposed branch: lp:~zeller-benjamin/qtcreator-plugin-ubuntu/fixqmlclickbuild
Merge into: lp:qtcreator-plugin-ubuntu
Diff against target: 72 lines (+10/-7)
3 files modified
share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Makefile (+5/-5)
share/qtcreator/ubuntu/menu.json (+2/-0)
src/ubuntu/ubuntupackagingmodel.cpp (+3/-2)
To merge this branch: bzr merge lp:~zeller-benjamin/qtcreator-plugin-ubuntu/fixqmlclickbuild
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Review via email: mp+256458@code.launchpad.net

Commit message

- Rename the template.pot file to <projectname>.pot lp:1444911
- Make sure qml projects run buildsteps when creating a click package from the publish page lp:1444908
- Disable the translations menu for qml projects lp:1444913

Description of the change

- Rename the template.pot file to <projectname>.pot
- Make sure qml projects run buildsteps when creating a click package from the publish page

To post a comment you must log in.
lp:~zeller-benjamin/qtcreator-plugin-ubuntu/fixqmlclickbuild updated
371. By Benjamin Zeller

Disable the translation menu only for HTML projects

372. By Benjamin Zeller

Add bug

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/simple-app-qmlproject/Makefile'
2--- share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Makefile 2015-02-04 17:42:14 +0000
3+++ share/qtcreator/templates/wizards/ubuntu/simple-app-qmlproject/Makefile 2015-04-16 11:13:54 +0000
4@@ -10,9 +10,9 @@
5 # Notes for translations:
6 # ---------------------------------------------------------------
7 # In order to create translation files manually:
8-# 1) run make once to create and update the po/template.pot
9+# 1) run make once to create and update the po/%ProjectName:l%.pot
10 # 2) copy the template file and set the name to the language you want to
11-# translate to: cp po/template.pot po/de.po
12+# translate to: cp po/%ProjectName:l%.pot po/en.po
13 # 3) edit the po file
14 # 4) run make build-translations to build the translation files
15 #
16@@ -28,7 +28,7 @@
17 MO_FILES=$(shell for infile in `find po -name "*.po"`; do basename -s .po $$infile | awk '{print "$(TRANSLATION_ROOT)/share/locale/" $$0 "/LC_MESSAGES/$(APP_ID).mo";}' ; done)
18 QMLJS_FILES=$(shell find . -name "*.qml" -o -name "*.js" | grep -v ./tests)
19
20-all: po/template.pot
21+all: po/%ProjectName:l%.pot
22
23 autopilot:
24 chmod +x tests/autopilot/run
25@@ -41,8 +41,8 @@
26
27 build-translations: $(MO_FILES)
28
29-po/template.pot: $(QMLJS_FILES)
30- mkdir -p $(CURDIR)/po && xgettext -o po/template.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8
31+po/%ProjectName:l%.pot: $(QMLJS_FILES)
32+ mkdir -p $(CURDIR)/po && xgettext -o po/%ProjectName:l%.pot --qt --c++ --add-comments=TRANSLATORS --keyword=tr --keyword=tr:1,2 $(QMLJS_FILES) --from-code=UTF-8
33
34 $(TRANSLATION_ROOT)/share/locale/%/LC_MESSAGES/$(APP_ID).mo: po/%.po
35 mkdir -p $(TRANSLATION_ROOT)/share/locale/$*/LC_MESSAGES && msgfmt -o $(@) $(<)
36
37=== modified file 'share/qtcreator/ubuntu/menu.json'
38--- share/qtcreator/ubuntu/menu.json 2014-10-20 20:23:55 +0000
39+++ share/qtcreator/ubuntu/menu.json 2015-04-16 11:13:54 +0000
40@@ -196,6 +196,7 @@
41 "projectRequired": true,
42 "qmlProjectRequired": true,
43 "saveRequired": true,
44+ "context": ["UbuntuProject.ProjectContext"],
45 "actions": [
46 "%SCRIPTDIRECTORY%/i18n_update_template %DISPLAYNAME% %PROJECTFILES%"
47 ]
48@@ -206,6 +207,7 @@
49 "projectRequired": true,
50 "qmlProjectRequired": true,
51 "saveRequired": true,
52+ "context": ["UbuntuProject.ProjectContext"],
53 "actions": [
54 "msgfmt po/*.po"
55 ]
56
57=== modified file 'src/ubuntu/ubuntupackagingmodel.cpp'
58--- src/ubuntu/ubuntupackagingmodel.cpp 2015-02-23 10:02:32 +0000
59+++ src/ubuntu/ubuntupackagingmodel.cpp 2015-04-16 11:13:54 +0000
60@@ -541,9 +541,10 @@
61 clearPackageBuildList();
62
63 m_packageBuildSteps.append(QSharedPointer<ProjectExplorer::BuildStepList> (new ProjectExplorer::BuildStepList(bc,ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
64- if (isCMake || isQmake) {
65+ ProjectExplorer::BuildStepList *buildSteps = bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD));
66+ if (buildSteps && buildSteps->count() > 0) {
67 //add the normal buildsteps
68- m_packageBuildSteps.last()->cloneSteps(bc->stepList(Core::Id(ProjectExplorer::Constants::BUILDSTEPS_BUILD)));
69+ m_packageBuildSteps.last()->cloneSteps(buildSteps);
70 }
71
72 //append the click packaging step

Subscribers

People subscribed via source and target branches