summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-04 13:22:27 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-05 10:37:02 +0100
commit6baed766545f1ba5c747a067bb8e324f2bb9681a (patch)
tree2328c9ceb7e9b5aa147392ed86fe302fd93b6289
parent2767367795dc92c14f828e093a1d97478214b2fb (diff)
uic/Python: Set form object name correctly
Add missing "not" for the isEmpty() check. Fixes: PYSIDE-1210 Change-Id: I3798d483df9d077300ff69dc5d3a8d08812f534e Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r--src/tools/uic/cpp/cppwriteinitialization.cpp2
-rw-r--r--tests/auto/tools/uic/baseline/config.ui.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp
index 1444c681c0..1212c410ff 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;
}
}
diff --git a/tests/auto/tools/uic/baseline/config.ui.py b/tests/auto/tools/uic/baseline/config.ui.py
index 5fd558bb01..531b3ce4f0 100644
--- a/tests/auto/tools/uic/baseline/config.ui.py
+++ b/tests/auto/tools/uic/baseline/config.ui.py
@@ -48,7 +48,7 @@ from gammaview import GammaView
class Ui_Config(object):
def setupUi(self, Config):
- if Config.objectName():
+ if not Config.objectName():
Config.setObjectName(u"Config")
Config.resize(600, 650)
Config.setSizeGripEnabled(True)