summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/drivers/sqlite/qsql_sqlite.cpp2
-rw-r--r--src/sql/kernel/qsqlfield.cpp11
-rw-r--r--src/sql/kernel/qsqlfield.h6
-rw-r--r--src/sql/kernel/qsqlresult.cpp4
-rw-r--r--src/sql/sql.pro8
5 files changed, 24 insertions, 7 deletions
diff --git a/src/sql/drivers/sqlite/qsql_sqlite.cpp b/src/sql/drivers/sqlite/qsql_sqlite.cpp
index 8e1091b..1b74fb9 100644
--- a/src/sql/drivers/sqlite/qsql_sqlite.cpp
+++ b/src/sql/drivers/sqlite/qsql_sqlite.cpp
@@ -117,8 +117,6 @@ public:
QSqlRecord rInf;
};
-static const uint initial_cache_size = 128;
-
QSQLiteResultPrivate::QSQLiteResultPrivate(QSQLiteResult* res) : q(res), access(0),
stmt(0), skippedStatus(false), skipRow(false), utf8(false)
{
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index b528850..4bb56a3 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -159,11 +159,20 @@ public:
\sa setRequiredStatus() setLength() setPrecision() setDefaultValue() setGenerated() setReadOnly()
*/
+QSqlField::QSqlField()
+{
+ d = new QSqlFieldPrivate(QString(), QVariant::Invalid);
+}
+
+QSqlField::QSqlField(const QString& fieldName)
+{
+ d = new QSqlFieldPrivate(fieldName, QVariant::Invalid);
+}
+
QSqlField::QSqlField(const QString& fieldName, QVariant::Type type)
{
d = new QSqlFieldPrivate(fieldName, type);
}
-
/*!
Constructs a copy of \a other.
*/
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 2c3b52a..d70af15 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -58,9 +58,9 @@ class Q_SQL_EXPORT QSqlField
public:
enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
- QSqlField(const QString& fieldName = QString(),
- QVariant::Type type = QVariant::Invalid);
-
+ QSqlField();
+ QSqlField(const QString& fieldName);
+ QSqlField(const QString& fieldName, QVariant::Type type);
QSqlField(const QSqlField& other);
QSqlField& operator=(const QSqlField& other);
bool operator==(const QSqlField& other) const;
diff --git a/src/sql/kernel/qsqlresult.cpp b/src/sql/kernel/qsqlresult.cpp
index 93c9d9f..2a1ba64 100644
--- a/src/sql/kernel/qsqlresult.cpp
+++ b/src/sql/kernel/qsqlresult.cpp
@@ -53,7 +53,9 @@
QT_BEGIN_NAMESPACE
struct QHolder {
- QHolder(const QString& hldr = QString(), int index = -1): holderName(hldr), holderPos(index) {}
+ QHolder(): holderName(QString()), holderPos(-1) {}
+ QHolder(const QString& hldr): holderName(hldr), holderPos(-1) {}
+ QHolder(const QString& hldr, int index): holderName(hldr), holderPos(index) {}
bool operator==(const QHolder& h) const { return h.holderPos == holderPos && h.holderName == holderName; }
bool operator!=(const QHolder& h) const { return h.holderPos != holderPos || h.holderName != holderName; }
QString holderName;
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 3cca4e0..60be748 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -17,3 +17,11 @@ include(kernel/kernel.pri)
include(drivers/drivers.pri)
include(models/models.pri)
+symbian: {
+ TARGET.UID3=0x2001E61D
+
+ # Workaroud for problems with paging this dll
+ MMP_RULES -= PAGED
+ MMP_RULES *= UNPAGED
+}
+