diff options
| author | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 21:26:33 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@theqtcompany.com> | 2016-05-24 21:50:29 +0200 |
| commit | 0837453ef90f5d5f569702aa1c7620648dae2c00 (patch) | |
| tree | 43a35f937dfcca3f467d4deafe2800d01f0859da /examples/quick/scenegraph | |
| parent | 9ff09fb283cd130fb717769b44f54bfbb28efd8a (diff) | |
| parent | 0ba6dffd96a0dda8e3938b09395075c19e46644b (diff) | |
Merge remote-tracking branch 'origin/dev' into HEAD
Change-Id: If91e0e28d004f1db978dcab393f189743bb69cd5
Diffstat (limited to 'examples/quick/scenegraph')
| -rw-r--r-- | examples/quick/scenegraph/graph/graph.pro | 8 | ||||
| -rw-r--r-- | examples/quick/scenegraph/scenegraph.pro | 5 |
2 files changed, 7 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 309624511c..1015d7be3d 100644 --- a/examples/quick/scenegraph/scenegraph.pro +++ b/examples/quick/scenegraph/scenegraph.pro @@ -2,10 +2,12 @@ TEMPLATE = subdirs contains(QT_CONFIG, opengl(es1|es2)?) { SUBDIRS += \ + graph \ simplematerial \ sgengine \ textureinsgnode \ openglunderqml \ + textureinsgnode \ textureinthread \ twotextureproviders } @@ -14,3 +16,6 @@ SUBDIRS += \ customgeometry \ rendernode \ threadedanimation + +EXAMPLE_FILES += \ + shared |