diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:34:04 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 06:34:04 +0200 |
commit | afc84775efdc6e13e2e210bb94e115b378d90134 (patch) | |
tree | 24985cc95111ecf2b637019363a32414b95860fe /examples/quick/scenegraph | |
parent | 6371b208a9e55845090dcd34234e314c6587c105 (diff) | |
parent | 72515ebe5a63c201fde09471bc646dbe15110a6b (diff) |
Merge remote-tracking branch 'origin/5.6.1' into 5.6
Change-Id: Ib7f8c60143c1efab279476dba390a3d9837ccc37
Diffstat (limited to 'examples/quick/scenegraph')
-rw-r--r-- | examples/quick/scenegraph/graph/graph.pro | 2 | ||||
-rw-r--r-- | examples/quick/scenegraph/scenegraph.pro | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/examples/quick/scenegraph/graph/graph.pro b/examples/quick/scenegraph/graph/graph.pro index dd77d76e4f..1a880b61f1 100644 --- a/examples/quick/scenegraph/graph/graph.pro +++ b/examples/quick/scenegraph/graph/graph.pro @@ -26,3 +26,5 @@ OTHER_FILES += \ shaders/line.fsh \ shaders/line.vsh +target.path = $$[QT_INSTALL_EXAMPLES]/quick/scenegraph/graph +INSTALLS += target diff --git a/examples/quick/scenegraph/scenegraph.pro b/examples/quick/scenegraph/scenegraph.pro index 1e7e74372d..cf50cdb903 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -1,6 +1,7 @@ TEMPLATE = subdirs SUBDIRS += \ customgeometry \ + graph \ openglunderqml \ sgengine \ simplematerial \ @@ -8,3 +9,6 @@ SUBDIRS += \ textureinthread \ threadedanimation \ twotextureproviders + +EXAMPLE_FILES += \ + shared |