diff options
| author | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-05-26 07:11:17 (GMT) |
|---|---|---|
| committer | Marko Niemelä <marko.a.niemela@nokia.com> | 2011-05-26 07:12:56 (GMT) |
| commit | e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04 (patch) | |
| tree | 24924adf8cd36ad7bf76f04e0462e6cb8507a9b6 /tests/auto | |
| parent | c9eb2ffd1ed940133392831747605bf735d92086 (diff) | |
| download | Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.zip Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.tar.gz Qt-e35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04.tar.bz2 | |
Fixed CI-errors caused by qmlshadersplugin addition.
These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430
Reviewed-by: Kim Gronholm
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro | 20 | ||||
| -rw-r--r-- | tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp | 6 |
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro index 6225a8f..aa0e07a 100644 --- a/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro +++ b/tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro @@ -4,15 +4,15 @@ QT += opengl declarative SOURCES += tst_qmlshadersplugin.cpp SOURCES += \ - ../../../../src/imports/shaders/src/shadereffectitem.cpp \ - ../../../../src/imports/shaders/src/shadereffectsource.cpp \ - ../../../../src/imports/shaders/src/shadereffect.cpp \ - ../../../../src/imports/shaders/src/shadereffectbuffer.cpp \ - ../../../../src/imports/shaders/src/scenegraph/qsggeometry.cpp + ../../../../src/imports/shaders/shadereffectitem.cpp \ + ../../../../src/imports/shaders/shadereffectsource.cpp \ + ../../../../src/imports/shaders/shadereffect.cpp \ + ../../../../src/imports/shaders/shadereffectbuffer.cpp \ + ../../../../src/imports/shaders/scenegraph/qsggeometry.cpp HEADERS += \ - ../../../../src/imports/shaders/src/shadereffectitem.h \ - ../../../../src/imports/shaders/src/shadereffectsource.h \ - ../../../../src/imports/shaders/src/shadereffect.h \ - ../../../../src/imports/shaders/src/shadereffectbuffer.h \ - ../../../../src/imports/shaders/src/scenegraph/qsggeometry.h + ../../../../src/imports/shaders/shadereffectitem.h \ + ../../../../src/imports/shaders/shadereffectsource.h \ + ../../../../src/imports/shaders/shadereffect.h \ + ../../../../src/imports/shaders/shadereffectbuffer.h \ + ../../../../src/imports/shaders/scenegraph/qsggeometry.h diff --git a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp index 61fe2ee..a904a88 100644 --- a/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp +++ b/tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp @@ -41,9 +41,9 @@ #include <qtest.h> #include <QtDeclarative> -#include "../../../../src/imports/shaders/src/shadereffectitem.h" -#include "../../../../src/imports/shaders/src/shadereffectsource.h" -#include "../../../../src/imports/shaders/src/shadereffect.h" +#include "../../../../src/imports/shaders/shadereffectitem.h" +#include "../../../../src/imports/shaders/shadereffectsource.h" +#include "../../../../src/imports/shaders/shadereffect.h" static const char qt_default_vertex_code[] = "uniform highp mat4 qt_ModelViewProjectionMatrix;\n" |