diff options
| author | axis <qt-info@nokia.com> | 2009-05-18 12:25:08 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-05-18 12:25:08 (GMT) |
| commit | 6e81bfbaf69864a06240835e0b30cdc47a2668b7 (patch) | |
| tree | aff37bf74549836696d420477e57f51969e97091 /src/3rdparty | |
| parent | 3e5abb158c1924e555dc4142c4be89adc517b8c1 (diff) | |
| parent | 7008bfe80e0466ed2978b39e7e698bbd52fb690f (diff) | |
| download | Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.zip Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.tar.gz Qt-6e81bfbaf69864a06240835e0b30cdc47a2668b7.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
configure.exe
src/corelib/kernel/qcoreapplication.cpp
Configure.exe not rebuilt because the changes are irrelevant for the
S60 port. We'll rebuild it before merging back.
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 |