forked from qt-creator/qt-creator
QmlDesigner: Move PuppetDialog ui files to the QmlDesigner namespace
Change-Id: Ic8fa31ded61992f05cceee7f5cab85022e9b3d66 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
This commit is contained in:
committed by
Thomas Hartmann
parent
749e5a00b1
commit
2dc48cb4ae
@@ -31,6 +31,8 @@
|
||||
#include "puppetdialog.h"
|
||||
#include "ui_puppetdialog.h"
|
||||
|
||||
namespace QmlDesigner {
|
||||
|
||||
PuppetDialog::PuppetDialog(QWidget *parent) :
|
||||
QDialog(parent),
|
||||
ui(new Ui::PuppetDialog)
|
||||
@@ -63,3 +65,5 @@ void PuppetDialog::warning(QWidget *parent, const QString &title, const QString
|
||||
|
||||
dialog.exec();
|
||||
}
|
||||
|
||||
} //QmlDesigner
|
||||
|
@@ -33,11 +33,12 @@
|
||||
|
||||
#include <QDialog>
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace QmlDesigner {
|
||||
|
||||
namespace Ui {
|
||||
class PuppetDialog;
|
||||
}
|
||||
QT_END_NAMESPACE
|
||||
|
||||
|
||||
class PuppetDialog : public QDialog
|
||||
{
|
||||
@@ -59,4 +60,6 @@ private:
|
||||
Ui::PuppetDialog *ui;
|
||||
};
|
||||
|
||||
} //QmlDesigner
|
||||
|
||||
#endif // PUPPETDIALOG_H
|
||||
|
@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>PuppetDialog</class>
|
||||
<widget class="QDialog" name="PuppetDialog">
|
||||
<class>QmlDesigner::PuppetDialog</class>
|
||||
<widget class="QDialog" name="QmlDesigner::PuppetDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
@@ -63,7 +63,7 @@
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>PuppetDialog</receiver>
|
||||
<receiver>QmlDesigner::PuppetDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
@@ -79,7 +79,7 @@
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>rejected()</signal>
|
||||
<receiver>PuppetDialog</receiver>
|
||||
<receiver>QmlDesigner::PuppetDialog</receiver>
|
||||
<slot>reject()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
|
Reference in New Issue
Block a user