diff options
| author | Samuel Rødal <sroedal@trolltech.com> | 2009-04-22 15:12:06 (GMT) |
|---|---|---|
| committer | Samuel Rødal <sroedal@trolltech.com> | 2009-04-22 15:12:06 (GMT) |
| commit | 93c617026e093ea788ead5d0eb34686c4a84a77f (patch) | |
| tree | 8eb5ba0befb2a2ea5b28951819358ee5b9f2f923 /examples/widgets | |
| parent | 756d1f3f3b3f1c6c42e0e1afa4f090a6b2e18199 (diff) | |
| parent | 4b4d4b3d7ae4ad019963d957831c46daacba62f7 (diff) | |
| download | Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.zip Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.tar.gz Qt-93c617026e093ea788ead5d0eb34686c4a84a77f.tar.bz2 | |
Merge branch 'master' into gl2engine-new-shaders
Conflicts:
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/opengl.pro
Diffstat (limited to 'examples/widgets')
| -rw-r--r-- | examples/widgets/codeeditor/codeeditor.cpp | 2 | ||||
| -rw-r--r-- | examples/widgets/movie/movie.pro | 2 |
2 files changed, 2 insertions, 2 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] diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro index b5f0a7a..1c7cbae 100644 --- a/examples/widgets/movie/movie.pro +++ b/examples/widgets/movie/movie.pro @@ -4,6 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie -sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro movies +sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.mng sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie INSTALLS += target sources |