objectdescriptionmodel.h   objectdescriptionmodel.h 
skipping to change at line 141 skipping to change at line 141
ObjectDescriptionModelData(QAbstractListModel *); ObjectDescriptionModelData(QAbstractListModel *);
protected: protected:
~ObjectDescriptionModelData(); ~ObjectDescriptionModelData();
//ObjectDescriptionModelData(ObjectDescriptionModelDataPrivate *dd); //ObjectDescriptionModelData(ObjectDescriptionModelDataPrivate *dd);
ObjectDescriptionModelDataPrivate *const d; ObjectDescriptionModelDataPrivate *const d;
}; };
/* Required to ensure template class vtables are exported on both symbian /* Required to ensure template class vtables are exported on both symbian
and existing builds. */ and existing builds. */
#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT) || defined(Q_CC_CLANG) #if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)
// RVCT compiler (2.2.686) requires the export declaration to be on the cla ss to export vtables // RVCT compiler (2.2.686) requires the export declaration to be on the cla ss to export vtables
// MWC compiler works both ways // MWC compiler works both ways
// GCCE compiler is unknown (it can't compile QtCore yet) // GCCE compiler is unknown (it can't compile QtCore yet)
// Clang also requires the export declaration to be on the class to export vtables
#define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT #define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT
#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT #define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT
#else #else
// Windows builds (at least) do not support export declaration on templated class // Windows builds (at least) do not support export declaration on templated class
// But if you export a member function, the vtable is implicitly exported // But if you export a member function, the vtable is implicitly exported
#define PHONON_TEMPLATE_CLASS_EXPORT #define PHONON_TEMPLATE_CLASS_EXPORT
#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT PHONON_EXPORT #define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT PHONON_EXPORT
#endif #endif
/** \class ObjectDescriptionModel objectdescriptionmodel.h Phonon/Objec tDescriptionModel /** \class ObjectDescriptionModel objectdescriptionmodel.h Phonon/Objec tDescriptionModel
 End of changes. 2 change blocks. 
2 lines changed or deleted 1 lines changed or added


 phononnamespace.h   phononnamespace.h 
skipping to change at line 39 skipping to change at line 39
* Helper macro that can be used like * Helper macro that can be used like
* \code * \code
* #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0)) * #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0))
* \endcode * \endcode
*/ */
#define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|( patch)) #define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|( patch))
/** /**
* PHONON_VERSION is (major << 16) + (minor << 8) + patch. * PHONON_VERSION is (major << 16) + (minor << 8) + patch.
*/ */
#define PHONON_VERSION PHONON_VERSION_CHECK(4, 8, 1) #define PHONON_VERSION PHONON_VERSION_CHECK(4, 8, 2)
/** /**
* PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1" * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
*/ */
#define PHONON_VERSION_STR "4.8.1" #define PHONON_VERSION_STR "4.8.2"
/** /**
* Definitions to disable capture - should end up in the backends and * Definitions to disable capture - should end up in the backends and
* platform plugins, too * platform plugins, too
*/ */
/* #undef PHONON_NO_CAPTURE */ /* #undef PHONON_NO_CAPTURE */
#ifdef PHONON_NO_CAPTURE #ifdef PHONON_NO_CAPTURE
#define PHONON_NO_VIDEOCAPTURE #define PHONON_NO_VIDEOCAPTURE
#define PHONON_NO_AUDIOCAPTURE #define PHONON_NO_AUDIOCAPTURE
#endif #endif
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/