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:38:18 +0100 |
commit | d37f58e75b7d484ea8fde64dbf13e901d83a078f (patch) | |
tree | bad5b491b96b92ae52c27e38bd30466b7d55423c /tests/auto/tools | |
parent | 8c6c4df3e83776d821f357582a717dbfbeb1c3ff (diff) | |
parent | 8ce0ad805d59da7be377233874a2783303f381f8 (diff) |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'tests/auto/tools')
-rw-r--r-- | tests/auto/tools/uic/baseline/config.ui.py | 2 |
1 files changed, 1 insertions, 1 deletions
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) |