diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 02:11:37 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-12-23 02:11:37 +1000 |
| commit | be8ad40ff0594118a5f5a883fcfff35e28c21a30 (patch) | |
| tree | 19e737407a2912c645168b1ff287225e6f80e5b7 /src | |
| parent | 03a6cb097a68f12a4169549cc6b83a09549d267f (diff) | |
| parent | 462f5148a3be5835cc8d5b69685473042789c917 (diff) | |
| download | qt4-tools-be8ad40ff0594118a5f5a883fcfff35e28c21a30.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix infinite loop in qmake when reading malformed .ts files.
Fix libinfixed usage in Symbian when def files are used
Diffstat (limited to 'src')
| -rw-r--r-- | src/s60main/newallocator_hook.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/src/s60main/newallocator_hook.cpp b/src/s60main/newallocator_hook.cpp index 9ea2ef0962..3e259c21f8 100644 --- a/src/s60main/newallocator_hook.cpp +++ b/src/s60main/newallocator_hook.cpp @@ -69,6 +69,16 @@ TInt UserHeap::SetupThreadHeap(TBool aNotFirst, SStdEpocThreadCreateInfo& aInfo) // So the function is found and called dynamically, by library lookup. If it is not found, we // use the OS allocator creation functions instead. +#if defined(QT_LIBINFIX) +# define QT_LSTRING2(x) L##x +# define QT_LSTRING(x) QT_LSTRING2(x) +# define QT_LIBINFIX_UNICODE QT_LSTRING(QT_LIBINFIX) +#else +# define QT_LIBINFIX_UNICODE L"" +#endif + +_LIT(QtCoreLibName, "qtcore" QT_LIBINFIX_UNICODE L".dll"); + struct SThreadCreateInfo { TAny* iHandle; @@ -106,7 +116,7 @@ TInt UserHeap::SetupThreadHeap(TBool aNotFirst, SStdEpocThreadCreateInfo& aInfo) #ifndef __WINS__ // attempt to create the fast allocator through a known export ordinal in qtcore.dll RLibrary qtcore; - if (qtcore.Load(_L("qtcore.dll")) == KErrNone) + if (qtcore.Load(QtCoreLibName) == KErrNone) { const int qt_symbian_SetupThreadHeap_eabi_ordinal = 3713; TLibraryFunction libFunc = qtcore.Lookup(qt_symbian_SetupThreadHeap_eabi_ordinal); |