diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 13:04:54 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 20:41:34 +0200 |
| commit | 63ec33e79cf86c4312c58bea12a2aab400890c70 (patch) | |
| tree | 5c9b5cd51276ea0a3ca42567666a09e70efa11cc /examples/quick/scenegraph | |
| parent | b9e4a4df577959579b2322fb6077bde82d9ffce3 (diff) | |
| parent | afc84775efdc6e13e2e210bb94e115b378d90134 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/qmltooling/qmldbg_profiler/qqmlprofilerservice.cpp
src/qml/jsruntime/qv4engine.cpp
src/qml/jsruntime/qv4engine_p.h
Change-Id: I89ffccd699bee675732758d039e22224b275d60d
Diffstat (limited to 'examples/quick/scenegraph')
| -rw-r--r-- | examples/quick/scenegraph/graph/graph.pro | 8 | ||||
| -rw-r--r-- | examples/quick/scenegraph/scenegraph.pro | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/examples/quick/scenegraph/graph/graph.pro b/examples/quick/scenegraph/graph/graph.pro index 5991f799dc..1a880b61f1 100644 --- a/examples/quick/scenegraph/graph/graph.pro +++ b/examples/quick/scenegraph/graph/graph.pro @@ -1,9 +1,3 @@ -#------------------------------------------------- -# -# Project created by QtCreator 2013-06-11T13:13:18 -# -#------------------------------------------------- - QT += core gui quick TARGET = graph @@ -32,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 |