diff options
| author | axis <qt-info@nokia.com> | 2009-08-24 07:04:09 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-24 07:04:09 (GMT) |
| commit | e0105b660d6207e896606a17293d91aa570318f9 (patch) | |
| tree | 43f09dbe5df9347d860914b3ec839bb438ee1db1 /src/corelib | |
| parent | 4abc6e00d1a2eca205640b61f20d4af95ec2a9ab (diff) | |
| parent | 028655065de7f989a35b63bcab583767aba9c048 (diff) | |
| download | Qt-e0105b660d6207e896606a17293d91aa570318f9.zip Qt-e0105b660d6207e896606a17293d91aa570318f9.tar.gz Qt-e0105b660d6207e896606a17293d91aa570318f9.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 | ||||
| -rw-r--r-- | src/corelib/kernel/qcore_symbian_p.h | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7dbbc1b..93cc30f 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1325,6 +1325,12 @@ class QDataStream; # else # define Q_GUI_EXPORT_INLINE inline # endif +#elif defined(Q_CC_RVCT) +// we force RVCT not to export inlines by passing --visibility_inlines_hidden +// so we need to just inline it, rather than exporting and inlining +// note: this affects the contents of the DEF files (ie. these functions do not appear) +# define Q_CORE_EXPORT_INLINE inline +# define Q_GUI_EXPORT_INLINE inline #else # define Q_CORE_EXPORT_INLINE Q_CORE_EXPORT inline # define Q_GUI_EXPORT_INLINE Q_GUI_EXPORT inline diff --git a/src/corelib/kernel/qcore_symbian_p.h b/src/corelib/kernel/qcore_symbian_p.h index 2a81b99..fab7254 100644 --- a/src/corelib/kernel/qcore_symbian_p.h +++ b/src/corelib/kernel/qcore_symbian_p.h @@ -94,6 +94,12 @@ static inline TPtrC qt_QString2TPtrC( const QString& string ) return TPtrC16(static_cast<const TUint16*>(string.utf16()), string.length()); } +/*! + \internal + This class is a wrapper around the Symbian HBufC descriptor class. + It makes sure that the heap allocated HBufC class is freed when it is + destroyed. +*/ class Q_CORE_EXPORT QHBufC { public: |