diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-04 01:00:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-04 10:44:00 +0100 |
| commit | 97417e8f2896bfbe1d9e9a703ddba980983d1442 (patch) | |
| tree | ecee79f9b126bc695904e74000c0775d1ef34646 /examples/sql | |
| parent | 02eb9df851093f11872c828869226903c81f1b60 (diff) | |
| parent | 056230cc9c3309823a93df0e34c92affb29df9e4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
examples/widgets/widgets/imageviewer/imageviewer.cpp
src/corelib/text/qchar.cpp
src/corelib/time/qdatetime.cpp
Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
Diffstat (limited to 'examples/sql')
| -rw-r--r-- | examples/sql/books/initdb.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/sql/books/initdb.h b/examples/sql/books/initdb.h index 773e3fb74c..e1f690a234 100644 --- a/examples/sql/books/initdb.h +++ b/examples/sql/books/initdb.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2020 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the demonstration applications of the Qt Toolkit. @@ -71,7 +71,7 @@ QVariant addGenre(QSqlQuery &q, const QString &name) return q.lastInsertId(); } -QVariant addAuthor(QSqlQuery &q, const QString &name, const QDate &birthdate) +QVariant addAuthor(QSqlQuery &q, const QString &name, QDate birthdate) { q.addBindValue(name); q.addBindValue(birthdate); |