fix search widget wrapper

qgis · Jan 3, 2018 · a3588e023fbb05253b0717b00ab2e67f502527a5 · a3588e0
1 parent 1710dc0
commit a3588e023fbb05253b0717b00ab2e67f502527a5
Unified Split

Showing with 2 additions and 28 deletions.

+2 −2 src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp

+0 −26 src/ui/editorwidgets/qgsdatetimeeditconfig.ui
diff --git a/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp b/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.cpp
@@ -49,11 +49,11 @@ QVariant QgsDateTimeSearchWidgetWrapper::value() const
   const QString fieldFormat = config( QStringLiteral( "field_format" ), QgsDateTimeFieldFormatter::defaultFormat( layer()->fields().at( mFieldIdx ).type() ) ).toString();
   if ( fieldFormat == QgsDateTimeFieldFormatter::DEFAULT_ISO_FORMAT )
   {
-    return mDateTimeEdit->dateTime().toString( fieldFormat );
+    return mDateTimeEdit->dateTime().toString( Qt::ISODate );
   }
   else
   {
-    return mDateTimeEdit->dateTime().toString( Qt::ISODate );
+    return mDateTimeEdit->dateTime().toString( fieldFormat );
   }
 }
 

diff --git a/src/ui/editorwidgets/qgsdatetimeeditconfig.ui b/src/ui/editorwidgets/qgsdatetimeeditconfig.ui
@@ -277,32 +277,6 @@
  </tabstops>
  <resources>
   <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
-  <include location="../../../images/images.qrc"/>
  </resources>
  <connections/>
 </ui>