diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:37:26 -0500 |
| commit | c9d6debf9015b7853c3e061bbc64a555d85e2fcd (patch) | |
| tree | 53341bc57ae9fbad2beb5b6c08d97a68bee0ec8e /SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | |
| parent | d5caba2b1f36dc3b92fa705a06097d0597fa2ddd (diff) | |
| parent | d9aa870e5d509cc7309ab82dd102a937ab58613a (diff) | |
Merge tag 'upstream/3.1.1+dfsg1'
Upstream version 3.1.1+dfsg1
# gpg: Signature made Thu 09 Feb 2017 04:37:24 AM EST
# gpg: using RSA key 5001E1B09AA3744B
# gpg: issuer "unit193@ubuntu.com"
# gpg: Good signature from "Unit 193 <unit193@ubuntu.com>" [unknown]
# gpg: aka "Unit 193 <unit193@gmail.com>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 8DB3 E586 865D 2B4A 2B18 5A5C 5001 E1B0 9AA3 744B
Diffstat (limited to 'SQLiteStudio3/coreSQLiteStudio/common/utils.cpp')
| -rw-r--r-- | SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp index 6cf1892..e3d2e47 100644 --- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp +++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp @@ -694,6 +694,9 @@ QString getOsString() case QSysInfo::WV_WINDOWS8_1: os += " 8.1"; break; + case QSysInfo::WV_WINDOWS10: + os += " 10"; + break; case QSysInfo::WV_32s: case QSysInfo::WV_95: case QSysInfo::WV_98: @@ -707,6 +710,7 @@ QString getOsString() case QSysInfo::WV_CE_5: case QSysInfo::WV_CE_6: case QSysInfo::WV_CE_based: + case QSysInfo::WV_None: break; } #elif defined(Q_OS_LINUX) @@ -742,6 +746,12 @@ QString getOsString() case QSysInfo::MV_10_9: os += " 10.9 Mavericks"; break; + case QSysInfo::MV_10_10: + os += " 10.10 Yosemite"; + break; + case QSysInfo::MV_10_11: + os += " 10.11 El Capitan"; + break; case QSysInfo::MV_9: case QSysInfo::MV_10_0: case QSysInfo::MV_10_1: @@ -755,6 +765,13 @@ QString getOsString() case QSysInfo::MV_IOS_6_1: case QSysInfo::MV_IOS_7_0: case QSysInfo::MV_IOS_7_1: + case QSysInfo::MV_IOS_8_0: + case QSysInfo::MV_IOS_8_1: + case QSysInfo::MV_IOS_8_2: + case QSysInfo::MV_IOS_8_3: + case QSysInfo::MV_IOS_8_4: + case QSysInfo::MV_IOS_9_0: + case QSysInfo::MV_None: case QSysInfo::MV_Unknown: break; } @@ -899,9 +916,9 @@ QStringList concat(const QList<QStringList>& list) return result; } -QString doubleToString(double val) +QString doubleToString(const QVariant& val) { - return QString::number(val, 'g', 16); + return val.toString(); } void sortWithReferenceList(QList<QString>& listToSort, const QList<QString>& referenceList, Qt::CaseSensitivity cs) |