diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-13 14:05:08 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-13 14:05:08 (GMT) |
| commit | 6cd8a6001fe87107d32524c6115d37b620d3e108 (patch) | |
| tree | db8c882db3bf9dc359f39a6db514959efd5a1123 /examples | |
| parent | e98161b0062169b533eb2e11567ba28165a1141c (diff) | |
| parent | dfb50fd81e3dfb721cd60635c781125dbe42bfb1 (diff) | |
| download | Qt-6cd8a6001fe87107d32524c6115d37b620d3e108.zip Qt-6cd8a6001fe87107d32524c6115d37b620d3e108.tar.gz Qt-6cd8a6001fe87107d32524c6115d37b620d3e108.tar.bz2 | |
Merge branch 'fixesfor4.7' into 4.7
Conflicts:
examples/tutorials/modelview/3_changingmodel/mymodel.h
Diffstat (limited to 'examples')
4 files changed, 9 insertions, 3 deletions
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.h b/examples/tutorials/modelview/3_changingmodel/mymodel.h index 29e28c8..87c3dba 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.h +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.h @@ -44,7 +44,6 @@ #include <QAbstractTableModel> #include <QTimer> - class MyModel : public QAbstractTableModel { Q_OBJECT diff --git a/examples/tutorials/modelview/5_edit/mainwindow.h b/examples/tutorials/modelview/5_edit/mainwindow.h index 1d49f47..41b15d1 100755 --- a/examples/tutorials/modelview/5_edit/mainwindow.h +++ b/examples/tutorials/modelview/5_edit/mainwindow.h @@ -43,7 +43,10 @@ #include <QtGui/QMainWindow> +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code class QTableView; //forward declaration +QT_END_NAMESPACE + class MainWindow : public QMainWindow { diff --git a/examples/tutorials/modelview/6_treeview/mainwindow.h b/examples/tutorials/modelview/6_treeview/mainwindow.h index fb8de79..16d3140 100755 --- a/examples/tutorials/modelview/6_treeview/mainwindow.h +++ b/examples/tutorials/modelview/6_treeview/mainwindow.h @@ -43,9 +43,11 @@ #include <QtGui/QMainWindow> -class QTreeView; //forward declaration +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTreeView; //forward declarations class QStandardItemModel; class QStandardItem; +QT_END_NAMESPACE class MainWindow : public QMainWindow diff --git a/examples/tutorials/modelview/7_selections/mainwindow.h b/examples/tutorials/modelview/7_selections/mainwindow.h index f2defb5..0d2dd0e 100755 --- a/examples/tutorials/modelview/7_selections/mainwindow.h +++ b/examples/tutorials/modelview/7_selections/mainwindow.h @@ -43,9 +43,11 @@ #include <QtGui/QMainWindow> -class QTreeView; //forward declaration +QT_BEGIN_NAMESPACE // QT_BEGIN_NAMESPACE / QT_END_NAMESPACE are not needed in Qt user code +class QTreeView; //forward declarations class QStandardItemModel; class QItemSelection; +QT_END_NAMESPACE class MainWindow : public QMainWindow |