Merge remote-tracking branch 'origin/api_changes' into containters

Conflicts:
	src/corelib/kernel/qmetaobject.cpp
	src/corelib/kernel/qvariant.cpp
	src/tools/moc/moc.h

Change-Id: I2cd3d95b41d2636738c6b98064864941e3b0b4e6

1 files changed, 20 insertions, 0 deletions

diff --git a/examples/sql/sqlbrowser/browser.h b/examples/sql/sqlbrowser/browser.h
index 0769812ec8..e9f45345df 100644
--- a/examples/sql/sqlbrowser/browser.h
+++ b/examples/sql/sqlbrowser/browser.h
@@ -43,6 +43,7 @@
 #define BROWSER_H
 
 #include <QWidget>
+#include <QSqlTableModel>
 #include "ui_browserwidget.h"
 
 class ConnectionWidget;
@@ -77,6 +78,12 @@ public slots:
     { insertRow(); }
     void on_deleteRowAction_triggered()
     { deleteRow(); }
+    void on_fieldStrategyAction_triggered();
+    void on_rowStrategyAction_triggered();
+    void on_manualStrategyAction_triggered();
+    void on_submitAction_triggered();
+    void on_revertAction_triggered();
+    void on_selectAction_triggered();
     void on_connectionWidget_tableActivated(const QString &table)
     { showTable(table); }
     void on_connectionWidget_metaDataRequested(const QString &table)
@@ -96,4 +103,17 @@ signals:
     void statusMessage(const QString &message);
 };
 
+class CustomModel: public QSqlTableModel
+{
+    Q_OBJECT
+public:
+    CustomModel(QObject *parent = 0, QSqlDatabase db = QSqlDatabase()):QSqlTableModel(parent, db) {}
+    QVariant data(const QModelIndex &idx, int role) const
+    {
+        if (role == Qt::BackgroundRole && isDirty(idx))
+            return QBrush(QColor(Qt::yellow));
+        return QSqlTableModel::data(idx, role);
+    }
+};
+
 #endif