Checkbox

Merge lp:~cr3/checkbox/1053126 into lp:checkbox

  1. 1053126
  2. Merge into trunk
Proposed by Marc Tardif
Status: Merged
Merged at revision: 1687
Proposed branch: lp:~cr3/checkbox/1053126
Merge into: lp:checkbox
Diff against target: 34 lines (+4/-2)
2 files modified
debian/changelog (+2/-0)
qt/frontend/qtfront.ui (+2/-2)
To merge this branch: bzr merge lp:~cr3/checkbox/1053126
Reviewer Review Type Date Requested Status
Jeff Marcom (community) Approve
Review via email: mp+125354@code.launchpad.net

Description of the change

Make sure to verify this change by building the project in qtcreator. Thanks!

To post a comment you must log in.
Revision history for this message
Jeff Marcom (jeffmarcom) wrote :

Approved, with the following additional change:

- <widget class="QWidget" name="layoutWidget">
+ <widget class="QWidget" name="mainTestLayoutWidget">
                    <property name="geometry">
                     <rect>
                      <x>10</x>
@@ -774,7 +774,7 @@
                     </item>
                    </layout>
                   </widget>
- <widget class="QWidget" name="layoutWidget">
+ <widget class="QWidget" name="testLayoutWidget">

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-09-19 21:25:18 +0000
3+++ debian/changelog 2012-09-19 21:50:38 +0000
4@@ -66,6 +66,8 @@
5 * patch/0.14.2: Fixed patch to rmtree instead of rmdir scripts directory.
6 * [FEATURE] debian/checkbox.templates, debian/checkbox.config: Added support to
7 preseed properties in environment_info plugin.
8+ * [FEATURE] qt/frontend/qtfront.ui: Fixed warnings when building with
9+ qtcreator (LP #1053126)
10
11 [Sean Feole]
12 * [FEATURE] scripts/battery_test: measures battery capacity before and after
13
14=== modified file 'qt/frontend/qtfront.ui'
15--- qt/frontend/qtfront.ui 2012-09-05 19:05:01 +0000
16+++ qt/frontend/qtfront.ui 2012-09-19 21:50:38 +0000
17@@ -56,7 +56,7 @@
18 <attribute name="title">
19 <string>Tab 1</string>
20 </attribute>
21- <layout class="QHBoxLayout" name="horizontalLayout_2">
22+ <layout class="QHBoxLayout" name="horizontalLayout_Welcome">
23 <property name="spacing">
24 <number>0</number>
25 </property>
26@@ -64,7 +64,7 @@
27 <number>0</number>
28 </property>
29 <item>
30- <layout class="QVBoxLayout" name="verticalLayout_2">
31+ <layout class="QVBoxLayout" name="verticalLayout_Welcome">
32 <property name="spacing">
33 <number>0</number>
34 </property>

Subscribers

People subscribed via source and target branches