diff options
| author | Martin Smith <msmith@trolltech.com> | 2009-05-11 13:37:01 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2009-05-11 13:37:01 (GMT) |
| commit | 0e39de7aa9b081ad63a6f3b423841dd22a7293e6 (patch) | |
| tree | 05fc9d0a236067b71ef8ca44313fc8ceb9bcfea7 /src/3rdparty | |
| parent | 27d2f348792be0e08e204896dad8f3d80f51d80b (diff) | |
| parent | 1d09e9cfd77d398788b6a31eb8c07ca2ac6fa9a8 (diff) | |
| download | Qt-0e39de7aa9b081ad63a6f3b423841dd22a7293e6.zip Qt-0e39de7aa9b081ad63a6f3b423841dd22a7293e6.tar.gz Qt-0e39de7aa9b081ad63a6f3b423841dd22a7293e6.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/phonon/phononnamespace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/3rdparty/phonon/phonon/phononnamespace.h b/src/3rdparty/phonon/phonon/phononnamespace.h index 0bbf4f4..2492ee6 100644 --- a/src/3rdparty/phonon/phonon/phononnamespace.h +++ b/src/3rdparty/phonon/phonon/phononnamespace.h @@ -25,6 +25,11 @@ #include "phonon_export.h" +#ifdef __QT_SYNCQT__ +// Tell syncqt to create a "Global" header here +#pragma qt_class(Phonon::Global) +#endif + /** * Helper macro that can be used like * \code |