diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-13 19:58:26 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2015-02-13 20:41:15 +0000 |
| commit | 6b6b92b54b88a539b92154a42a026f576c972163 (patch) | |
| tree | 7735f1f14045c72b74ce22b0f6258681ff962cfc /src | |
| parent | 3abbf9227ada8f68821a5ad473bba4f52e625fb5 (diff) | |
Avoid warning with MSVC
Fix an int - size_t mismatch and a linkage problem.
Change-Id: I19a57861850b4e112c98beb42b00d0a05d3f5509
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/render/backend/renderstate.cpp | 2 | ||||
| -rw-r--r-- | src/render/io/qmeshdata_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/backend/renderstate.cpp b/src/render/backend/renderstate.cpp index 2f34f8b95..84c1e250f 100644 --- a/src/render/backend/renderstate.cpp +++ b/src/render/backend/renderstate.cpp @@ -76,7 +76,7 @@ int RenderStateSet::changeCost(RenderStateSet *previousState) StateMaskSet stateToReset = previousState->stateMask() & invOurState; std::bitset<64> bs(stateToReset); - cost += bs.count(); + cost += int(bs.count()); // now, find out how many states we're changing Q_FOREACH (RenderState* ds, m_states) { diff --git a/src/render/io/qmeshdata_p.h b/src/render/io/qmeshdata_p.h index ead8a87cc..acb0fb872 100644 --- a/src/render/io/qmeshdata_p.h +++ b/src/render/io/qmeshdata_p.h @@ -53,7 +53,7 @@ class QAbstractBuffer; typedef QSharedPointer<QAbstractAttribute> QAbstractAttributePtr; -class QT3DCORESHARED_EXPORT QMeshDataPrivate +class QMeshDataPrivate { public: QMeshDataPrivate(QMeshData *qq); |