diff options
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 17 | ||||
| -rw-r--r-- | tests/auto/tools/uic/baseline/helpdialog.ui | 3 | ||||
| -rw-r--r-- | tests/auto/tools/uic/baseline/helpdialog.ui.h | 3 |
3 files changed, 14 insertions, 9 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index dbe4860d7e..35d77f0827 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -698,11 +698,12 @@ void WriteInitialization::acceptWidget(DomWidget *node) } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QToolBox"))) { const DomProperty *plabel = attributes.value(QLatin1String("label")); DomString *plabelString = plabel ? plabel->elementString() : 0; - - m_output << m_indent << parentWidget << "->addItem(" << varName; + QString icon; if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) - m_output << ", " << iconCall(picon); - m_output << ", " << noTrCall(plabelString, pageDefaultString) << ");\n"; + icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition + + m_output << m_indent << parentWidget << "->addItem(" << varName << icon + << ", " << noTrCall(plabelString, pageDefaultString) << ");\n"; autoTrOutput(plabelString, pageDefaultString) << m_indent << parentWidget << "->setItemText(" << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(plabelString, pageDefaultString) << ");\n"; @@ -718,11 +719,11 @@ void WriteInitialization::acceptWidget(DomWidget *node) } else if (m_uic->customWidgetsInfo()->extends(parentClass, QLatin1String("QTabWidget"))) { const DomProperty *ptitle = attributes.value(QLatin1String("title")); DomString *ptitleString = ptitle ? ptitle->elementString() : 0; - - m_output << m_indent << parentWidget << "->addTab(" << varName; + QString icon; if (const DomProperty *picon = attributes.value(QLatin1String("icon"))) - m_output << ", " << iconCall(picon); - m_output << ", " << "QString());\n"; + icon = QLatin1String(", ") + iconCall(picon); // Side effect: Writes icon definition + m_output << m_indent << parentWidget << "->addTab(" << varName << icon + << ", " << "QString());\n"; autoTrOutput(ptitleString, pageDefaultString) << m_indent << parentWidget << "->setTabText(" << parentWidget << "->indexOf(" << varName << "), " << autoTrCall(ptitleString, pageDefaultString) << ");\n"; 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); |