summaryrefslogtreecommitdiffstats
path: root/src/sql
diff options
context:
space:
mode:
Diffstat (limited to 'src/sql')
-rw-r--r--src/sql/kernel/qsqldriver.h2
-rw-r--r--src/sql/models/qsqlquerymodel.h2
-rw-r--r--src/sql/models/qsqlrelationaltablemodel.h2
-rw-r--r--src/sql/models/qsqltablemodel.h2
-rw-r--r--src/sql/sql.pro3
5 files changed, 5 insertions, 6 deletions
diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index 3052be6..b411d65 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -69,7 +69,7 @@ class Q_SQL_EXPORT QSqlDriver : public QObject
{
friend class QSqlDatabase;
Q_OBJECT
- Q_DECLARE_PRIVATE(QSqlDriver)
+ Q_DECLARE_SCOPED_PRIVATE(QSqlDriver)
public:
enum DriverFeature { Transactions, QuerySize, BLOB, Unicode, PreparedQueries,
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h
index c81fa2c..bf99634 100644
--- a/src/sql/models/qsqlquerymodel.h
+++ b/src/sql/models/qsqlquerymodel.h
@@ -59,7 +59,7 @@ class QSqlQuery;
class Q_SQL_EXPORT QSqlQueryModel: public QAbstractTableModel
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QSqlQueryModel)
+ Q_DECLARE_SCOPED_PRIVATE(QSqlQueryModel)
public:
explicit QSqlQueryModel(QObject *parent = 0);
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index f476a48..fa060b8 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -102,7 +102,7 @@ protected:
QString orderByClause() const;
private:
- Q_DECLARE_PRIVATE(QSqlRelationalTableModel)
+ Q_DECLARE_SCOPED_PRIVATE(QSqlRelationalTableModel)
};
QT_END_NAMESPACE
diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h
index a6f4469..3e539be 100644
--- a/src/sql/models/qsqltablemodel.h
+++ b/src/sql/models/qsqltablemodel.h
@@ -59,7 +59,7 @@ class QSqlIndex;
class Q_SQL_EXPORT QSqlTableModel: public QSqlQueryModel
{
Q_OBJECT
- Q_DECLARE_PRIVATE(QSqlTableModel)
+ Q_DECLARE_SCOPED_PRIVATE(QSqlTableModel)
public:
enum EditStrategy {OnFieldChange, OnRowChange, OnManualSubmit};
diff --git a/src/sql/sql.pro b/src/sql/sql.pro
index 60be748..b8f819d 100644
--- a/src/sql/sql.pro
+++ b/src/sql/sql.pro
@@ -19,9 +19,8 @@ include(models/models.pri)
symbian: {
TARGET.UID3=0x2001E61D
-
+
# Workaroud for problems with paging this dll
MMP_RULES -= PAGED
MMP_RULES *= UNPAGED
}
-