Changeset 846 for trunk/src/sql/kernel/qsqldatabase.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/sql/kernel/qsqldatabase.cpp (modified) (5 diffs)

trunk/src/sql/kernel/qsqldatabase.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -61 +61 @@
 #endif
 #ifdef QT_SQL_TDS
+
+
 #include "../drivers/tds/qsql_tds.h"
+
 #endif
 #ifdef QT_SQL_DB2
@@ -99 +102 @@
 QT_BEGIN_NAMESPACE
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#if
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
                           (QSqlDriverFactoryInterface_iid,
@@ -577 +580 @@
 #endif
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#if
     if (QFactoryLoader *fl = loader()) {
         QStringList keys = fl->keys();
@@ -775 +778 @@
     }
 
-#if !defined(QT_NO_LIBRARY) && !defined(QT_NO_SETTINGS)
+#if
     if (!driver && loader()) {
         if (QSqlDriverFactoryInterface *factory = qobject_cast<QSqlDriverFactoryInterface*>(loader()->instance(type)))