diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-05 10:33:43 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-05 10:33:59 +0100 |
| commit | e1fd4f05b13292998dc8b2a3bf89369da5a062d9 (patch) | |
| tree | ae5bb6d6344991f9bd0c456cbd97ab01081fc7b8 /src/lib/corelib/generators | |
| parent | 2b0f23a49fb63d091c635ce449545a4ec9f5e5cc (diff) | |
| parent | 3bde712fa2c1f926720e85d20ae7fd5f9f378fef (diff) | |
Merge 1.10 into master
Change-Id: I29a74f96381a1b77c6cb1959547314786690baa4
Diffstat (limited to 'src/lib/corelib/generators')
| -rw-r--r-- | src/lib/corelib/generators/generatordata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/generators/generatordata.h b/src/lib/corelib/generators/generatordata.h index f8cb743f9..fb816e0a2 100644 --- a/src/lib/corelib/generators/generatordata.h +++ b/src/lib/corelib/generators/generatordata.h @@ -58,6 +58,8 @@ template <typename U> struct IMultiplexableContainer { template <typename T> T uniqueValue(const std::function<T(const U &data)> &func, const QString &errorMessage) const { + if (data.empty()) + return T(); auto it = data.begin(), end = data.end(); auto value = func(*it++); for (; it != end; ++it) { |