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 /tests/auto/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 '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) |