qmenumodel

Merge lp:~marcustomlinson/qmenumodel/fix_define_guard into lp:qmenumodel

  1. fix_define_guard
  2. Merge into trunk
Proposed by Marcus Tomlinson
Status: Merged
Approved by: Lars Karlitski
Approved revision: 97
Merge reported by: Marcus Tomlinson
Merged at revision: not available
Proposed branch: lp:~marcustomlinson/qmenumodel/fix_define_guard
Merge into: lp:qmenumodel
Diff against target: 21 lines (+2/-1)
2 files modified
.bzrignore (+1/-0)
libqmenumodel/src/menunode.h (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/qmenumodel/fix_define_guard
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Lars Karlitski (community) Approve
Review via email: mp+195927@code.launchpad.net

This proposal supersedes a proposal from 2013-11-06.

Commit message

Fixed #define guard

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

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/39/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/1/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/qmenumodel-ci/39/rebuild

review: Approve (continuous-integration)
Revision history for this message
Lars Karlitski (larsu) wrote : Posted in a previous version of this proposal

Good catch, thanks.

review: Approve
Revision history for this message
Lars Karlitski (larsu) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~marcustomlinson/qmenumodel/fix_define_guard/+merge/195927/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:97
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/41/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/qmenumodel-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qmenumodel-ci/41/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.bzrignore'
2--- .bzrignore 2012-12-03 13:12:02 +0000
3+++ .bzrignore 2013-11-20 09:32:21 +0000
4@@ -40,3 +40,4 @@
5 debian/*.substvars
6 debian/stamp-*
7
8+*.user
9
10=== modified file 'libqmenumodel/src/menunode.h'
11--- libqmenumodel/src/menunode.h 2013-08-09 08:01:43 +0000
12+++ libqmenumodel/src/menunode.h 2013-11-20 09:32:21 +0000
13@@ -17,7 +17,7 @@
14 * Renato Araujo Oliveira Filho <renato@canonical.com>
15 */
16
17-#ifndef MENULI_H
18+#ifndef MENUNODE_H
19 #define MENUNODE_H
20
21 #include <QObject>

Subscribers

People subscribed via source and target branches