diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-04 10:01:11 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-04 15:05:32 (GMT) |
| commit | 7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4 (patch) | |
| tree | 257aff339b29f8dc9dbdcff009588dd3d7fe1909 /src/3rdparty/phonon | |
| parent | d6c9b45f5979d6b99b1078db38d6ae402fb4332c (diff) | |
| download | Qt-7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4.zip Qt-7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4.tar.gz Qt-7992ea34f9f1ed67d4e44f43c3a8133ae5aa3ac4.tar.bz2 | |
Attempt at fixing Phonon build issue on Symbian.
Why, why did someone think that template QObjects with partially
exported symbols was a good idea?
Reviewed-by: Trust Me
Diffstat (limited to 'src/3rdparty/phonon')
| -rw-r--r-- | src/3rdparty/phonon/phonon/objectdescriptionmodel.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h index a1540e8..b71daf4 100644 --- a/src/3rdparty/phonon/phonon/objectdescriptionmodel.h +++ b/src/3rdparty/phonon/phonon/objectdescriptionmodel.h @@ -37,11 +37,13 @@ QT_BEGIN_NAMESPACE /* 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. + half exported classes correct. gcc 4.3.x has a fix for this. + The problem also appears on Symbian with gcce. + Because of this we need this little hack */ -#if defined(Q_CC_MINGW) +#if defined(Q_CC_GNU) && (defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN)) && \ + ((__GNUC__ * 100 + __GNUC_MINOR__) < 403) #define PHONON_EXPORT_ODM #else #define PHONON_EXPORT_ODM PHONON_EXPORT |