diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-06 08:38:11 +0200 |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-06 09:18:48 +0200 |
| commit | 55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a (patch) | |
| tree | 99c01d7a4e0941f415e9a48f51faac94787b6cb0 /examples/itemviews | |
| parent | 57ceb11ecf95032418712a686418116cf2398e7a (diff) | |
| parent | b008dfbd67176948f6fdf830dc99d23a538a6b9c (diff) | |
| download | qt4-tools-55c4f15df0d482c7d3d6c889b9fc132ed0bdd12a.tar.gz | |
Merge commit 'qt/master-stable'
Conflicts:
configure.exe
doc/src/classes/qnamespace.qdoc
examples/examples.pro
src/corelib/kernel/qcoreevent.cpp
src/corelib/kernel/qobject.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qstandardgestures.h
src/gui/kernel/qwidget.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> |