diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 10:03:53 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-01 16:25:19 +0200 |
| commit | a09a8d509a69ed16d8afbe15296b8332cacd6c66 (patch) | |
| tree | 28645b437fd0390d903f753a44ba79626eecb8ac /src/sql/kernel/qsqldatabase.h | |
| parent | 4b28152da64f7f23a1bbb810d8cdb7626a5f0b8e (diff) | |
| parent | 83f06da1c6bffff61af78cbe75a0691d53742b53 (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/network/socket/qnativesocketengine_winrt.cpp
src/plugins/platforms/android/androidjniaccessibility.cpp
src/plugins/platforms/windows/qwindowswindow.cpp
Manually adjusted:
mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
to include 9ce697f2d54be6d94381c72af28dda79cbc027d4
Thanks goes to Sergio for the qnx mkspecs adjustments.
Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
Diffstat (limited to 'src/sql/kernel/qsqldatabase.h')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 7249e223a53..ffc10cdd303 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -113,7 +113,12 @@ public: QSqlDriver* driver() const; - QT_STATIC_CONST char *defaultConnection; + static +#if !defined(Q_CC_MSVC) || _MSC_VER >= 1900 + // ### Qt6: remove the #ifdef + const +#endif + char *defaultConnection; static QSqlDatabase addDatabase(const QString& type, const QString& connectionName = QLatin1String(defaultConnection)); |