[obsolete] Ubuntu QtCreator Plugins

Merge lp:~dpm/ubuntu-qtcreator-plugins/scope-template-fixes into lp:ubuntu-qtcreator-plugins

  1. scope-template-fixes
  2. Merge into trunk
Proposed by David Planella
Status: Approved
Approved by: Zoltan Balogh
Approved revision: 227
Proposed branch: lp:~dpm/ubuntu-qtcreator-plugins/scope-template-fixes
Merge into: lp:ubuntu-qtcreator-plugins
Diff against target: 22 lines (+3/-1)
2 files modified
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h (+1/-1)
ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro (+2/-0)
To merge this branch: bzr merge lp:~dpm/ubuntu-qtcreator-plugins/scope-template-fixes
Reviewer Review Type Date Requested Status
Zoltan Balogh Pending
Juhapekka Piiroinen Pending
Review via email: mp+171546@code.launchpad.net

Commit message

Fixed non-supported Qt Creator variable name modifier, added pre-build dependencies to generate the .service file

Description of the change

This branch adds the following fixes:

- Fix non-supported Qt Creator variable name modifier, we're not using the Qt Creator variable substitution
- Added pre-build dependencies to generate the .service file

To post a comment you must log in.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h'
2--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h 2013-06-25 06:45:24 +0000
3+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName-parser.h 2013-06-26 13:29:57 +0000
4@@ -18,4 +18,4 @@
5 gchar *author;
6 } result_t;
7
8-#endif /* __%DISPLAYNAME:u%_PARSER_H__ */
9+#endif /* __%DISPLAYNAME_UPPER%_PARSER_H__ */
10
11=== modified file 'ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro'
12--- ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro 2013-06-25 10:24:00 +0000
13+++ ubuntu-qtcreator-plugins/share/qtcreator/templates/wizards/ubuntu/scope/displayName.pro 2013-06-26 13:29:57 +0000
14@@ -53,6 +53,8 @@
15 QMAKE_EXTRA_TARGETS += servicefilegen
16 QMAKE_CLEAN += $$SERVICE_FILE
17 QMAKE_CLEAN += $$DATA_DIR/*~
18+PRE_TARGETDEPS += \
19+ servicefilegen
20
21 # Rule to install the scope's binary
22 target.path = $$DAEMON_PATH

Subscribers

People subscribed via source and target branches