diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /src/extras/defaults/defaults.pri | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'src/extras/defaults/defaults.pri')
| -rw-r--r-- | src/extras/defaults/defaults.pri | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/extras/defaults/defaults.pri b/src/extras/defaults/defaults.pri index 21ef6fef6..8a18fb6e9 100644 --- a/src/extras/defaults/defaults.pri +++ b/src/extras/defaults/defaults.pri @@ -4,6 +4,7 @@ HEADERS += \ $$PWD/qphongmaterial.h \ $$PWD/qphongmaterial_p.h \ $$PWD/qdiffusemapmaterial_p.h \ + $$PWD/qdiffusemapmaterial.h \ $$PWD/qnormaldiffusespecularmapmaterial.h \ $$PWD/qnormaldiffusespecularmapmaterial_p.h \ $$PWD/qnormaldiffusemapmaterial.h \ @@ -23,13 +24,19 @@ HEADERS += \ $$PWD/qphongalphamaterial.h \ $$PWD/qphongalphamaterial_p.h \ $$PWD/qt3dwindow.h \ + $$PWD/qt3dwindow_p.h \ $$PWD/qfirstpersoncameracontroller.h \ $$PWD/qfirstpersoncameracontroller_p.h \ $$PWD/qorbitcameracontroller.h \ $$PWD/qorbitcameracontroller_p.h \ + $$PWD/qtexturematerial.h \ + $$PWD/qtexturematerial_p.h \ + $$PWD/qmetalroughmaterial.h \ + $$PWD/qmetalroughmaterial_p.h \ + $$PWD/qtexturedmetalroughmaterial.h \ + $$PWD/qtexturedmetalroughmaterial_p.h \ $$PWD/qmorphphongmaterial.h \ - $$PWD/qmorphphongmaterial_p.h \ - $$PWD/qdiffusemapmaterial.h + $$PWD/qmorphphongmaterial_p.h SOURCES += \ $$PWD/qphongmaterial.cpp \ @@ -46,5 +53,8 @@ SOURCES += \ $$PWD/qt3dwindow.cpp \ $$PWD/qfirstpersoncameracontroller.cpp \ $$PWD/qorbitcameracontroller.cpp \ + $$PWD/qtexturematerial.cpp \ + $$PWD/qmetalroughmaterial.cpp \ + $$PWD/qtexturedmetalroughmaterial.cpp \ $$PWD/qmorphphongmaterial.cpp |