--- a/tools/qtconfig/mainwindow.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/tools/qtconfig/mainwindow.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -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 @@
     audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
     audiosinkCombo->setItemData(audiosinkCombo->findText(tr("aRts")),
                                 tr("Experimental aRts support for GStreamer."), Qt::ToolTipRole);
+#ifdef HAVE_PHONON
+    phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
+#endif
 #ifndef QT_NO_GSTREAMER
-    phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
     if (gst_init_check(0, 0, 0)) {
         gchar *versionString = gst_version_string();
         gstversionLabel->setText(QLatin1String(versionString));
@@ -428,7 +432,7 @@
 #endif
 #ifndef QT_NO_OPENGL
     videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
-    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if avaiable"), Qt::ToolTipRole);
+    videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if available"), Qt::ToolTipRole);
 #endif
     videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
     videomodeCombo->setItemData(videomodeCombo->findText(tr("Software")), tr("Use simple software rendering"), Qt::ToolTipRole);