From 468337c56b152bac89a2164b18c0d282ced07d43 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Wed, 8 Jul 2015 12:35:58 +0200
Subject: [PATCH] QmlDesigner: Move PuppetBuildProgressDialog to the
 QmlDesigner namespace

Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d77
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../instances/puppetbuildprogressdialog.h       |  5 ++---
 .../instances/puppetbuildprogressdialog.ui      | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h
index cf848a4446a..ab2622c7fb7 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h
+++ b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.h
@@ -33,13 +33,12 @@
 
 #include <QDialog>
 
-QT_BEGIN_NAMESPACE
+namespace  QmlDesigner {
+
 namespace Ui {
 class PuppetBuildProgressDialog;
 }
-QT_END_NAMESPACE
 
-namespace  QmlDesigner {
 
 class PuppetBuildProgressDialog : public QDialog
 {
diff --git a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui
index 3121b8127ee..4df355c017f 100644
--- a/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui
+++ b/src/plugins/qmldesigner/designercore/instances/puppetbuildprogressdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>PuppetBuildProgressDialog</class>
- <widget class="QDialog" name="PuppetBuildProgressDialog">
+ <class>QmlDesigner::PuppetBuildProgressDialog</class>
+ <widget class="QDialog" name="QmlDesigner::PuppetBuildProgressDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -33,6 +33,19 @@
    </item>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QLabel" name="openErrorOutputFileLabel">
+       <property name="text">
+        <string>Open error output file</string>
+       </property>
+       <property name="openExternalLinks">
+        <bool>true</bool>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse</set>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer">
        <property name="orientation">