diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 14:30:50 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 20:23:54 +0000 |
| commit | 98a3502fa585c16a45b558a1ad27266a43338b88 (patch) | |
| tree | d9342916096db830aec77b4ecd6af7d502221bc9 /src/sql | |
| parent | c9539f340ea0917ed17f83abf75f1a4e33c4fd82 (diff) | |
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 <andy.shaw@qt.io>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 6 | ||||
| -rw-r--r-- | src/sql/kernel/qsqldatabase.h | 7 |
2 files changed, 2 insertions, 11 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index ded9bd7246..c25762cd01 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<char *>("qt_sql_default_connection"); +const char *QSqlDatabase::defaultConnection = const_cast<char *>("qt_sql_default_connection"); typedef QHash<QString, QSqlDriverCreatorBase*> DriverDict; diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 684b9c04a1..3aadab9b2f 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -111,12 +111,7 @@ public: QSqlDriver* driver() const; - static -#if !defined(Q_CC_MSVC) || _MSC_VER >= 1900 - // ### Qt6: remove the #ifdef - const -#endif - char *defaultConnection; + static const char *defaultConnection; static QSqlDatabase addDatabase(const QString& type, const QString& connectionName = QLatin1String(defaultConnection)); |