Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update constructor of QDateTimeEdit
  • Loading branch information
nyalldawson committed Jul 20, 2021
1 parent 8e508c2 commit 1621594
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
17 changes: 17 additions & 0 deletions src/gui/editorwidgets/qgsdatetimeedit.cpp
Expand Up @@ -29,14 +29,23 @@


QgsDateTimeEdit::QgsDateTimeEdit( QWidget *parent )
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
: QgsDateTimeEdit( QDateTime(), QVariant::DateTime, parent )
#else
: QgsDateTimeEdit( QDateTime(), QMetaType::QDateTime, parent )
#endif
{

}

///@cond PRIVATE
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QgsDateTimeEdit::QgsDateTimeEdit( const QVariant &var, QVariant::Type parserType, QWidget *parent )
: QDateTimeEdit( var, parserType, parent )
#else
QgsDateTimeEdit::QgsDateTimeEdit( const QVariant & var, QMetaType::Type parserType, QWidget * parent )
: QDateTimeEdit( var, parserType, parent )
#endif
, mNullRepresentation( QgsApplication::nullRepresentation() )
{
QIcon clearIcon = QgsApplication::getThemeIcon( "/mIconClearText.svg" );
Expand Down Expand Up @@ -369,7 +378,11 @@ QDate QgsDateTimeEdit::date() const
//

QgsTimeEdit::QgsTimeEdit( QWidget *parent )
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
: QgsDateTimeEdit( QTime(), QVariant::Time, parent )
#else
: QgsDateTimeEdit( QTime(), QMetaType::QTime, parent )
#endif
{

}
Expand Down Expand Up @@ -406,7 +419,11 @@ void QgsTimeEdit::emitValueChanged( const QVariant &value )
//

QgsDateEdit::QgsDateEdit( QWidget *parent )
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
: QgsDateTimeEdit( QDate(), QVariant::Date, parent )
#else
: QgsDateTimeEdit( QDate(), QMetaType::QDate, parent )
#endif
{

}
Expand Down
4 changes: 4 additions & 0 deletions src/gui/editorwidgets/qgsdatetimeedit.h
Expand Up @@ -132,7 +132,11 @@ class GUI_EXPORT QgsDateTimeEdit : public QDateTimeEdit

#ifndef SIP_RUN
///@cond PRIVATE
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QgsDateTimeEdit( const QVariant &var, QVariant::Type parserType, QWidget *parent );
#else
QgsDateTimeEdit( const QVariant &var, QMetaType::Type parserType, QWidget *parent );
#endif
///@endcond
#endif

Expand Down

0 comments on commit 1621594

Please sign in to comment.