summaryrefslogtreecommitdiffstats
path: root/src/sql/kernel
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2017-12-08 13:56:16 +0100
committerLiang Qi <liang.qi@qt.io>2017-12-08 13:56:17 +0100
commit812bb236dd1622896b6a0ca9bbe1334a69855aa2 (patch)
tree94031beabaf904e2380740cec8951b3c1152203c /src/sql/kernel
parent79d78d814acad4e183e281aea9b131f396abe3fb (diff)
parent50117d738af526cbfbd5afa50b9a501acb0fb9ce (diff)
Merge remote-tracking branch 'origin/5.10.0' into 5.10
Diffstat (limited to 'src/sql/kernel')
-rw-r--r--src/sql/kernel/qsqlfield.cpp13
-rw-r--r--src/sql/kernel/qsqlfield.h5
2 files changed, 16 insertions, 2 deletions
diff --git a/src/sql/kernel/qsqlfield.cpp b/src/sql/kernel/qsqlfield.cpp
index 59b992e803..a258d44df7 100644
--- a/src/sql/kernel/qsqlfield.cpp
+++ b/src/sql/kernel/qsqlfield.cpp
@@ -155,6 +155,19 @@ public:
*/
/*!
+ Constructs an empty field called \a fieldName of variant type \a type.
+
+ \sa setRequiredStatus(), setLength(), setPrecision(), setDefaultValue(),
+ setGenerated(), setReadOnly()
+*/
+QSqlField::QSqlField(const QString &fieldName, QVariant::Type type)
+{
+ d = new QSqlFieldPrivate(fieldName, type, QString());
+ val = QVariant(type);
+}
+
+/*!
+ \overload
Constructs an empty field called \a fieldName of variant type \a
type in \a table.
diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h
index 30474735f4..8650ba8715 100644
--- a/src/sql/kernel/qsqlfield.h
+++ b/src/sql/kernel/qsqlfield.h
@@ -55,8 +55,9 @@ public:
enum RequiredStatus { Unknown = -1, Optional = 0, Required = 1 };
explicit QSqlField(const QString& fieldName = QString(),
- QVariant::Type type = QVariant::Invalid,
- const QString &tableName = QString());
+ QVariant::Type type = QVariant::Invalid);
+ QSqlField(const QString &fieldName, QVariant::Type type,
+ const QString &tableName);
QSqlField(const QSqlField& other);
QSqlField& operator=(const QSqlField& other);