summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorSami Merilä <sami.merila@nokia.com>2009-10-16 12:49:20 (GMT)
committerSami Merilä <sami.merila@nokia.com>2009-10-16 12:49:20 (GMT)
commit701c8a61f81cd691a071fce90f9c4c138edbfcf9 (patch)
treeae8c7d3eb06284e55f5ab57f1c5634fae14022fa /src/corelib
parent25f4ccc3a9de2e4610974540f88c331238218c72 (diff)
parent0f8bff1970d4b0f10e98ce7d6ab341620f4ce76b (diff)
downloadQt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.zip
Qt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.tar.gz
Qt-701c8a61f81cd691a071fce90f9c4c138edbfcf9.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qnamespace.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index ad4bc55..f28f94e 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -44,10 +44,6 @@
#include <QtCore/qglobal.h>
-#ifdef Q_OS_SYMBIAN
-# include <e32def.h>
-#endif
-
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE