diff options
| author | Christian Ehrlicher <ch.ehrlicher@gmx.de> | 2023-02-21 18:39:08 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-02-28 19:14:29 +0000 |
| commit | 42cbf42a757d37755c41421c47d31e85e440f6f2 (patch) | |
| tree | 7bf126e9ab42f890329fb05d904a3832619e77d2 /src/plugins | |
| parent | 7b96dad1e9d2377ca480d0a43a7cfdfabc239ddd (diff) | |
| download | qtbase-42cbf42a757d37755c41421c47d31e85e440f6f2.tar.gz | |
SQL/OCI: use QDateTime::toString("ttt")
Use QDateTime::toString("ttt") which is available since Qt6.5 instead
own implementation
Fixes: QTBUG-111275
Change-Id: I41676d3a327c5aaabdeb4f54b9d169e228c482e1
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
(cherry picked from commit 79b22bb1f3ba51f37de03faefc7ddcd712e8e385)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/sqldrivers/oci/qsql_oci.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 1dc0c811db..5ef9915c51 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -131,15 +131,6 @@ public: ~QOCIDateTime(); OCIDateTime *dateTime; static QDateTime fromOCIDateTime(OCIEnv *env, OCIError *err, OCIDateTime *dt); - static QString toOffsetString(const QDateTime &dt) - { - const auto offset = dt.offsetFromUtc(); - const auto offsetAbs = qAbs(offset) / 60; - return QString::asprintf("%c%02d:%02d", - offset >= 0 ? '+' : '-', - offsetAbs / 60, - offsetAbs % 60); - } }; QOCIDateTime::QOCIDateTime(OCIEnv *env, OCIError *err, const QDateTime &dt) @@ -150,7 +141,7 @@ QOCIDateTime::QOCIDateTime(OCIEnv *env, OCIError *err, const QDateTime &dt) const QDate date = dt.date(); const QTime time = dt.time(); // Zone in +hh:mm format - const QString timeZone = toOffsetString(dt); + const QString timeZone = dt.toString("ttt"); const OraText *tz = reinterpret_cast<const OraText *>(timeZone.utf16()); OCIDateTimeConstruct(env, err, dateTime, date.year(), date.month(), date.day(), time.hour(), time.minute(), time.second(), time.msec() * 1000000, |