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

[Marc Tardif]

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

[Jeff Marcom (jeffmarcom)]

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

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-19 21:25:18 +0000
+++ debian/changelog	2012-09-19 21:50:38 +0000
@@ -66,6 +66,8 @@
   * patch/0.14.2: Fixed patch to rmtree instead of rmdir scripts directory.
   * [FEATURE] debian/checkbox.templates, debian/checkbox.config: Added support to
     preseed properties in environment_info plugin.
+  * [FEATURE] qt/frontend/qtfront.ui: Fixed warnings when building with
+    qtcreator (LP #1053126)
 
   [Sean Feole]
   * [FEATURE] scripts/battery_test: measures battery capacity before and after
 
=== modified file 'qt/frontend/qtfront.ui'
--- qt/frontend/qtfront.ui	2012-09-05 19:05:01 +0000
+++ qt/frontend/qtfront.ui	2012-09-19 21:50:38 +0000
@@ -56,7 +56,7 @@
       <attribute name="title">
        <string>Tab 1</string>
       </attribute>
-      <layout class="QHBoxLayout" name="horizontalLayout_2">
+      <layout class="QHBoxLayout" name="horizontalLayout_Welcome">
        <property name="spacing">
         <number>0</number>
        </property>
@@ -64,7 +64,7 @@
         <number>0</number>
        </property>
        <item>
-        <layout class="QVBoxLayout" name="verticalLayout_2">
+        <layout class="QVBoxLayout" name="verticalLayout_Welcome">
          <property name="spacing">
           <number>0</number>
          </property>