summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-10-04 14:12:39 (GMT)
commit3ea28c383846a4af67ddd0c7d33dad0537a9972e (patch)
tree901f26b86b820ec4b4fc949ae38b6ce165b386af /src/corelib/global
parent7cc2e423d39c3b519279d21cd3881f1a135913fd (diff)
parentd04664b9da6356d3c97e632fb35e27c6822e0dc9 (diff)
downloadQt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.zip
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.gz
Qt-3ea28c383846a4af67ddd0c7d33dad0537a9972e.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 6ef15d4..35607d5 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2451,7 +2451,6 @@ QT3_SUPPORT Q_CORE_EXPORT const char *qInstallPathSysconf();
#endif
#endif
-
//Symbian does not support data imports from a DLL
#define Q_NO_DATA_RELOCATION