diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.cpp | 3 | ||||
| -rw-r--r-- | src/tools/uic/cpp/cppwriteinitialization.h | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/tools/uic/cpp/cppwriteinitialization.cpp b/src/tools/uic/cpp/cppwriteinitialization.cpp index 4d7bf0a7f3..67195c5f8b 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.cpp +++ b/src/tools/uic/cpp/cppwriteinitialization.cpp @@ -1277,7 +1277,8 @@ void WriteInitialization::writeProperties(const QString &varName, break; case DomProperty::Cstring: if (propertyName == QLatin1String("buddy") && m_uic->customWidgetsInfo()->extends(className, QLatin1String("QLabel"))) { - m_buddies.append(Buddy(varName, p->elementCstring())); + Buddy buddy = { varName, p->elementCstring() }; + m_buddies.append(std::move(buddy)); } else { if (stdset) propertyValue = fixString(p->elementCstring(), m_dindent); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index 03e84039a6..a9691e1de4 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -251,16 +251,15 @@ private: struct Buddy { - Buddy(const QString &oN, const QString &b) - : objName(oN), buddy(b) {} QString objName; QString buddy; }; + friend class QTypeInfo<Buddy>; QStack<DomWidget*> m_widgetChain; QStack<DomLayout*> m_layoutChain; QStack<DomActionGroup*> m_actionGroupChain; - QList<Buddy> m_buddies; + QVector<Buddy> m_buddies; QSet<QString> m_buttonGroups; QHash<QString, DomWidget*> m_registeredWidgets; @@ -323,6 +322,8 @@ private: } // namespace CPP +Q_DECLARE_TYPEINFO(CPP::WriteInitialization::Buddy, Q_MOVABLE_TYPE); + QT_END_NAMESPACE #endif // CPPWRITEINITIALIZATION_H |