diff options
-rw-r--r-- | src/designer/src/uitools/quiloader.cpp | 6 | ||||
-rw-r--r-- | src/designer/src/uitools/quiloader_p.h | 9 |
2 files changed, 10 insertions, 5 deletions
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index ccfd4478b..e0ba98a1e 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -87,7 +87,10 @@ QDataStream &operator<<(QDataStream &out, const QUiTranslatableStringValue &s) QDataStream &operator>>(QDataStream &in, QUiTranslatableStringValue &s) { - in >> s.m_qualifier >> s.m_value; + QByteArray qualifier, value; + in >> qualifier >> value; + s.setQualifier(qualifier); + s.setValue(value); return in; } #endif // QT_NO_DATASTREAM @@ -650,7 +653,6 @@ QUiLoader::QUiLoader(QObject *parent) static int metaTypeId = 0; if (!metaTypeId) { metaTypeId = qRegisterMetaType<QUiTranslatableStringValue>("QUiTranslatableStringValue"); - qRegisterMetaTypeStreamOperators<QUiTranslatableStringValue>("QUiTranslatableStringValue"); } #endif // QT_NO_DATASTREAM d->builder.loader = this; diff --git a/src/designer/src/uitools/quiloader_p.h b/src/designer/src/uitools/quiloader_p.h index 632eb6eff..0febc88c2 100644 --- a/src/designer/src/uitools/quiloader_p.h +++ b/src/designer/src/uitools/quiloader_p.h @@ -69,7 +69,7 @@ QT_FORWARD_DECLARE_CLASS(QDataStream) QT_BEGIN_NAMESPACE -class QUiTranslatableStringValue +class Q_UITOOLS_EXPORT QUiTranslatableStringValue { public: QByteArray value() const { return m_value; } @@ -80,12 +80,15 @@ public: QString translate(const QByteArray &className, bool idBased) const; private: - friend QDataStream &operator>>(QDataStream &in, QUiTranslatableStringValue &s); - QByteArray m_value; QByteArray m_qualifier; // Comment or ID for id-based tr(). }; +#ifndef QT_NO_DATASTREAM +Q_UITOOLS_EXPORT QDataStream &operator<<(QDataStream &out, const QUiTranslatableStringValue &s); +Q_UITOOLS_EXPORT QDataStream &operator>>(QDataStream &in, QUiTranslatableStringValue &s); +#endif // QT_NO_DATASTREAM + struct QUiItemRolePair { int realRole; int shadowRole; |