diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-12 12:52:22 +0200 |
| commit | 2371147354d4436bb54c588662ac315dd4c2f940 (patch) | |
| tree | 5c90b1dd18de394cff2fb4e1bedc628da3c7d341 /src/sql/kernel/qsqldatabase.cpp | |
| parent | 54ec6d177e0e8fb04cd01e70461484a80ca1f7a4 (diff) | |
| parent | 82454b6014a7ee0b048b4db8d64a21de849d4ab9 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
src/gui/image/qicon.cpp
src/gui/image/qicon.h
src/gui/image/qicon_p.h
src/gui/text/qfontdatabase.cpp
src/plugins/platforms/wayland/gl_integration/qwaylandglwindowsurface.cpp
src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandglcontext.cpp
src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglwindow.cpp
sync.profile
Change-Id: Ie0a23a12177ff51bf562e15b2dd41f071afb19b4
Diffstat (limited to 'src/sql/kernel/qsqldatabase.cpp')
| -rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index c5eac194f5..cd36d5d591 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -1434,26 +1434,6 @@ bool QSqlDatabase::isValid() const return d->driver && d->driver != d->shared_null()->driver; } -#ifdef QT3_SUPPORT -/*! - Use query.record() instead. -*/ -QSqlRecord QSqlDatabase::record(const QSqlQuery& query) const -{ return query.record(); } - -/*! - Use query.record() instead. -*/ -QSqlRecord QSqlDatabase::recordInfo(const QSqlQuery& query) const -{ return query.record(); } - -/*! - \fn QSqlRecord QSqlDatabase::recordInfo(const QString& tablename) const - - Use record() instead. -*/ -#endif - /*! Clones the database connection \a other and and stores it as \a connectionName. All the settings from the original database, e.g. |