diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-18 12:40:46 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-19 09:57:52 (GMT) |
| commit | 4542e8dbc2aeb942a8c963724c02da5220deef4f (patch) | |
| tree | d5796315dd3b81812c7a76b4e24c6ce381f62e8d /src/corelib | |
| parent | b45f6f856fe72629e2e0752fc8732de487278f41 (diff) | |
| download | Qt-4542e8dbc2aeb942a8c963724c02da5220deef4f.zip Qt-4542e8dbc2aeb942a8c963724c02da5220deef4f.tar.gz Qt-4542e8dbc2aeb942a8c963724c02da5220deef4f.tar.bz2 | |
Enable s60main.rsc infixing.
Now s60main.rsc file is also infixed, making infixed and vanilla builds
indepenendent of each other.
Task-number: QTBUG-9065
Reviewed-by: Shane Kearns
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.cpp | 25 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.h | 9 |
2 files changed, 13 insertions, 21 deletions
diff --git a/src/corelib/kernel/qcore_symbian_p.cpp b/src/corelib/kernel/qcore_symbian_p.cpp index a0a80c8..402eccf 100644 --- a/src/corelib/kernel/qcore_symbian_p.cpp +++ b/src/corelib/kernel/qcore_symbian_p.cpp @@ -132,27 +132,10 @@ 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 + _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"); + TPtrC libName; TInt uidValue; switch (QSysInfo::s60Version()) { diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h index 9f282d5..4a515ce 100644 --- a/src/corelib/kernel/qcore_symbian_p.h +++ b/src/corelib/kernel/qcore_symbian_p.h @@ -60,6 +60,15 @@ #include <qhash.h> #include <f32file.h> +#define QT_LSTRING2(x) L##x +#define QT_LSTRING(x) QT_LSTRING2(x) + +#if defined(QT_LIBINFIX) +# define QT_LIBINFIX_UNICODE QT_LSTRING(QT_LIBINFIX) +#else +# define QT_LIBINFIX_UNICODE L"" +#endif + QT_BEGIN_HEADER QT_BEGIN_NAMESPACE |