diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-10-01 17:53:25 (GMT) |
| commit | 4cdaadb332a49513d6082b6ea723dc1968b3ad30 (patch) | |
| tree | fbcbf013e29ad3e4c718dca5ca2dc25d2f9498ff /src/corelib/global | |
| parent | 7799c68a964dd9a26cc98fa4b810fce7cc333e27 (diff) | |
| parent | 5d95b43762a16a37a20b3288c74976f6e62075d3 (diff) | |
| download | Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.zip Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.gz Qt-4cdaadb332a49513d6082b6ea723dc1968b3ad30.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qglobal.h | 1 |
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 |