diff options
| author | Shane Kearns <shane.kearns@sosco.com> | 2009-10-07 16:29:18 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@sosco.com> | 2009-10-07 16:29:18 (GMT) |
| commit | f48432eb47eb37aa362e4da44888b718cdb3a841 (patch) | |
| tree | 4acc0b065244542591036751456a9d1e38105850 /src/3rdparty | |
| parent | db182f75b69cd47ce8abbcc5acb2551306919a05 (diff) | |
| download | Qt-f48432eb47eb37aa362e4da44888b718cdb3a841.zip Qt-f48432eb47eb37aa362e4da44888b718cdb3a841.tar.gz Qt-f48432eb47eb37aa362e4da44888b718cdb3a841.tar.bz2 | |
Revert "Fix linker error with Symbian/ARM RVCT ABIv2 toolchain"
This reverts commit 342fcb287b09d016d482e25482ddd1b36e2983a3.
Didn't work on all compilers
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel.h | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h index 9af2615..ba3cb42 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h @@ -175,18 +175,26 @@ namespace Phonon * \author Matthias Kretz <kretz@kde.org> */ template<ObjectDescriptionType type> - class PHONON_EXPORT ObjectDescriptionModel : public QAbstractListModel + class ObjectDescriptionModel : public QAbstractListModel { public: Q_OBJECT_CHECK +/* MinGW 3.4.x gives an ICE when trying to instantiate one of the + ObjectDescriptionModel<foo> classes because it can't handle + half exported classes correct. gcc 4.3.x has a fix for this but + we currently there's no official gcc 4.3 on windows available. + Because of this we need this little hack + */ +#if !defined(Q_CC_MINGW) || __MINGW32_MAJOR_VERSION >= 4 /** \internal */ - static const QMetaObject staticMetaObject; + static PHONON_EXPORT const QMetaObject staticMetaObject; /** \internal */ - const QMetaObject *metaObject() const; + PHONON_EXPORT const QMetaObject *metaObject() const; /** \internal */ - void *qt_metacast(const char *_clname); + PHONON_EXPORT void *qt_metacast(const char *_clname); //int qt_metacall(QMetaObject::Call _c, int _id, void **_a); +#endif /** * Returns the number of rows in the model. This value corresponds |