diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp index 8085691354a..efdc727d754 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditor.cpp @@ -64,7 +64,7 @@ void AnnotationEditor::showWidget() m_modelNode.customId(), m_modelNode.annotation()); - QObject::connect(m_dialog, &AnnotationEditorDialog::accepted, + QObject::connect(m_dialog, &AnnotationEditorDialog::acceptedDialog, this, &AnnotationEditor::acceptedClicked); QObject::connect(m_dialog, &AnnotationEditorDialog::rejected, this, &AnnotationEditor::cancelClicked); diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp index 65093e1eb1a..29b1dc5a8b8 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.cpp @@ -149,7 +149,7 @@ void AnnotationEditorDialog::acceptedClicked() m_annotation = annotation; - emit AnnotationEditorDialog::accepted(); + emit AnnotationEditorDialog::acceptedDialog(); } void AnnotationEditorDialog::commentTitleChanged(const QString &text, QWidget *tab) diff --git a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h index d420d963d43..bc304c9ddd3 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h +++ b/src/plugins/qmldesigner/components/annotationeditor/annotationeditordialog.h @@ -49,6 +49,9 @@ public: void setCustomId(const QString &customId); QString customId() const; +signals: + void acceptedDialog(); //use instead of QDialog::accepted + private slots: void acceptedClicked(); void tabChanged(int index); diff --git a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditor.cpp b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditor.cpp index 201b30142fd..f17833b0c7e 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditor.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditor.cpp @@ -53,7 +53,7 @@ void GlobalAnnotationEditor::showWidget() modelNode().globalAnnotation(), modelNode().globalStatus()); - QObject::connect(m_dialog, &GlobalAnnotationEditorDialog::accepted, + QObject::connect(m_dialog, &GlobalAnnotationEditorDialog::acceptedDialog, this, &GlobalAnnotationEditor::acceptedClicked); QObject::connect(m_dialog, &GlobalAnnotationEditorDialog::rejected, this, &GlobalAnnotationEditor::cancelClicked); diff --git a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.cpp b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.cpp index 4db4cce925b..ecfa00baab4 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.cpp +++ b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.cpp @@ -164,7 +164,7 @@ void GlobalAnnotationEditorDialog::acceptedClicked() m_globalStatus.setStatus(ui->statusComboBox->currentIndex()); } - emit GlobalAnnotationEditorDialog::accepted(); + emit GlobalAnnotationEditorDialog::acceptedDialog(); } void GlobalAnnotationEditorDialog::commentTitleChanged(const QString &text, QWidget *tab) diff --git a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h index 2858dbed6c4..5688c54ecfa 100644 --- a/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h +++ b/src/plugins/qmldesigner/components/annotationeditor/globalannotationeditordialog.h @@ -49,6 +49,9 @@ public: void setStatus(GlobalAnnotationStatus status); GlobalAnnotationStatus globalStatus() const; +signals: + void acceptedDialog(); //use instead of QDialog::accepted + private slots: void acceptedClicked(); void tabChanged(int index); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp index fe1cc7ef9e0..997c712af6d 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorannotationicon.cpp @@ -429,7 +429,7 @@ void FormEditorAnnotationIcon::createAnnotationEditor() m_modelNode.customId(), m_modelNode.annotation()); - connect(m_annotationEditor, &AnnotationEditorDialog::accepted, + connect(m_annotationEditor, &AnnotationEditorDialog::acceptedDialog, this, &FormEditorAnnotationIcon::annotationDialogAccepted); connect(m_annotationEditor, &QDialog::rejected, this, &FormEditorAnnotationIcon::annotationDialogRejected);