diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-05-05 09:42:17 (GMT) |
| commit | 200afdbd684bc7b6dca96d6fccb59d4cd078a02e (patch) | |
| tree | c8b87ce527f9270a7773f44525208c60931a5759 /examples/widgets/codeeditor/codeeditor.cpp | |
| parent | 226baa99f53eeeff2489148c9187c19f5bc86f0e (diff) | |
| parent | 5eef8717c9862befe8b6529cbb111c0b30529f48 (diff) | |
| download | Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.zip Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.gz Qt-200afdbd684bc7b6dca96d6fccb59d4cd078a02e.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
Diffstat (limited to 'examples/widgets/codeeditor/codeeditor.cpp')
| -rw-r--r-- | examples/widgets/codeeditor/codeeditor.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/widgets/codeeditor/codeeditor.cpp b/examples/widgets/codeeditor/codeeditor.cpp index b855c7a..615f39f 100644 --- a/examples/widgets/codeeditor/codeeditor.cpp +++ b/examples/widgets/codeeditor/codeeditor.cpp @@ -41,7 +41,7 @@ #include <QtGui> -#include <codeeditor.h> +#include "codeeditor.h" //![constructor] |