diff options
author | hjk <hjk@qt.io> | 2020-08-28 09:56:31 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2020-08-28 09:09:32 +0000 |
commit | 488637599477053ca44f9228f396981a72dfa343 (patch) | |
tree | 4ed9bb092ff496824e3ada60552438ecb201614e | |
parent | 25ab750e3ade13633e56f0313b19b7e9fd4ff59e (diff) |
QmlDesigner: Fix compilation with namespaced Qt
Task-number: QTCREATORBUG-24544
Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
3 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h index e452fff6bc..197a91b5ab 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 a4e7ec91d9..0f51525b6b 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 46c2c77071..9efbc19cec 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 |