diff options
| -rw-r--r-- | dist/changes-5.9.5 | 34 | ||||
| -rw-r--r-- | dist/changes-5.9.6 | 24 | ||||
| -rw-r--r-- | src/designer/src/components/propertyeditor/propertyeditor.cpp | 2 | ||||
| -rw-r--r-- | src/qtattributionsscanner/scanner.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error | 2 |
5 files changed, 61 insertions, 6 deletions
diff --git a/dist/changes-5.9.5 b/dist/changes-5.9.5 new file mode 100644 index 000000000..eb9f82612 --- /dev/null +++ b/dist/changes-5.9.5 @@ -0,0 +1,34 @@ +Qt 5.9.5 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.5 Changes * +**************************************************************************** + +windeployqt +----------- + + - The Qt3DAnimation dll is now deployed when the module is used. + +macdeployqt +----------- + + - [QTBUG-65844] Added support for selecting the file system type to use + when building a .dmg file. Defaults to HFS+ to support a wider range + of macOS versions. diff --git a/dist/changes-5.9.6 b/dist/changes-5.9.6 new file mode 100644 index 000000000..f0179a5ad --- /dev/null +++ b/dist/changes-5.9.6 @@ -0,0 +1,24 @@ +Qt 5.9.6 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.9.0 through 5.9.5. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.9 series is binary compatible with the 5.8.x series. +Applications compiled for 5.8 will continue to run with 5.9. + +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. + +**************************************************************************** +* Qt 5.9.6 Changes * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/designer/src/components/propertyeditor/propertyeditor.cpp b/src/designer/src/components/propertyeditor/propertyeditor.cpp index 3fd600e16..02b72f308 100644 --- a/src/designer/src/components/propertyeditor/propertyeditor.cpp +++ b/src/designer/src/components/propertyeditor/propertyeditor.cpp @@ -911,6 +911,8 @@ 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; FormWindowBase *fwb = qobject_cast<FormWindowBase *>(formWindow); const bool idIdBasedTranslation = fwb && fwb->useIdBasedTranslations(); const bool idIdBasedTranslationUnchanged = (idIdBasedTranslation == DesignerPropertyManager::useIdBasedTranslations()); diff --git a/src/qtattributionsscanner/scanner.cpp b/src/qtattributionsscanner/scanner.cpp index 86450dd9e..b07ca8f2f 100644 --- a/src/qtattributionsscanner/scanner.cpp +++ b/src/qtattributionsscanner/scanner.cpp @@ -112,10 +112,7 @@ static Package readPackage(const QJsonObject &object, const QString &filePath, L missingPropertyWarning(filePath, QStringLiteral("Name")); if (p.id.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("Id")); - if (p.qdocModule.isEmpty()) - missingPropertyWarning(filePath, QStringLiteral("QDocModule")); - if (p.qtUsage.isEmpty()) - missingPropertyWarning(filePath, QStringLiteral("QtUsage")); + if (p.license.isEmpty()) missingPropertyWarning(filePath, QStringLiteral("License")); if (p.copyright.isEmpty()) diff --git a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error index 7095bf1a2..265e653b4 100644 --- a/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error +++ b/tests/auto/qtattributionsscanner/testdata/warnings/incomplete/expected.error @@ -1,6 +1,4 @@ File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Name'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Id'. -File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QDocModule'. -File %{PWD}/qt_attribution_test.json: Missing mandatory property 'QtUsage'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'License'. File %{PWD}/qt_attribution_test.json: Missing mandatory property 'Copyright'. |