summaryrefslogtreecommitdiffstats
path: root/examples/examples.pro
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire.ecortex@kdab.com>2014-12-29 16:10:48 +0100
committerSean Harmer <sean.harmer@kdab.com>2014-12-31 11:23:49 +0100
commitbee25daf9efaa688a6954a5b31a07c51db49b8ba (patch)
tree5bc3f2982689c8908c9fbe440eff36cd1d15f6a1 /examples/examples.pro
parent2be97a74b23c66d385b1dd89df106c9be7be7696 (diff)
Default cpp materials + material-cpp example
QDiffuseMapMaterial QDiffuseSpecularMapMaterial QNormalDiffuseMapMaterial QNormalDiffuseAlphaMapMaterial QNormalDiffuseSpecularMapMaterial material-cpp is mostly inspired from materials (QML) but nicer :). Note: there seems to be an issue with qrc and QUrl. The behavior is different between QML and C++. -In C++ we need to prefix with have qrc:/ and convert that to :/ (passing :/ directly returns "" when QUrl toString is called) -From QML no prefix is needed. -For QImage path, :/ should be used. Change-Id: Ib56fb9546c95c2872686a46ed048a290ab4a5b6f Task-number: QTBUG-41548 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/examples.pro')
-rw-r--r--examples/examples.pro3
1 files changed, 2 insertions, 1 deletions
diff --git a/examples/examples.pro b/examples/examples.pro
index b94e16331..359b38eab 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -23,7 +23,8 @@ SUBDIRS += \
materials \
keyboardinput-qml \
loader-qml \
- wave
+ wave \
+ materials-cpp
# TODO Port the old examples to new APIs
#SUBDIRS += qt3d