summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-01 18:18:42 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-01 18:18:42 (GMT)
commit8603b43cccccf21ca042ab1ceed2f1ddd873d251 (patch)
treee9c8fd832f99454601fb82d589bbf4da3af48c42 /examples
parentc272d672fc1863f9e3a201e93ad277c734749845 (diff)
parenta0899310206f38b2ab959f29a1093246a25f5fb3 (diff)
downloadQt-8603b43cccccf21ca042ab1ceed2f1ddd873d251.zip
Qt-8603b43cccccf21ca042ab1ceed2f1ddd873d251.tar.gz
Qt-8603b43cccccf21ca042ab1ceed2f1ddd873d251.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix regression on Symbian Fix broken test case Cleanup the deployment code Fix 'make sis' finding the dll on symbian Re-add line that was lost during webkit update. Work around bad naming of exported class in symbian sdk causing conflict Fix building on public symbian SDK. Fix qmake with the symbian makespec failing when project has a dash in it Make s60main static lib not depend on QtCore Remove stray non-latin1 character Fix out-of-source symbian build for external apps Update EABI def files for 4.7 Exporting QFontDatabase::removeAllApplicationFonts() Adding QFontDatabase::removeAllApplicationFonts()
Diffstat (limited to 'examples')
-rw-r--r--examples/declarative/declarative.pro3
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/declarative/declarative.pro b/examples/declarative/declarative.pro
index 5fc1cf0..db776b3 100644
--- a/examples/declarative/declarative.pro
+++ b/examples/declarative/declarative.pro
@@ -8,6 +8,9 @@ SUBDIRS = \
plugins \
widgets
+# 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 = \
animations \