From 98a3502fa585c16a45b558a1ad27266a43338b88 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 4 Jan 2018 14:30:50 +0100 Subject: QtSql: Raise minimum supported MSVC version to 2015 Remove code for older versions and streamline #ifdefs. Task-number: QTBUG-51673 Change-Id: I1d0f89784f8fb698828e11ce39086501971f1756 Reviewed-by: Andy Shaw --- src/sql/kernel/qsqldatabase.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/sql/kernel/qsqldatabase.cpp') diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index ded9bd72468..c25762cd012 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -59,11 +59,7 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, (QSqlDriverFactoryInterface_iid, QLatin1String("/sqldrivers"))) -#if !defined(Q_CC_MSVC) || _MSC_VER >= 1900 -// ### Qt6: remove the #ifdef -const -#endif -char *QSqlDatabase::defaultConnection = const_cast("qt_sql_default_connection"); +const char *QSqlDatabase::defaultConnection = const_cast("qt_sql_default_connection"); typedef QHash DriverDict; -- cgit v1.2.3