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/kernel/qsql.h | |
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/kernel/qsql.h')
-rw-r--r-- | src/sql/kernel/qsql.h | 96 |
1 files changed, 0 insertions, 96 deletions
diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h deleted file mode 100644 index 02ebae7adc..0000000000 --- a/src/sql/kernel/qsql.h +++ /dev/null @@ -1,96 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtSql module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QSQL_H -#define QSQL_H - -#include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_SQL_LIB) -# define Q_SQL_EXPORT Q_DECL_EXPORT -# else -# define Q_SQL_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_SQL_EXPORT -#endif - -namespace QSql -{ - enum Location - { - BeforeFirstRow = -1, - AfterLastRow = -2 - }; - - enum ParamTypeFlag - { - In = 0x00000001, - Out = 0x00000002, - InOut = In | Out, - Binary = 0x00000004 - }; - Q_DECLARE_FLAGS(ParamType, ParamTypeFlag) - - enum TableType - { - Tables = 0x01, - SystemTables = 0x02, - Views = 0x04, - AllTables = 0xff - }; - - enum NumericalPrecisionPolicy - { - LowPrecisionInt32 = 0x01, - LowPrecisionInt64 = 0x02, - LowPrecisionDouble = 0x04, - - HighPrecision = 0 - }; -} - -Q_DECLARE_OPERATORS_FOR_FLAGS(QSql::ParamType) - -QT_END_NAMESPACE - -#endif // QSQL_H |