diff options
author | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@qt.io> | 2020-10-21 09:31:01 +0200 |
commit | dbb62016052ad70e8e3dffb60a419504c9eb6dac (patch) | |
tree | 7926ab117c9932be15b8886ba5230048da97bc07 /src/plugins/projectexplorer/sessionmodel.cpp | |
parent | 526579b09d1be00ef2f0e371e0c57064777e6538 (diff) | |
parent | cc6f35016ab6f7a1ce82a39582141ab8a35b7bce (diff) |
Merge remote-tracking branch 'origin/4.14' into master
Change-Id: Id7ad82997873da828456a15c441620d93c6fc7e7
Diffstat (limited to 'src/plugins/projectexplorer/sessionmodel.cpp')
-rw-r--r-- | src/plugins/projectexplorer/sessionmodel.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/plugins/projectexplorer/sessionmodel.cpp b/src/plugins/projectexplorer/sessionmodel.cpp index b0d847e7df..4cfa95eea5 100644 --- a/src/plugins/projectexplorer/sessionmodel.cpp +++ b/src/plugins/projectexplorer/sessionmodel.cpp @@ -183,10 +183,18 @@ void SessionModel::sort(int column, Qt::SortOrder order) beginResetModel(); const auto cmp = [column, order](const QString &s1, const QString &s2) { bool isLess; - if (column == 0) + if (column == 0) { + if (s1 == s2) + return false; isLess = s1 < s2; - else - isLess = SessionManager::sessionDateTime(s1) < SessionManager::sessionDateTime(s2); + } + else { + const auto s1time = SessionManager::sessionDateTime(s1); + const auto s2time = SessionManager::sessionDateTime(s2); + if (s1time == s2time) + return false; + isLess = s1time < s2time; + } if (order == Qt::DescendingOrder) isLess = !isLess; return isLess; |