diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
| commit | 22e96c4d342de3bfe4fc27f4cd7233edcfe737cc (patch) | |
| tree | 6bdd02cdd8603cf16383fb339a2cfdbce82491da /src/corelib/kernel | |
| parent | bd79c4e28c307ba87aca02155b845774c7ffec1f (diff) | |
| parent | fa95eb055401f5264cbc6aca761cb9b5feb4affc (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qvariant.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index f1d38db96c..7d3f4a6e44 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -3560,6 +3560,8 @@ int QVariant::compare(const QVariant &v) const return v1.toTime() < v2.toTime() ? -1 : 1; case QVariant::DateTime: return v1.toDateTime() < v2.toDateTime() ? -1 : 1; + case QVariant::StringList: + return v1.toStringList() < v2.toStringList() ? -1 : 1; } int r = v1.toString().compare(v2.toString(), Qt::CaseInsensitive); if (r == 0) { |