diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-04-05 07:01:49 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-04-05 07:01:49 +0000 |
| commit | a2970719c26c946fd6fea7d902aad6706a4ca6ea (patch) | |
| tree | 53072d5736c493e5bf3e2ac6ba1406d4561e1f82 /src/corelib/kernel | |
| parent | f68c62cdfc4d66def52aa73fbc2ad58acc32af62 (diff) | |
| parent | 216f57ef8682f74b72ae4e39cf1fd23abddf6a51 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qmetatype.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index e6a66dbc86..ebe118dce4 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1232,7 +1232,7 @@ public: inline void destroyIter() { _destroyIter(&_iterator); } - inline VariantData getCurrentKey() const { return _getKey(&_iterator, _metaType_id_key, _metaType_flags_value); } + inline VariantData getCurrentKey() const { return _getKey(&_iterator, _metaType_id_key, _metaType_flags_key); } inline VariantData getCurrentValue() const { return _getValue(&_iterator, _metaType_id_value, _metaType_flags_value); } inline void find(const VariantData &key) |