diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-05 19:33:26 +0200 |
| commit | 6feec9da93032d11a768802ac2187d9d4153b1ec (patch) | |
| tree | dada90d2b99127de0be833ded5554b37169f3432 /tests/auto/widgets/util/qcompleter | |
| parent | d5e3dca8c56f60e0da5d707dbbe0c424b75c947a (diff) | |
| parent | c3605980d95f28d8ab6dc11eb349ad87ed3adaa9 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I34b5e290233d0869fbafac094a939aec2bf83fd5
Diffstat (limited to 'tests/auto/widgets/util/qcompleter')
| -rw-r--r-- | tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp index ff71a6d56b..50e11611f2 100644 --- a/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/widgets/util/qcompleter/tst_qcompleter.cpp @@ -1223,7 +1223,7 @@ void tst_QCompleter::task178797_activatedOnReturn() words << "foobar1" << "foobar2"; QLineEdit ledit; setFrameless(&ledit); - QCompleter *completer = new QCompleter(words); + QCompleter *completer = new QCompleter(words, &ledit); ledit.setCompleter(completer); QSignalSpy spy(completer, SIGNAL(activated(QString))); QCOMPARE(spy.count(), 0); @@ -1330,7 +1330,7 @@ public: task250064_TextEdit() { - completer = new QCompleter; + completer = new QCompleter(this); completer->setWidget(this); } |