diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-11-15 01:00:11 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-11-15 16:30:51 +0100 |
| commit | 5abb976f23ef0f3cbb7b720e523c08d768c76c0e (patch) | |
| tree | 55fece450d39fdaf2fb2e213fc321fcf936a18cb /src/gui/rhi/qshader.cpp | |
| parent | 76a0f94a6d7d85f352e3d4a00c192bfc377cc776 (diff) | |
| parent | adc7bbe910a4b89a579ffa93da5a937cfc1379f4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"
Diffstat (limited to 'src/gui/rhi/qshader.cpp')
| -rw-r--r-- | src/gui/rhi/qshader.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/rhi/qshader.cpp b/src/gui/rhi/qshader.cpp index 14d780b4e4..dc6060f882 100644 --- a/src/gui/rhi/qshader.cpp +++ b/src/gui/rhi/qshader.cpp @@ -345,10 +345,10 @@ void QShader::removeShader(const QShaderKey &key) static void writeShaderKey(QDataStream *ds, const QShaderKey &k) { - *ds << k.source(); + *ds << int(k.source()); *ds << k.sourceVersion().version(); *ds << k.sourceVersion().flags(); - *ds << k.sourceVariant(); + *ds << int(k.sourceVariant()); } /*! @@ -366,7 +366,7 @@ QByteArray QShader::serialized() const return QByteArray(); ds << QShaderPrivate::QSB_VERSION; - ds << d->stage; + ds << int(d->stage); ds << d->desc.toCbor(); ds << d->shaders.count(); for (auto it = d->shaders.cbegin(), itEnd = d->shaders.cend(); it != itEnd; ++it) { |