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/quick.pro | |
| 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/quick.pro')
| -rw-r--r-- | examples/quick/quick.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro index e66e24882e..63730e53da 100644 --- a/examples/quick/quick.pro +++ b/examples/quick/quick.pro @@ -16,6 +16,7 @@ SUBDIRS = quick-accessibility \ scenegraph \ shadereffects \ text \ + textureprovider \ threading \ touchinteraction \ tutorials \ |