sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-04 00:04:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Adapt date strings to work for qt 6 builds

Browse Source
This commit is contained in:
Nyall Dawson 2025-07-24 13:02:44 +10:00
parent e5508b2d74
commit d55ca18e48
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/function_help/json/convert_timezone
View File

@ -13,7 +13,7 @@
}],
"examples": [
{
"expression": "convert_timezone(to_datetime('2012-05-04 12:50:00 UTC+03'), timezone_from_id('UTC+10'))",
"expression": "convert_timezone(to_datetime('2012-05-04 12:50:00+3'), timezone_from_id('UTC+10'))",
"returns": "datetime 2012-05-04 19:50:00 (UTC+10)"
},
{

2
resources/function_help/json/get_timezone
View File

@ -9,7 +9,7 @@
}],
"examples": [
{
"expression": "timezone_id(get_timezone(to_datetime('2012-05-04 12:50:00 UTC+03')))",
"expression": "timezone_id(get_timezone(to_datetime('2012-05-04 12:50:00+3')))",
"returns": "'UTC+03'"
},
{

2
resources/function_help/json/set_timezone
View File

@ -13,7 +13,7 @@
}],
"examples": [
{
"expression": "set_timezone(to_datetime('2012-05-04 12:50:00 UTC+03'), timezone_from_id('UTC+10'))",
"expression": "set_timezone(to_datetime('2012-05-04 12:50:00+3'), timezone_from_id('UTC+10'))",
"returns": "datetime 2012-05-04 12:50:00 (UTC+10)"
},
{

6
tests/src/core/testqgsexpression.cpp
View File

@ -2061,9 +2061,9 @@ class TestQgsExpression : public QObject
QTest::newRow( "timezone_id valid timezone" ) << "timezone_id(timezone_from_id('Australia/Brisbane'))" << false << QVariant( QString( "Australia/Brisbane" ) );
QTest::newRow( "timezone_id UTC+10:30" ) << "timezone_id(timezone_from_id('UTC+10:30'))" << false << QVariant( QString( "UTC+10:30" ) );
QTest::newRow( "timezone_id UTC-3" ) << "timezone_id(timezone_from_id('UTC-3'))" << false << QVariant( QString( "UTC-03" ) );
QTest::newRow( "convert timezone, fixed datetime" ) << "format_date(convert_timezone(to_datetime('2012-05-04 12:50:00 UTC+03'), timezone_from_id('UTC+10')), 'yyyy-MM-dd HH:mm:ss t')" << false << QVariant( QString( "2012-05-04 19:50:00 UTC+10" ) );
QTest::newRow( "set timezone, fixed datetime" ) << "format_date(set_timezone(to_datetime('2012-05-04 12:50:00 UTC+03'), timezone_from_id('UTC+10')), 'yyyy-MM-dd HH:mm:ss t')" << false << QVariant( QString( "2012-05-04 12:50:00 UTC+10" ) );
QTest::newRow( "get timezone, fixed datetime" ) << "timezone_id(get_timezone(to_datetime('2012-05-04 12:50:00 UTC+03')))" << false << QVariant( QString( "UTC+03" ) );
QTest::newRow( "convert timezone, fixed datetime" ) << "format_date(convert_timezone(to_datetime('2012-05-04 12:50:00+3'), timezone_from_id('UTC+10')), 'yyyy-MM-dd HH:mm:ss t')" << false << QVariant( QString( "2012-05-04 19:50:00 UTC+10" ) );
QTest::newRow( "set timezone, fixed datetime" ) << "format_date(set_timezone(to_datetime('2012-05-04 12:50:00+3'), timezone_from_id('UTC+10')), 'yyyy-MM-dd HH:mm:ss t')" << false << QVariant( QString( "2012-05-04 12:50:00 UTC+10" ) );
QTest::newRow( "get timezone, fixed datetime" ) << "timezone_id(get_timezone(to_datetime('2012-05-04 12:50:00+3')))" << false << QVariant( QString( "UTC+03" ) );
// Color functions