diff options
Diffstat (limited to 'src/sql/kernel')
-rw-r--r-- | src/sql/kernel/qsqldatabase.cpp | 17 | ||||
-rw-r--r-- | src/sql/kernel/qsqldriver.cpp | 14 |
2 files changed, 1 insertions, 30 deletions
diff --git a/src/sql/kernel/qsqldatabase.cpp b/src/sql/kernel/qsqldatabase.cpp index 32338c1fe2..094943ca31 100644 --- a/src/sql/kernel/qsqldatabase.cpp +++ b/src/sql/kernel/qsqldatabase.cpp @@ -619,8 +619,6 @@ QStringList QSqlDatabase::connectionNames() \row \li QODBC \li ODBC Driver (includes Microsoft SQL Server) \row \li QPSQL \li PostgreSQL Driver \row \li QSQLITE \li SQLite version 3 or above - \row \li QSQLITE2 \li SQLite version 2 - \row \li QTDS \li Sybase Adaptive Server \endtable Additional third party drivers, including your own custom @@ -1185,7 +1183,7 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li service \endlist - \header \li DB2 \li OCI \li TDS + \header \li DB2 \li OCI \row \li @@ -1200,9 +1198,6 @@ QSqlRecord QSqlDatabase::record(const QString& tablename) const \li OCI_ATTR_PREFETCH_MEMORY \endlist - \li - \e none - \header \li SQLite \li Interbase \row @@ -1327,11 +1322,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name) \li SQLHANDLE environment, SQLHANDLE connection \li \c qsql_db2.cpp \row - \li QTDS - \li QTDSDriver - \li LOGINREC *loginRecord, DBPROCESS *dbProcess, const QString &hostName - \li \c qsql_tds.cpp - \row \li QSQLITE \li QSQLiteDriver \li sqlite *connection @@ -1343,11 +1333,6 @@ bool QSqlDatabase::isDriverAvailable(const QString& name) \li \c qsql_ibase.cpp \endtable - The host name (or service name) is needed when constructing the - QTDSDriver for creating new connections for internal queries. This - is to prevent blocking when several QSqlQuery objects are used - simultaneously. - \warning Adding a database connection with the same connection name as an existing connection, causes the existing connection to be replaced by the new one. diff --git a/src/sql/kernel/qsqldriver.cpp b/src/sql/kernel/qsqldriver.cpp index 638476c2c1..8753352617 100644 --- a/src/sql/kernel/qsqldriver.cpp +++ b/src/sql/kernel/qsqldriver.cpp @@ -101,20 +101,6 @@ QSqlDriver::~QSqlDriver() } /*! - \since 4.4 - - \fn QSqlDriver::notification(const QString &name) - - This signal is emitted when the database posts an event notification - that the driver subscribes to. \a name identifies the event notification. - - \sa subscribeToNotification() - - \obsolete use QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload) - instead -*/ - -/*! \since 5.0 \fn QSqlDriver::notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant & payload) |