diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 09:58:13 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-02 10:32:33 +0200 |
| commit | 41e924eb6e1c690bc81d095fc5e8f57244aae964 (patch) | |
| tree | b459dfa150530443901be68471df88c69ca7a7d4 /examples/quick/demos/demos.pro | |
| parent | d51afdb74fdcb9a5c7e1fdaa763325c78d794d06 (diff) | |
| parent | 87a5889029aed8c53a4b02a42804d036614db36b (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
examples/quick/scenegraph/openglunderqml/squircle.h
src/quick/doc/src/qmltypereference.qdoc
src/quick/scenegraph/qsgthreadedrenderloop.cpp
Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
Diffstat (limited to 'examples/quick/demos/demos.pro')
| -rw-r--r-- | examples/quick/demos/demos.pro | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/examples/quick/demos/demos.pro b/examples/quick/demos/demos.pro index ac15cc3c1f..9aac7bf6f7 100644 --- a/examples/quick/demos/demos.pro +++ b/examples/quick/demos/demos.pro @@ -7,6 +7,7 @@ SUBDIRS = samegame \ photosurface \ stocqt +qtHaveModule(xmlpatterns): SUBDIRS += rssnews + EXAMPLE_FILES = \ - photoviewer \ - rssnews + photoviewer |