diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-09 00:44:24 +0200 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-13 14:21:22 +0200 |
commit | b5552bab40f2e165cf7196993ffc83785f4d8264 (patch) | |
tree | 5ca863fc90caacebd7bd5ebd2464d4b18efdd0dc /src/corelib/kernel/qmetatype.h | |
parent | 9cfdd66b6452704349b5f986f31b7f1f03748cb5 (diff) | |
parent | 01ce104a3ee3c8af68f6694840931661666984ab (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Manually changed enum to LibGL in
src/plugins/platforms/xcb/qglxintegration.cpp
Change-Id: If34ee6cce3d1d51fb4bb1fdfa59c30389ea0d207
Diffstat (limited to 'src/corelib/kernel/qmetatype.h')
-rw-r--r-- | src/corelib/kernel/qmetatype.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 3c9cc9ee28..9c61a67962 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -777,6 +777,7 @@ struct VariantData const void *data; const uint flags; private: + // copy constructor allowed to be implicit to silence level 4 warning from MSVC VariantData &operator=(const VariantData &) Q_DECL_EQ_DELETE; }; |