diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-02 16:10:01 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-03 07:56:23 +0000 |
| commit | 7331d22c6f55b6cd76bcf05bc70ebac69cf51eb9 (patch) | |
| tree | 0df5c403285dfd7c37e5d67cef01997cf85c58e0 /src/sql/models | |
| parent | 8af681c10744ca53bc1402dfa5ece058777aaeff (diff) | |
Add qtsqlglobal.h and qtsqlglobal_p.h
The new modular configuration system requires one global
header per module, that is included by all other files in
this module.
QtSql already had such a header, but its name (qsql.h) was
not in line with what's being used in all other modules. So
add a qtsqlglobal.h header, deprecate qsql.h and turn it
into a a forwarding header to that new global header file.
Change-Id: Ibaeb95b008cf08ba062cbfe8a3f4d3bf79294390
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/sql/models')
| -rw-r--r-- | src/sql/models/qsqlquerymodel.h | 1 | ||||
| -rw-r--r-- | src/sql/models/qsqlquerymodel_p.h | 1 | ||||
| -rw-r--r-- | src/sql/models/qsqlrelationaldelegate.h | 2 | ||||
| -rw-r--r-- | src/sql/models/qsqlrelationaltablemodel.h | 1 | ||||
| -rw-r--r-- | src/sql/models/qsqltablemodel.h | 1 | ||||
| -rw-r--r-- | src/sql/models/qsqltablemodel_p.h | 1 |
6 files changed, 7 insertions, 0 deletions
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index d7c41196e5..f786f71300 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -40,6 +40,7 @@ #ifndef QSQLQUERYMODEL_H #define QSQLQUERYMODEL_H +#include <QtSql/qtsqlglobal.h> #include <QtCore/qabstractitemmodel.h> #include <QtSql/qsqldatabase.h> diff --git a/src/sql/models/qsqlquerymodel_p.h b/src/sql/models/qsqlquerymodel_p.h index 7b35ba5197..ffc34b9f95 100644 --- a/src/sql/models/qsqlquerymodel_p.h +++ b/src/sql/models/qsqlquerymodel_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtSql/private/qtsqlglobal_p.h> #include "private/qabstractitemmodel_p.h" #include "QtSql/qsqlerror.h" #include "QtSql/qsqlquery.h" diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index 94097a244d..e98bf28d3b 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -40,6 +40,8 @@ #ifndef QSQLRELATIONALDELEGATE_H #define QSQLRELATIONALDELEGATE_H +#include <QtSql/qtsqlglobal.h> + #ifdef QT_WIDGETS_LIB #include <QtWidgets/qitemdelegate.h> diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index 66da87cb83..4da460389c 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -40,6 +40,7 @@ #ifndef QSQLRELATIONALTABLEMODEL_H #define QSQLRELATIONALTABLEMODEL_H +#include <QtSql/qtsqlglobal.h> #include <QtSql/qsqltablemodel.h> QT_BEGIN_NAMESPACE diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index d88f195c2b..6a62c6993d 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -40,6 +40,7 @@ #ifndef QSQLTABLEMODEL_H #define QSQLTABLEMODEL_H +#include <QtSql/qtsqlglobal.h> #include <QtSql/qsqldatabase.h> #include <QtSql/qsqlquerymodel.h> diff --git a/src/sql/models/qsqltablemodel_p.h b/src/sql/models/qsqltablemodel_p.h index b0ed38b26f..4a79d5db36 100644 --- a/src/sql/models/qsqltablemodel_p.h +++ b/src/sql/models/qsqltablemodel_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtSql/private/qtsqlglobal_p.h> #include "private/qsqlquerymodel_p.h" #include "QtSql/qsqlindex.h" #include "QtCore/qmap.h" |