diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 18:41:14 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-07-01 18:41:14 +0200 |
| commit | e6a94778d0c26b59e367e9f9fe4f401725fc9c4e (patch) | |
| tree | c7597213d7eac14863bc3cfd7bccd247c8950710 /src/sql/kernel/qsqldatabase.cpp | |
| parent | 605ba2c2268b2dce3d0b06899101d03a67e7f251 (diff) | |
| parent | a09a8d509a69ed16d8afbe15296b8332cacd6c66 (diff) | |
| download | qtbase-e6a94778d0c26b59e367e9f9fe4f401725fc9c4e.tar.gz | |
Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/dev
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index f8ecabee8f..84e01fce49 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -107,7 +107,11 @@ Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader, QLatin1String("/sqldrivers"))) #endif -QT_STATIC_CONST_IMPL char *QSqlDatabase::defaultConnection = "qt_sql_default_connection"; +#if !defined(Q_CC_MSVC) || _MSC_VER >= 1900 +// ### Qt6: remove the #ifdef +const +#endif +char *QSqlDatabase::defaultConnection = const_cast<char *>("qt_sql_default_connection"); typedef QHash<QString, QSqlDriverCreatorBase*> DriverDict; |