diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-06 01:00:58 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-06 11:10:34 +0100 |
| commit | 8ce0ad805d59da7be377233874a2783303f381f8 (patch) | |
| tree | a8d35d76f0d8ad775958c8a7ae16bcd41e6ee7e2 /src/tools | |
| parent | 74a2467edd1bf0800cbaf1878984c6bccd42570d (diff) | |
| parent | d29aaf598ab565600af2619d91e05459f7bad0aa (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: I8c13b5c48a8ecce96540b39c6d5f8ca146eb2339
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 5290abf9f6..58ed210d3b 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1174,7 +1174,7 @@ void WriteInitialization::writeProperties(const QString &varName, m_output << m_indent << "if (" << varName << "->objectName().isEmpty())\n"; break; case Language::Python: - m_output << m_indent << "if " << varName << ".objectName():\n"; + m_output << m_indent << "if not " << varName << ".objectName():\n"; break; } } |