diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-19 08:59:39 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-10-29 16:00:10 (GMT) |
| commit | e55810dc838e95c60a275f1ea3be3bb6bb93fb83 (patch) | |
| tree | b338015e25fdd2c87bbdee7d8600df0a6454d5c1 /src/3rdparty | |
| parent | 7246b5a5942049b485bfdefbe133d7bb12165301 (diff) | |
| download | Qt-e55810dc838e95c60a275f1ea3be3bb6bb93fb83.zip Qt-e55810dc838e95c60a275f1ea3be3bb6bb93fb83.tar.gz Qt-e55810dc838e95c60a275f1ea3be3bb6bb93fb83.tar.bz2 | |
Fix QT_NO_PROPERTIES
However, there are some stuff added to qscript that I'm really not sure
about.
Reviewed-by: tom
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/phonon/gstreamer/backend.cpp | 3 | ||||
| -rw-r--r-- | src/3rdparty/phonon/phonon/factory.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/3rdparty/phonon/gstreamer/backend.cpp b/src/3rdparty/phonon/gstreamer/backend.cpp index b285fd9..647bb6f 100644 --- a/src/3rdparty/phonon/gstreamer/backend.cpp +++ b/src/3rdparty/phonon/gstreamer/backend.cpp @@ -55,12 +55,13 @@ Backend::Backend(QObject *parent, const QVariantList &) g_error_free(err); qRegisterMetaType<Message>("Message"); - +#ifndef QT_NO_PROPERTIES setProperty("identifier", QLatin1String("phonon_gstreamer")); setProperty("backendName", QLatin1String("Gstreamer")); setProperty("backendComment", QLatin1String("Gstreamer plugin for Phonon")); setProperty("backendVersion", QLatin1String("0.2")); setProperty("backendWebsite", QLatin1String("http://qt.nokia.com/")); +#endif //QT_NO_PROPERTIES //check if we should enable debug output QString debugLevelString = qgetenv("PHONON_GST_DEBUG"); diff --git a/src/3rdparty/phonon/phonon/factory.cpp b/src/3rdparty/phonon/phonon/factory.cpp index e5adb490..881aca3 100644 --- a/src/3rdparty/phonon/phonon/factory.cpp +++ b/src/3rdparty/phonon/phonon/factory.cpp @@ -443,6 +443,7 @@ QObject *Factory::backend(bool createWhenNull) return globalFactory->m_backendObject; } +#ifndef QT_NO_PROPERTIES #define GET_STRING_PROPERTY(name) \ QString Factory::name() \ { \ @@ -458,7 +459,7 @@ GET_STRING_PROPERTY(backendComment) GET_STRING_PROPERTY(backendVersion) GET_STRING_PROPERTY(backendIcon) GET_STRING_PROPERTY(backendWebsite) - +#endif //QT_NO_PROPERTIES QObject *Factory::registerQObject(QObject *o) { if (o) { |