summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-10 20:30:24 (GMT)
committerGareth Stockwell <ext-gareth.stockwell@nokia.com>2010-02-18 16:34:25 (GMT)
commit35f7b0803ea9f43981370aff0da4f4d06c248396 (patch)
tree7cb909239f721f6ebcb77535cfa05de1c52fa55a /src/corelib
parentea34fbde76a0407dc4a9bb9f4a3140c4764ca6ba (diff)
downloadQt-35f7b0803ea9f43981370aff0da4f4d06c248396.zip
Qt-35f7b0803ea9f43981370aff0da4f4d06c248396.tar.gz
Qt-35f7b0803ea9f43981370aff0da4f4d06c248396.tar.bz2
Added implementation of epocRoot() function to configure
Exposing epocRoot() to the configure application allows it to determine the location of the currently active Symbian SDK, so that support for optional SDK features can be checked. Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/xml/qxmlstream_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/xml/qxmlstream_p.h b/src/corelib/xml/qxmlstream_p.h
index 6b911d2..ac421cf 100644
--- a/src/corelib/xml/qxmlstream_p.h
+++ b/src/corelib/xml/qxmlstream_p.h
@@ -54,7 +54,7 @@
#ifndef QXMLSTREAM_P_H
#define QXMLSTREAM_P_H
-#if defined(Q_OS_VXWORKS) && defined(ERROR)
+#if defined(ERROR)
# undef ERROR
#endif