diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-03-31 17:45:37 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-31 17:45:37 +0200 |
| commit | bd822bedfea5126b12c32523a68c3a1ac7a8931d (patch) | |
| tree | 0fafd5ac037e3b62ad45e8808989ec89155618b4 /src/corelib/tools/qvector.h | |
| parent | 84c10500b1730e8d947732728d190fde612fc840 (diff) | |
| parent | 3b5c0bc0780f1749fed7c07bd8b691400a0282b7 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index d1420088a4..22031645dc 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -306,6 +306,11 @@ void QVector<T>::copyConstruct(const T *srcFrom, const T *srcTo, T *dstFrom) } } +#if defined(Q_CC_MSVC) +#pragma warning( push ) +#pragma warning( disable : 4127 ) // conditional expression is constant +#endif + template <typename T> void QVector<T>::destruct(T *from, T *to) { @@ -316,6 +321,10 @@ void QVector<T>::destruct(T *from, T *to) } } +#if defined(Q_CC_MSVC) +#pragma warning( pop ) +#endif + template <typename T> inline QVector<T>::QVector(const QVector<T> &v) { |