summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-05-11 10:35:53 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-05-11 10:35:53 (GMT)
commita2ccdc36d0e80f7274ed0551c819bedcddc2f4cc (patch)
tree55a19156916f0668770edcec8a479609963d1779 /src/3rdparty
parent540092f4cc35238c258bb6422912d3eb18b26f33 (diff)
parent5299240db14579960358edeebfc72fcef905af13 (diff)
downloadQt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.zip
Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.gz
Qt-a2ccdc36d0e80f7274ed0551c819bedcddc2f4cc.tar.bz2
Merge branch '4.5'
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/phonon/phonon/phononnamespace.h5
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