diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-08-24 17:51:17 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2020-09-03 17:22:46 +0200 |
| commit | 0679197952609d4eda827d18d8f586f21decded8 (patch) | |
| tree | 28c05f6075d99984d25403f09dc0504abac771c9 /src/designer/src/uitools | |
| parent | dcc57cd20db2053f6f5bcd71c4ef0f31225874b3 (diff) | |
| download | qttools-0679197952609d4eda827d18d8f586f21decded8.tar.gz | |
Fix build against latest qtbase
Change-Id: Id099dbd755815a41e3e19d530c9669a6c73c8731
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/designer/src/uitools')
| -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; |