Fixed CI-errors caused by qmlshadersplugin addition.
authorMarko Niemelä <marko.a.niemela@nokia.com>
Thu, 26 May 2011 07:11:17 +0000 (10:11 +0300)
committerMarko Niemelä <marko.a.niemela@nokia.com>
Thu, 26 May 2011 07:12:56 +0000 (10:12 +0300)
commite35d0af6ef3016b27bfd6dca1cf5c8f8a153fc04
tree24924adf8cd36ad7bf76f04e0462e6cb8507a9b6
parentc9eb2ffd1ed940133392831747605bf735d92086
Fixed CI-errors caused by qmlshadersplugin addition.

These are fixes for CI-issues caused by db20b6c03b6a93ab3e483cd85d5d0a923c3d3430

Reviewed-by: Kim Gronholm
44 files changed:
src/imports/shaders/scenegraph/qsggeometry.cpp
src/imports/shaders/scenegraph/qsggeometry.h
src/imports/shaders/shadereffectitem.cpp
src/imports/shaders/shadereffectsource.cpp
tests/auto/declarative/qmlshadersplugin/qmlshadersplugin.pro
tests/auto/declarative/qmlshadersplugin/tst_qmlshadersplugin.cpp
tests/benchmarks/declarative/qmlshadersplugin/GaussianBlur.qml
tests/benchmarks/declarative/qmlshadersplugin/GaussianDirectionalBlur.qml
tests/benchmarks/declarative/qmlshadersplugin/GaussianDropShadow.qml
tests/benchmarks/declarative/qmlshadersplugin/TestGaussianDropShadow.qml
tests/benchmarks/declarative/qmlshadersplugin/TestWater.qml
tests/benchmarks/declarative/qmlshadersplugin/Water.qml
tests/benchmarks/declarative/qmlshadersplugin/qmlshadersplugin.pro
tests/benchmarks/declarative/qmlshadersplugin/tst_performance.cpp
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestActive.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBasic.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlending.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestBlendingModes.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectHierarchy.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestEffectInsideAnotherEffect.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFormat.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestFragmentShader.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestGrab.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHideOriginal.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestHorizontalWrap.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageFiltering.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMargins.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMarginsWithTextureSize.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestImageMipmap.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMargins.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestItemMarginsWithTextureSize.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestLive.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestMeshResolution.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOneSource.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestOpacity.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestRotation.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestScale.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTextureSize.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwiceOnSameSource.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestTwoSources.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVertexShader.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestVerticalWrap.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/TestWrapRepeat.qml
tests/manual/declarative/qmlshadersplugin/qml/qmlshadersplugintest/main.qml