diff options
| author |   Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:36:04 -0500 |
|---|---|---|
| committer | Unit 193 <unit193@ubuntu.com> | 2017-02-09 04:36:04 -0500 |
| commit | d9aa870e5d509cc7309ab82dd102a937ab58613a (patch) | |
| tree | d92d03d76b5c390b335f1cfd761f1a0b59ec8496 /SQLiteStudio3/coreSQLiteStudio/common/utils.cpp | |
| parent | 68ee4cbcbe424b95969c70346283a9f217f63825 (diff) | |
Imported Upstream version 3.1.1+dfsg1upstream/3.1.1+dfsg1
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) |