diff options
| author | Bill King <bill.king@nokia.com> | 2009-08-05 13:45:19 +1000 |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-08-05 13:45:19 +1000 |
| commit | bd51c3010e78925a2074122b281de53f01be9ef9 (patch) | |
| tree | 23ac1bb378caebd0072b54fd191932ac65ac1b35 /examples/itemviews | |
| parent | a4ede01350b506c9908241f0b9002f560cc0949f (diff) | |
| parent | 7e8e53cded4622ac35ff115e26e074de6722d1a0 (diff) | |
Merge branch '4.5'
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'examples/itemviews')
| -rw-r--r-- | examples/itemviews/frozencolumn/freezetablewidget.h | 1 | ||||
| -rw-r--r-- | examples/itemviews/frozencolumn/main.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/examples/itemviews/frozencolumn/freezetablewidget.h b/examples/itemviews/frozencolumn/freezetablewidget.h index e22660ef8b..f7b8e432e7 100644 --- a/examples/itemviews/frozencolumn/freezetablewidget.h +++ b/examples/itemviews/frozencolumn/freezetablewidget.h @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #ifndef FREEZETABLEWIDGET_H #define FREEZETABLEWIDGET_H diff --git a/examples/itemviews/frozencolumn/main.cpp b/examples/itemviews/frozencolumn/main.cpp index 8ed9d3b323..9f6a63743a 100644 --- a/examples/itemviews/frozencolumn/main.cpp +++ b/examples/itemviews/frozencolumn/main.cpp @@ -39,7 +39,6 @@ ** ****************************************************************************/ - #include <QApplication> #include <QStandardItemModel> #include <QFile> |