diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-16 13:20:34 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-01-23 17:06:59 +0000 |
| commit | 07580a8d7bc92085c7585e3cbe447562bf28ab85 (patch) | |
| tree | d6bee3bae0fd7298d9d2a522c4c15b762c90662e /tests | |
| parent | e649c4143e37591d5e32ca0b6abb1487cfea4c86 (diff) | |
| download | qtbase-07580a8d7bc92085c7585e3cbe447562bf28ab85.tar.gz | |
uic: Fix broken icon code generation
Change b86d0b62156993936bf93169a895a92ad60adf7d rearranged the
sequence of function calls when generating code adding QTabWidget
and QToolBox pages, not taking into account that the iconCall()
has a side effect (writing out icon definition) Revert that part
and add a comment.
Fixes: QTBUG-72980
Task-number: PYSIDE-797
Change-Id: Ie8fbaa36f21cd4408fb1f491195da5c260708e6c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/tools/uic/baseline/helpdialog.ui | 3 | ||||
| -rw-r--r-- | tests/auto/tools/uic/baseline/helpdialog.ui.h | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/tools/uic/baseline/helpdialog.ui b/tests/auto/tools/uic/baseline/helpdialog.ui index 8c3178183c..91b81c75d5 100644 --- a/tests/auto/tools/uic/baseline/helpdialog.ui +++ b/tests/auto/tools/uic/baseline/helpdialog.ui @@ -57,6 +57,9 @@ <string>Displays help topics organized by category, index or bookmarks. Another tab inherits the full text search.</string> </property> <widget class="QWidget" name="contentPage" > + <attribute name="icon"> + <iconset theme="edit-copy"/> + </attribute> <attribute name="title" > <string>Con&tents</string> </attribute> diff --git a/tests/auto/tools/uic/baseline/helpdialog.ui.h b/tests/auto/tools/uic/baseline/helpdialog.ui.h index 1f6cf8783d..dd28041a3e 100644 --- a/tests/auto/tools/uic/baseline/helpdialog.ui.h +++ b/tests/auto/tools/uic/baseline/helpdialog.ui.h @@ -124,7 +124,8 @@ public: vboxLayout1->addWidget(listContents); - tabWidget->addTab(contentPage, QString()); + QIcon icon(QIcon::fromTheme(QString::fromUtf8("edit-copy"))); + tabWidget->addTab(contentPage, icon, QString()); indexPage = new QWidget(); indexPage->setObjectName(QString::fromUtf8("indexPage")); vboxLayout2 = new QVBoxLayout(indexPage); |