2 files changed, 9 insertions, 9 deletions
diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
index e2455f87fb..58da2a3c51 100644
--- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
+++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -130,7 +130,7 @@ static inline QByteArray fromUnicode(QTextCodec *tc, const QString &str)
 
 static inline QVariant qDateFromString(const QString &val)
 {
-#ifdef QT_NO_DATESTRING
+#if !QT_CONFIG(datestring)
     Q_UNUSED(val);
     return QVariant(val);
 #else
@@ -142,7 +142,7 @@ static inline QVariant qDateFromString(const QString &val)
 
 static inline QVariant qTimeFromString(const QString &val)
 {
-#ifdef QT_NO_DATESTRING
+#if !QT_CONFIG(datestring)
     Q_UNUSED(val);
     return QVariant(val);
 #else
@@ -154,7 +154,7 @@ static inline QVariant qTimeFromString(const QString &val)
 
 static inline QVariant qDateTimeFromString(QString &val)
 {
-#ifdef QT_NO_DATESTRING
+#if !QT_CONFIG(datestring)
     Q_UNUSED(val);
     return QVariant(val);
 #else
diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp
index 5796644d34..bf0493b0c3 100644
--- a/src/plugins/sqldrivers/psql/qsql_psql.cpp
+++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp
@@ -679,7 +679,7 @@ QVariant QPSQLResult::data(int i)
         if (val[0] == '\0') {
             return QVariant(QDate());
         } else {
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
             return QVariant(QDate::fromString(QString::fromLatin1(val), Qt::ISODate));
 #else
             return QVariant(QString::fromLatin1(val));
@@ -687,7 +687,7 @@ QVariant QPSQLResult::data(int i)
         }
     case QVariant::Time: {
         const QString str = QString::fromLatin1(val);
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
         if (str.isEmpty())
             return QVariant(QTime());
         else
@@ -698,7 +698,7 @@ QVariant QPSQLResult::data(int i)
     }
     case QVariant::DateTime: {
         QString dtval = QString::fromLatin1(val);
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
         if (dtval.length() < 10) {
             return QVariant(QDateTime());
        } else {
@@ -1500,7 +1500,7 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const
     } else {
         switch (int(field.type())) {
         case QVariant::DateTime:
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
             if (field.value().toDateTime().isValid()) {
                 // we force the value to be considered with a timezone information, and we force it to be UTC
                 // this is safe since postgresql stores only the UTC value and not the timezone offset (only used
@@ -1513,10 +1513,10 @@ QString QPSQLDriver::formatValue(const QSqlField &field, bool trimStrings) const
             }
 #else
             r = QLatin1String("NULL");
-#endif // QT_NO_DATESTRING
+#endif // datestring
             break;
         case QVariant::Time:
-#ifndef QT_NO_DATESTRING
+#if QT_CONFIG(datestring)
             if (field.value().toTime().isValid()) {
                 r = QLatin1Char('\'') + field.value().toTime().toString(QLatin1String("hh:mm:ss.zzz")) + QLatin1Char('\'');
             } else