diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 12:59:59 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-18 12:59:59 (GMT) |
| commit | f661bb26dc3b30c3d5113a56885bbe07b90fd3ce (patch) | |
| tree | 4bfe6009988079c6cfcd6b8c23a1c6576dce5912 /src/corelib | |
| parent | 603a8501e0e203ecd6075b19be3bccb11f16ee88 (diff) | |
| parent | 8ae6867b82bfdc391dab6d97945dea7c7436ef25 (diff) | |
| download | Qt-f661bb26dc3b30c3d5113a56885bbe07b90fd3ce.zip Qt-f661bb26dc3b30c3d5113a56885bbe07b90fd3ce.tar.gz Qt-f661bb26dc3b30c3d5113a56885bbe07b90fd3ce.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Made runonphone flush all application output.
Update configure binary after -libinfix changes for Symbian.
Build OpenVG on Symbian with QVG_RECREATE_ON_SIZE_CHANGE.
Useful support for -qtlibinfix configure parameter in Symbian
Fixed a bug where a proxy widget received FocusIn over and over.
Fixed broken test.
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.cpp | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp index 0257ac4..a0a80c8 100644 --- a/src/corelib/kernel/qcore_symbian_p.cpp +++ b/src/corelib/kernel/qcore_symbian_p.cpp @@ -132,9 +132,27 @@ private: void init() { #ifdef Q_WS_S60 +# if defined(QT_LIBINFIX) +# define S60_LIBNAME_3_1 "qts60plugin_3_1" QT_LIBINFIX ".dll" +# define S60_LIBNAME_3_2 "qts60plugin_3_2" QT_LIBINFIX ".dll" +# define S60_LIBNAME_5_0 "qts60plugin_5_0" QT_LIBINFIX ".dll" + + TPtrC8 ptrLibName_3_1(reinterpret_cast<const TUint8 *>(S60_LIBNAME_3_1)); + TPtrC8 ptrLibName_3_2(reinterpret_cast<const TUint8 *>(S60_LIBNAME_3_2)); + TPtrC8 ptrLibName_5_0(reinterpret_cast<const TUint8 *>(S60_LIBNAME_5_0)); + + TFileName KLibName_3_1; + TFileName KLibName_3_2; + TFileName KLibName_5_0; + + KLibName_3_1.Copy(ptrLibName_3_1); + KLibName_3_2.Copy(ptrLibName_3_2); + KLibName_5_0.Copy(ptrLibName_5_0); +# else _LIT(KLibName_3_1, "qts60plugin_3_1.dll"); _LIT(KLibName_3_2, "qts60plugin_3_2.dll"); _LIT(KLibName_5_0, "qts60plugin_5_0.dll"); +# endif TPtrC libName; TInt uidValue; switch (QSysInfo::s60Version()) { |