From 488637599477053ca44f9228f396981a72dfa343 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 28 Aug 2020 09:56:31 +0200
Subject: QmlDesigner: Fix compilation with namespaced Qt

Task-number: QTCREATORBUG-24544
Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h  | 4 +---
 src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui | 4 ++--
 src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h  | 2 ++
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h
index e452fff6bcb..197a91b5ab1 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h
@@ -39,9 +39,6 @@ class QListView;
 class QPlainTextEdit;
 QT_END_NAMESPACE
 
-namespace Ui {
-class AssetExportDialog;
-}
 
 namespace Utils {
 class OutputFormatter;
@@ -52,6 +49,7 @@ class Task;
 }
 
 namespace QmlDesigner {
+namespace Ui { class AssetExportDialog; }
 class FilePathModel;
 
 class AssetExportDialog : public QDialog
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
index a4e7ec91d9c..0f51525b6b8 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>AssetExportDialog</class>
- <widget class="QDialog" name="AssetExportDialog">
+ <class>QmlDesigner::AssetExportDialog</class>
+ <widget class="QDialog" name="QmlDesigner::AssetExportDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h
index 46c2c77071a..9efbc19cec0 100644
--- a/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h
+++ b/src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h
@@ -83,4 +83,6 @@ private:
 
 }
 
+QT_BEGIN_NAMESPACE
 QDebug operator<<(QDebug os, const QmlDesigner::AssetExporterView::LoadState &s);
+QT_END_NAMESPACE
-- 
cgit v1.2.3