Merge remote-tracking branch 'origin/5.12.0' into 5.12

Change-Id: Ia61820d18d28e3ee24ff0568e763f94e53bee193

2 files changed, 69 insertions, 2 deletions

diff --git a/dist/changes-5.12.0 b/dist/changes-5.12.0
new file mode 100644
index 000000000..7cbcf1d62
--- /dev/null
+++ b/dist/changes-5.12.0
@@ -0,0 +1,60 @@
+Qt 5.12 introduces many new features and improvements as well as bugfixes
+over the 5.11.x series. For more details, refer to the online documentation
+included in this distribution. The documentation is also available online:
+
+https://doc.qt.io/qt-5/index.html
+
+The Qt version 5.12 series is binary compatible with the 5.11.x series.
+Applications compiled for 5.11 will continue to run with 5.12.
+
+Some of the changes listed in this file include issue tracking numbers
+corresponding to tasks in the Qt Bug Tracker:
+
+https://bugreports.qt.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                               macdeployqt                                *
+****************************************************************************
+
+ - [QTBUG-68823] Now deploys plugins when Qt is configured with
+   -no-framework
+
+****************************************************************************
+*                               winrtrunner                                *
+****************************************************************************
+
+ - Loopback exemption for UWP applications:
+   * Added ability to enable loopback exemption for clients. This basically
+     enables UWP applications to connect to a local server for debugging
+     purposes.
+   * Added ability to enable loopback exemption for servers. This basically
+     enables UWP applications to react on socket connections that are made
+     from the same machine for debugging purposes.
+
+****************************************************************************
+*                                 Qt Help                                  *
+****************************************************************************
+
+ - [QTCREATORBUG-18242] Fixed the issue with too many open files, when
+   many documentation files were registered.
+ - [QTBUG-59363] Fixed jumping to the proper documentation version
+   when activating the link that refers to another qch file.
+ - [QTBUG-21357] Items are now sorted alphabetically in Contents view.
+ - Removed qhelpconverter tool.
+ - Merged qcollectiongenerator tool into the qhelpgenerator tool.
+
+****************************************************************************
+*                                Qt Linguist                               *
+****************************************************************************
+
+ - Added "Go to" action to context menu in "Phrases and guesses" pane.
+
+lupdate
+-------
+
+ - [QTBUG-63364] Add support for C++17 nested namespaces.
+ - [QTBUG-62478] Fixed premature termination on qmake .prf execution errors.
+ - Updated qmake project handling to newer functionality in qmake.
diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp
index 1fee704d2..d393caee5 100644
--- a/src/designer/src/components/propertyeditor/propertyeditor.cpp
+++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp
@@ -913,8 +913,15 @@ void PropertyEditor::setObject(QObject *object)
     m_object = object;
     m_propertyManager->setObject(object);
     QDesignerFormWindowInterface *formWindow = QDesignerFormWindowInterface::findFormWindow(m_object);
-    if (Q_UNLIKELY(formWindow == nullptr)) // QTBUG-68507, can happen in Morph Undo macros with buddies
-        return;
+    // QTBUG-68507: Form window can be null for objects in Morph Undo macros with buddies
+    if (object != nullptr && formWindow == nullptr) {
+        formWindow = m_core->formWindowManager()->activeFormWindow();
+        if (formWindow == nullptr) {
+            qWarning("PropertyEditor::setObject(): Unable to find form window for \"%s\".",
+                     qPrintable(object->objectName()));
+            return;
+        }
+    }
     FormWindowBase *fwb = qobject_cast<FormWindowBase *>(formWindow);
     const bool idIdBasedTranslation = fwb && fwb->useIdBasedTranslations();
     const bool idIdBasedTranslationUnchanged = (idIdBasedTranslation == DesignerPropertyManager::useIdBasedTranslations());