feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix compilation with namespaced Qt

Browse Source 
Task-number: QTCREATORBUG-24544
Change-Id: I9f16bf9a454f5b97ac6581274b0b08421b24c4da
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2020-08-28 09:56:31 +02:00
parent 25ab750e3a
commit 4886375994
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.h
View File

@@ -39,9 +39,6 @@ class QListView;
class QPlainTextEdit; class QPlainTextEdit;
QT_END_NAMESPACE QT_END_NAMESPACE
namespace Ui {
class AssetExportDialog;
}
namespace Utils { namespace Utils {
class OutputFormatter; class OutputFormatter;
@@ -52,6 +49,7 @@ class Task;
} }
namespace QmlDesigner { namespace QmlDesigner {
namespace Ui { class AssetExportDialog; }
class FilePathModel; class FilePathModel;
class AssetExportDialog : public QDialog class AssetExportDialog : public QDialog

4
src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.ui
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>AssetExportDialog</class> <class>QmlDesigner::AssetExportDialog</class>
<widget class="QDialog" name="AssetExportDialog"> <widget class="QDialog" name="QmlDesigner::AssetExportDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

2
src/plugins/qmldesigner/assetexporterplugin/assetexporterview.h
View File

@@ -83,4 +83,6 @@ private:
} }
QT_BEGIN_NAMESPACE
QDebug operator<<(QDebug os, const QmlDesigner::AssetExporterView::LoadState &s); QDebug operator<<(QDebug os, const QmlDesigner::AssetExporterView::LoadState &s);
QT_END_NAMESPACE