diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /examples/declarative/qtquick1.pro | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
| download | qtdeclarative-animation-refactor.tar.gz | |
Merge branch 'master' into animation-refactorwip/animation-refactoranimation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'examples/declarative/qtquick1.pro')
| -rw-r--r-- | examples/declarative/qtquick1.pro | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/examples/declarative/qtquick1.pro b/examples/declarative/qtquick1.pro index e441d85eca..a04969bdc3 100644 --- a/examples/declarative/qtquick1.pro +++ b/examples/declarative/qtquick1.pro @@ -9,9 +9,6 @@ SUBDIRS = \ # OpenGL shader examples requires opengl and they contain some C++ and need to be built contains(QT_CONFIG, opengl): SUBDIRS += shadereffects -# plugins uses a 'Time' class that conflicts with symbian e32std.h also defining a class of the same name -symbian:SUBDIRS -= plugins - # These examples contain no C++ and can simply be copied sources.files = \ animation \ |