diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-27 21:36:32 +0200 |
| commit | 1c8451bdbbd6ca909dfc5b96a24be909810522fc (patch) | |
| tree | 9cc69a4794e23f7224d75fc2323fc70e294a9454 /tests/auto/tools/uic/baseline/finddialog.ui.h | |
| parent | 7ebec0fa848de299d4cdee06ccc611ee46494fbf (diff) | |
| parent | 0635b1a69dd666f5eed4b096895bd80b1a9420ff (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts:
src/tools/qdoc/tree.cpp
tests/auto/gui/painting/qcolor/tst_qcolor.cpp
Change-Id: Iaa78f601a63191fa643aabf853520f913f2f0fdc
Diffstat (limited to 'tests/auto/tools/uic/baseline/finddialog.ui.h')
| -rw-r--r-- | tests/auto/tools/uic/baseline/finddialog.ui.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/tools/uic/baseline/finddialog.ui.h b/tests/auto/tools/uic/baseline/finddialog.ui.h index 50595edc8a..259d36569f 100644 --- a/tests/auto/tools/uic/baseline/finddialog.ui.h +++ b/tests/auto/tools/uic/baseline/finddialog.ui.h @@ -164,7 +164,6 @@ public: vboxLayout1->setObjectName(QStringLiteral("vboxLayout1")); findNxt = new QPushButton(FindDialog); findNxt->setObjectName(QStringLiteral("findNxt")); - findNxt->setDefault(true); findNxt->setFlat(false); vboxLayout1->addWidget(findNxt); @@ -194,6 +193,9 @@ public: retranslateUi(FindDialog); QObject::connect(cancel, SIGNAL(clicked()), FindDialog, SLOT(reject())); + findNxt->setDefault(true); + + QMetaObject::connectSlotsByName(FindDialog); } // setupUi |