diff options
| author | Sami Merila <sami.merila@nokia.com> | 2010-09-09 11:37:41 (GMT) |
|---|---|---|
| committer | Sami Merila <sami.merila@nokia.com> | 2010-09-09 11:37:41 (GMT) |
| commit | 46e1644028a75b9f8f13945915b350b3d3ece070 (patch) | |
| tree | 3046e84a3e23396e4509c68ff2352d78e4f9043e | |
| parent | 8ed2b25f87bc632d0e7d375c3506fab1c59ca1a2 (diff) | |
| parent | 9d1361ab3affe34f1c3a08d3e4b83bd4e2c89eb8 (diff) | |
| download | Qt-46e1644028a75b9f8f13945915b350b3d3ece070.zip Qt-46e1644028a75b9f8f13945915b350b3d3ece070.tar.gz Qt-46e1644028a75b9f8f13945915b350b3d3ece070.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp index 5afde9a..66296b0 100644 --- a/src/corelib/kernel/qcore_symbian_p.cpp +++ b/src/corelib/kernel/qcore_symbian_p.cpp @@ -131,7 +131,6 @@ public: private: void init() { -#ifdef Q_OS_SYMBIAN _LIT(KLibName_3_1, "qts60plugin_3_1" QT_LIBINFIX_UNICODE L".dll"); _LIT(KLibName_3_2, "qts60plugin_3_2" QT_LIBINFIX_UNICODE L".dll"); _LIT(KLibName_5_0, "qts60plugin_5_0" QT_LIBINFIX_UNICODE L".dll"); @@ -157,7 +156,12 @@ private: TUidType libUid(KDynamicLibraryUid, KSharedLibraryUid, TUid::Uid(uidValue)); lib.Load(libName, libUid); -#endif + + // Duplicate lib handle to enable process wide access to it. Since Duplicate overwrites + // existing handle without closing it, store original for subsequent closing. + RLibrary origHandleCloser = lib; + lib.Duplicate(RThread(), EOwnerProcess); + origHandleCloser.Close(); } RLibrary lib; |