sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-28 00:17:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
Alessandro Pasotti 2019-11-22 16:00:01 +01:00
parent 17a700b34b
commit 2c61eb39a0
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp
View File

@ -220,7 +220,7 @@ void QgsDateTimeEditWrapper::updateValues( const QVariant &value, const QVariant
break; break;
case QVariant::Date: case QVariant::Date:
dateTime.setDate( value.toDate() ); dateTime.setDate( value.toDate() );
dateTime.setTime( QTime::currentTime() ); dateTime.setTime( QTime( 0, 0, 0 ) );
break; break;
case QVariant::Time: case QVariant::Time:
dateTime.setDate( QDate::currentDate() ); dateTime.setDate( QDate::currentDate() );

18
tests/src/gui/testqgsdatetimeedit.cpp
View File

@ -121,26 +121,26 @@ void TestQgsDateTimeEdit::nullValues()
void TestQgsDateTimeEdit::focus() void TestQgsDateTimeEdit::focus()
{ {
QgsApplication::setNullRepresentation( QString( "nope" ) ); QgsApplication::setNullRepresentation( QString( "nope" ) );
QWidget *w = new QWidget(); //required for focus events QWidget w; //required for focus events
QApplication::setActiveWindow( w ); QApplication::setActiveWindow( &w );
QVariantMap cfg; QVariantMap cfg;
cfg.insert( QStringLiteral( "AllowNull" ), true ); cfg.insert( QStringLiteral( "AllowNull" ), true );
widget1->setConfig( cfg ); widget1->setConfig( cfg );
QgsDateTimeEdit *dateedit1 = qobject_cast<QgsDateTimeEdit *>( widget1->createWidget( w ) ); QgsDateTimeEdit *dateedit1 = qobject_cast<QgsDateTimeEdit *>( widget1->createWidget( &w ) );
QVERIFY( dateedit1 ); QVERIFY( dateedit1 );
widget1->initWidget( dateedit1 ); widget1->initWidget( dateedit1 );
widget1->setValue( QVariant::Date ); widget1->setValue( QVariant::Date );
widget2->setConfig( cfg ); widget2->setConfig( cfg );
QgsDateTimeEdit *dateedit2 = qobject_cast<QgsDateTimeEdit *>( widget2->createWidget( w ) ); QgsDateTimeEdit *dateedit2 = qobject_cast<QgsDateTimeEdit *>( widget2->createWidget( &w ) );
QVERIFY( dateedit2 ); QVERIFY( dateedit2 );
widget2->initWidget( dateedit2 ); widget2->initWidget( dateedit2 );
widget2->setValue( QVariant::Date ); widget2->setValue( QVariant::Date );
widget3->setConfig( cfg ); widget3->setConfig( cfg );
QgsDateTimeEdit *dateedit3 = qobject_cast<QgsDateTimeEdit *>( widget3->createWidget( w ) ); QgsDateTimeEdit *dateedit3 = qobject_cast<QgsDateTimeEdit *>( widget3->createWidget( &w ) );
QVERIFY( dateedit3 ); QVERIFY( dateedit3 );
widget3->initWidget( dateedit3 ); widget3->initWidget( dateedit3 );
widget3->setValue( QVariant::Date ); widget3->setValue( QVariant::Date );
@ -238,14 +238,14 @@ void TestQgsDateTimeEdit::focus()
void TestQgsDateTimeEdit::testDateTime() void TestQgsDateTimeEdit::testDateTime()
{ {
QgsApplication::setNullRepresentation( QString( "nope" ) ); QgsApplication::setNullRepresentation( QString( "nope" ) );
QWidget *w = new QWidget(); //required for focus events QWidget w;
QApplication::setActiveWindow( w ); QApplication::setActiveWindow( &w );
QVariantMap cfg; QVariantMap cfg;
cfg.insert( QStringLiteral( "AllowNull" ), true ); cfg.insert( QStringLiteral( "AllowNull" ), true );
widget4->setConfig( cfg ); widget4->setConfig( cfg );
QgsDateTimeEdit *dateedit4 = qobject_cast<QgsDateTimeEdit *>( widget4->createWidget( w ) ); QgsDateTimeEdit *dateedit4 = qobject_cast<QgsDateTimeEdit *>( widget4->createWidget( &w ) );
QVERIFY( dateedit4 ); QVERIFY( dateedit4 );
widget4->initWidget( dateedit4 ); widget4->initWidget( dateedit4 );
widget4->setValue( QTime( 23, 10, 57 ) ); widget4->setValue( QTime( 23, 10, 57 ) );
@ -253,7 +253,7 @@ void TestQgsDateTimeEdit::testDateTime()
QCOMPARE( value, QTime( 23, 10, 57 ) ); QCOMPARE( value, QTime( 23, 10, 57 ) );
widget5->setConfig( cfg ); widget5->setConfig( cfg );
QgsDateTimeEdit *dateedit5 = qobject_cast<QgsDateTimeEdit *>( widget5->createWidget( w ) ); QgsDateTimeEdit *dateedit5 = qobject_cast<QgsDateTimeEdit *>( widget5->createWidget( &w ) );
QVERIFY( dateedit5 ); QVERIFY( dateedit5 );
widget5->initWidget( dateedit5 ); widget5->initWidget( dateedit5 );
widget5->setValue( QDate( 1966, 11, 25 ) ); widget5->setValue( QDate( 1966, 11, 25 ) );