diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-23 23:15:25 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2010-02-23 23:22:23 (GMT) |
| commit | bdd232ad066c9b1c5e2ba85a4b14e410f82b77e5 (patch) | |
| tree | 7d5d178b5630e0c355633f7afb8e9b06dfafd0c8 /tools | |
| parent | 0f20bdc28458b147cb177b1d45dc06a75ab3b7b9 (diff) | |
| download | Qt-bdd232ad066c9b1c5e2ba85a4b14e410f82b77e5.zip Qt-bdd232ad066c9b1c5e2ba85a4b14e410f82b77e5.tar.gz Qt-bdd232ad066c9b1c5e2ba85a4b14e410f82b77e5.tar.bz2 | |
Separate Phonon and gstreamer defines in qtconfig
Reviewed-by: Justin McPherson
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qtconfig/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | tools/qtconfig/qtconfig.pro | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 604b1f4..0de4b43 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -68,6 +68,8 @@ #ifndef QT_NO_GSTREAMER #include <gst/gst.h> +#endif +#ifdef HAVE_PHONON #include <phonon/phononnamespace.h> #endif @@ -387,8 +389,10 @@ MainWindow::MainWindow() audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink")); audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")), tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole); -#ifndef QT_NO_GSTREAMER +#ifdef HAVE_PHONON phononVersionLabel->setText(QLatin1String(Phonon::phononVersion())); +#endif +#ifndef QT_NO_GSTREAMER if (gst_init_check(0, 0, 0)) { gchar *versionString = gst_version_string(); gstversionLabel->setText(QLatin1String(versionString)); diff --git a/tools/qtconfig/qtconfig.pro b/tools/qtconfig/qtconfig.pro index 8ab3f03..d1fd320 100644 --- a/tools/qtconfig/qtconfig.pro +++ b/tools/qtconfig/qtconfig.pro @@ -9,7 +9,10 @@ QT += qt3support contains(QT_CONFIG, gstreamer):LIBS += $$QT_LIBS_GSTREAMER -lgstinterfaces-0.10 -lgstvideo-0.10 -lgstbase-0.10 contains(QT_CONFIG, gstreamer):QMAKE_CXXFLAGS += $$QT_CFLAGS_GSTREAMER -contains(QT_CONFIG, gstreamer):QT += phonon +contains(QT_CONFIG, phonon) { + QT += phonon + DEFINES += HAVE_PHONON +} SOURCES += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp \ mainwindowbase.cpp paletteeditoradvancedbase.cpp previewwidgetbase.cpp HEADERS += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h \ |