diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-01-31 15:07:05 +0000 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-01-31 15:35:36 +0000 |
| commit | af4ebcc51fadd90904e8fe6295860dff0d19e680 (patch) | |
| tree | 734a3c13a567a302b6b3665a9d87cd539d8d2eda /src/extras/extras.qrc | |
| parent | 90f1063a1e090a03bb45826d1229fc9179484f9b (diff) | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
Merge branch 'wip/animation' into dev
Conflicts:
src/extras/defaults/defaults.pri
src/extras/extras.qrc
src/quick3d/imports/extras/importsextras.pro
src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp
src/quick3d/quick3dextras/items/items.pri
src/quick3d/quick3dextras/quick3dextras.pro
tests/manual/manual.pro
Change-Id: I62232cb21495612f31f48a6749a52b68777c4ae3
Diffstat (limited to 'src/extras/extras.qrc')
| -rw-r--r-- | src/extras/extras.qrc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/extras/extras.qrc b/src/extras/extras.qrc index 133955e7d..9fce08a9f 100644 --- a/src/extras/extras.qrc +++ b/src/extras/extras.qrc @@ -46,5 +46,7 @@ <file>shaders/gl3/distancefieldtext.frag</file> <file>shaders/es2/distancefieldtext.frag</file> <file>shaders/es2/distancefieldtext.vert</file> + <file>shaders/gl3/morphphong.vert</file> + <file>shaders/es2/morphphong.vert</file> </qresource> </RCC> |