summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-03-30 17:36:46 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-03-30 17:36:46 (GMT)
commit7e3df09fea0d3177d07f0262d034065e90eb3263 (patch)
tree6e2a885ca9c1070193e687c5633a15efa3f89696
parent328e75ba8abe51cc8e296975513ca6e882df5a1b (diff)
downloadQt-7e3df09fea0d3177d07f0262d034065e90eb3263.zip
Qt-7e3df09fea0d3177d07f0262d034065e90eb3263.tar.gz
Qt-7e3df09fea0d3177d07f0262d034065e90eb3263.tar.bz2
Work around bad naming of exported class in symbian sdk causing conflict
The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over.
-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 bddfbee..1c53e28 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 \