diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2010-09-27 11:41:38 +0200 |
| commit | 2271315eb46665b0a9e61ff0525340713163c1b6 (patch) | |
| tree | d0068e34924eca85eb6af4089b3f443a89c929f6 /examples/tutorials/modelview/3_changingmodel/mymodel.cpp | |
| parent | 33e7ee9d1866f12a9b92fe4b5549c31e30974d8e (diff) | |
| parent | 53d010a989aed878c21522cbaf0d75c7cf821b42 (diff) | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure
src/corelib/global/qglobal.h
Diffstat (limited to 'examples/tutorials/modelview/3_changingmodel/mymodel.cpp')
| -rwxr-xr-x | examples/tutorials/modelview/3_changingmodel/mymodel.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp index 42915b09f1..7d78aa7c30 100755 --- a/examples/tutorials/modelview/3_changingmodel/mymodel.cpp +++ b/examples/tutorials/modelview/3_changingmodel/mymodel.cpp @@ -38,9 +38,8 @@ ** ****************************************************************************/ -#include <QTimer> -#include <QTime> #include <QBrush> +#include <QTime> #include "mymodel.h" //! [quoting mymodel_a] |