diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-26 12:39:10 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-31 14:28:11 +0000 |
| commit | 39baa4c1fdd7968ed5a9b5671d8f9dab845df9bd (patch) | |
| tree | cda863eac175a57dbbf36b870052f0427395d9db | |
| parent | 496a46a2b5ec264674395bda52ecf892095fa5b2 (diff) | |
| download | qttools-39baa4c1fdd7968ed5a9b5671d8f9dab845df9bd.tar.gz | |
Polish the uitools/textfinder example
Task-number: QTBUG-110447
Change-Id: I5d4ae6056b974618c59ef068c92204a24a9c9503
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 8e047fe8cde91454623847ddc1c2abd164d63891)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | examples/uitools/textfinder/forms/textfinder.ui | 6 | ||||
| -rw-r--r-- | examples/uitools/textfinder/main.cpp | 1 | ||||
| -rw-r--r-- | examples/uitools/textfinder/textfinder.cpp | 18 |
3 files changed, 17 insertions, 8 deletions
diff --git a/examples/uitools/textfinder/forms/textfinder.ui b/examples/uitools/textfinder/forms/textfinder.ui index 9ea3011e8..f8cec91d1 100644 --- a/examples/uitools/textfinder/forms/textfinder.ui +++ b/examples/uitools/textfinder/forms/textfinder.ui @@ -47,7 +47,11 @@ <number>6</number> </property> <item row="0" column="1"> - <widget class="QLineEdit" name="lineEdit"/> + <widget class="QLineEdit" name="lineEdit"> + <property name="clearButtonEnabled"> + <bool>true</bool> + </property> + </widget> </item> <item row="0" column="0"> <widget class="QLabel" name="searchLabel"> diff --git a/examples/uitools/textfinder/main.cpp b/examples/uitools/textfinder/main.cpp index 4fdd82532..c1e2e690c 100644 --- a/examples/uitools/textfinder/main.cpp +++ b/examples/uitools/textfinder/main.cpp @@ -2,6 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "textfinder.h" + #include <QApplication> //! [0] diff --git a/examples/uitools/textfinder/textfinder.cpp b/examples/uitools/textfinder/textfinder.cpp index dd527b49f..b8a59f7dc 100644 --- a/examples/uitools/textfinder/textfinder.cpp +++ b/examples/uitools/textfinder/textfinder.cpp @@ -2,19 +2,24 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #include "textfinder.h" -#include <QFile> + +#include <QUiLoader> + #include <QLineEdit> #include <QMessageBox> #include <QPushButton> #include <QTextEdit> -#include <QTextStream> -#include <QUiLoader> #include <QVBoxLayout> +#include <QFile> +#include <QTextStream> + +using namespace Qt::StringLiterals; + //! [4] static QWidget *loadUiFile(QWidget *parent) { - QFile file(":/forms/textfinder.ui"); + QFile file(u":/forms/textfinder.ui"_s); file.open(QIODevice::ReadOnly); QUiLoader loader; @@ -25,7 +30,7 @@ static QWidget *loadUiFile(QWidget *parent) //! [5] static QString loadTextFile() { - QFile inputFile(":/forms/input.txt"); + QFile inputFile(u":/forms/input.txt"_s); inputFile.open(QIODevice::ReadOnly); QTextStream in(&inputFile); return in.readAll(); @@ -53,9 +58,8 @@ TextFinder::TextFinder(QWidget *parent) //! [3a] //! [3b] - QVBoxLayout *layout = new QVBoxLayout; + auto *layout = new QVBoxLayout(this); layout->addWidget(formWidget); - setLayout(layout); //! [3b] //! [3c] |