From 095b1a22fe354a1f533f8206304906485969e424 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
Date: Wed, 8 Jul 2015 15:19:40 +0200
Subject: [PATCH] QmlDesigner: Move QmlWarningDialog to the QmlDesigner
 namespace

Change-Id: Ic8fa31ded61992f05ceeee7f5cab85022e9b3d99
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
---
 .../qmldesigner/designercore/filemanager/qmlwarningdialog.h | 6 ++----
 .../designercore/filemanager/qmlwarningdialog.ui            | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
index fd150f0ce39..e849cb7622b 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.h
@@ -33,12 +33,10 @@
 
 #include <QDialog>
 
-QT_BEGIN_NAMESPACE
-namespace Ui { class QmlWarningDialog; }
-QT_END_NAMESPACE
-
 namespace QmlDesigner {
 
+namespace Ui { class QmlWarningDialog; }
+
 namespace Internal {
 
 class QmlWarningDialog : public QDialog
diff --git a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.ui b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.ui
index fd0736bd91a..e4b461c3603 100644
--- a/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.ui
+++ b/src/plugins/qmldesigner/designercore/filemanager/qmlwarningdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>QmlWarningDialog</class>
- <widget class="QDialog" name="QmlWarningDialog">
+ <class>QmlDesigner::QmlWarningDialog</class>
+ <widget class="QDialog" name="QmlDesigner::QmlWarningDialog">
   <property name="geometry">
    <rect>
     <x>0</x>