Merge remote-tracking branch 'origin/stable' into dev

Change-Id: Ie422cd4d1e634ac7bbd37e98b6cdffa2e75ab58e

10 files changed, 63 insertions, 300 deletions

diff --git a/src/linguist/linguist/messageeditorwidgets.cpp b/src/linguist/linguist/messageeditorwidgets.cpp
index 60dfe2140..0850d30bb 100644
--- a/src/linguist/linguist/messageeditorwidgets.cpp
+++ b/src/linguist/linguist/messageeditorwidgets.cpp
@@ -226,7 +226,6 @@ class ButtonWrapper : public QWidget
 public:
     ButtonWrapper(QWidget *wrapee, QWidget *relator) : m_wrapee(wrapee)
     {
-        setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Ignored);
         QBoxLayout *box = new QVBoxLayout;
         box->setMargin(0);
         setLayout(box);
@@ -240,7 +239,7 @@ protected:
     {
         if (event->type() == QEvent::Resize) {
             QWidget *relator = static_cast<QWidget *>(object);
-            setFixedHeight((relator->height() + layout()->spacing() + m_wrapee->height()) / 2);
+            setFixedHeight(relator->height());
         }
         return false;
     }
@@ -334,20 +333,33 @@ void FormMultiWidget::updateLayout()
 
     bool variants = m_multiEnabled && m_label->isEnabled();
 
-    layout->addWidget(m_label, 0, 0, 1, variants ? 3 : 1);
+    layout->addWidget(m_label, 0, 0, 1, variants ? 2 : 1);
+
+    if (variants) {
+        QVBoxLayout *layoutForPlusButtons = new QVBoxLayout;
+        layoutForPlusButtons->setMargin(0);
+        for (int i = 0; i < m_plusButtons.count(); ++i)
+            layoutForPlusButtons->addWidget(m_plusButtons.at(i), Qt::AlignTop);
+        layout->addLayout(layoutForPlusButtons, 1, 0);
+
+        QGridLayout *layoutForLabels = new QGridLayout;
+        layoutForLabels->setMargin(0);
+        layoutForLabels->setRowMinimumHeight(0, m_plusButtons.at(0)->height()/2.0);
+        for (int j = 0; j < m_editors.count(); ++j) {
+            layoutForLabels->addWidget(m_editors.at(j), 1 + j, 0, Qt::AlignVCenter);
+            layoutForLabels->addWidget(m_minusButtons.at(j), 1 + j, 1, Qt::AlignVCenter);
+        }
+        layoutForLabels->setRowMinimumHeight(m_editors.count() + 1, m_plusButtons.at(0)->height()/2.0);
+        layout->addLayout(layoutForLabels, 1, 1);
+    } else {
+        for (int k = 0; k < m_editors.count(); ++k)
+            layout->addWidget(m_editors.at(k), 1 + k, 0, Qt::AlignVCenter);
+    }
 
-    for (int i = 0; i < m_plusButtons.count(); ++i) {
-        if (variants)
-            layout->addWidget(m_plusButtons.at(i), 1 + i * 2, 0, 2, 1, Qt::AlignTop);
+    for (int i = 0; i < m_plusButtons.count(); ++i)
         m_plusButtons.at(i)->setVisible(variants);
-    }
-    for (int j = 0; j < m_minusButtons.count(); ++j) {
-        if (variants)
-            layout->addWidget(m_minusButtons.at(j), 2 + j * 2, 2, 2, 1, Qt::AlignVCenter);
+    for (int j = 0; j < m_minusButtons.count(); ++j)
         m_minusButtons.at(j)->setVisible(variants);
-    }
-    for (int k = 0; k < m_editors.count(); ++k)
-        layout->addWidget(m_editors.at(k), 2 + k * 2, variants ? 1 : 0, 2, 1, Qt::AlignVCenter);
 
     updateGeometry();
 }
diff --git a/src/linguist/lrelease/main.cpp b/src/linguist/lrelease/main.cpp
index 8116616a9..26d9c89ee 100644
--- a/src/linguist/lrelease/main.cpp
+++ b/src/linguist/lrelease/main.cpp
@@ -191,16 +191,14 @@ static bool releaseTsFile(const QString& tsFileName,
     return releaseTranslator(tor, qmFileName, cd, removeIdentical);
 }
 
-static void print(const QString &fileName, int lineNo, int type, const QString &msg)
+static void print(const QString &fileName, int lineNo, const QString &msg)
 {
-    QString pfx = ((type & QMakeHandler::CategoryMask) == QMakeHandler::WarningMessage)
-                  ? QString::fromLatin1("WARNING: ") : QString();
     if (lineNo > 0)
-        printErr(QString::fromLatin1("%1%2:%3: %4\n").arg(pfx, fileName, QString::number(lineNo), msg));
+        printErr(QString::fromLatin1("%1:%2: %3\n").arg(fileName, QString::number(lineNo), msg));
     else if (lineNo)
-        printErr(QString::fromLatin1("%1%2: %3\n").arg(pfx, fileName, msg));
+        printErr(QString::fromLatin1("%1: %2\n").arg(fileName, msg));
     else
-        printErr(QString::fromLatin1("%1%2\n").arg(pfx, msg));
+        printErr(QString::fromLatin1("%1\n").arg(msg));
 }
 
 class EvalHandler : public QMakeHandler {
@@ -208,10 +206,16 @@ public:
     virtual void message(int type, const QString &msg, const QString &fileName, int lineNo)
     {
         if (verbose && (type & CategoryMask) == ErrorMessage)
-            print(fileName, lineNo, type, msg);
+            print(fileName, lineNo, msg);
     }
 
-    virtual void fileMessage(const QString &) {}
+    virtual void fileMessage(int type, const QString &msg)
+    {
+        if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage) {
+            // "Downgrade" errors, as we don't really care for them
+            printErr(QLatin1String("WARNING: ") + msg + QLatin1Char('\n'));
+        }
+    }
 
     virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {}
     virtual void doneWithEval(ProFile *) {}
diff --git a/src/linguist/lupdate/main.cpp b/src/linguist/lupdate/main.cpp
index 0e4abb63d..fe7504857 100644
--- a/src/linguist/lupdate/main.cpp
+++ b/src/linguist/lupdate/main.cpp
@@ -382,27 +382,32 @@ static void updateTsFiles(const Translator &fetchedTor, const QStringList &tsFil
     }
 }
 
-static void print(const QString &fileName, int lineNo, int type, const QString &msg)
+static void print(const QString &fileName, int lineNo, const QString &msg)
 {
-    QString pfx = ((type & QMakeHandler::CategoryMask) == QMakeHandler::WarningMessage)
-                  ? QString::fromLatin1("WARNING: ") : QString();
     if (lineNo > 0)
-        printErr(QString::fromLatin1("%1%2:%3: %4\n").arg(pfx, fileName, QString::number(lineNo), msg));
+        printErr(QString::fromLatin1("%1:%2: %3\n").arg(fileName, QString::number(lineNo), msg));
     else if (lineNo)
-        printErr(QString::fromLatin1("%1%2: %3\n").arg(pfx, fileName, msg));
+        printErr(QString::fromLatin1("%1: %2\n").arg(fileName, msg));
     else
-        printErr(QString::fromLatin1("%1%2\n").arg(pfx, msg));
+        printErr(QString::fromLatin1("%1\n").arg(msg));
 }
 
+
 class EvalHandler : public QMakeHandler {
 public:
     virtual void message(int type, const QString &msg, const QString &fileName, int lineNo)
     {
         if (verbose && (type & CategoryMask) == ErrorMessage)
-            print(fileName, lineNo, type, msg);
+            print(fileName, lineNo, msg);
     }
 
-    virtual void fileMessage(const QString &) {}
+    virtual void fileMessage(int type, const QString &msg)
+    {
+        if (verbose && !(type & CumulativeEvalMessage) && (type & CategoryMask) == ErrorMessage) {
+            // "Downgrade" errors, as we don't really care for them
+            printErr(QLatin1String("WARNING: ") + msg + QLatin1Char('\n'));
+        }
+    }
 
     virtual void aboutToEval(ProFile *, ProFile *, EvalFileType) {}
     virtual void doneWithEval(ProFile *) {}
diff --git a/src/linguist/shared/qmakebuiltins.cpp b/src/linguist/shared/qmakebuiltins.cpp
index 4712df52d..8750b76a9 100644
--- a/src/linguist/shared/qmakebuiltins.cpp
+++ b/src/linguist/shared/qmakebuiltins.cpp
@@ -1360,8 +1360,12 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateBuiltinConditional(
                 fputs(msg.toLatin1().constData(), stderr);
 #endif
             } else {
-                m_handler->fileMessage(fL1S("Project %1: %2")
-                                       .arg(function.toQString(m_tmp1).toUpper(), msg));
+                m_handler->fileMessage(
+                        (func_t == T_ERROR   ? QMakeHandler::ErrorMessage :
+                         func_t == T_WARNING ? QMakeHandler::WarningMessage :
+                                               QMakeHandler::InfoMessage)
+                        | (m_cumulative ? QMakeHandler::CumulativeEvalMessage : 0),
+                        fL1S("Project %1: %2").arg(function.toQString(m_tmp1).toUpper(), msg));
             }
         }
         return (func_t == T_ERROR && !m_cumulative) ? ReturnError : ReturnTrue;
diff --git a/src/linguist/shared/qmakeevaluator.cpp b/src/linguist/shared/qmakeevaluator.cpp
index 8cbd7b9d5..4d4a1e84f 100644
--- a/src/linguist/shared/qmakeevaluator.cpp
+++ b/src/linguist/shared/qmakeevaluator.cpp
@@ -1287,7 +1287,7 @@ QMakeEvaluator::VisitReturn QMakeEvaluator::evaluateConfigFeatures()
                 config.detach();
                 processed.insert(config);
                 VisitReturn vr = evaluateFeatureFile(config, true);
-                if (vr == ReturnError)
+                if (vr == ReturnError && !m_cumulative)
                     return vr;
                 if (vr == ReturnTrue) {
                     finished = false;
diff --git a/src/linguist/shared/qmakeevaluator.h b/src/linguist/shared/qmakeevaluator.h
index 13198c389..8a107223a 100644
--- a/src/linguist/shared/qmakeevaluator.h
+++ b/src/linguist/shared/qmakeevaluator.h
@@ -73,6 +73,8 @@ public:
     enum {
         SourceEvaluator = 0x10,
 
+        CumulativeEvalMessage = 0x1000,
+
         EvalWarnLanguage = SourceEvaluator |  WarningMessage | WarnLanguage,
         EvalWarnDeprecated = SourceEvaluator | WarningMessage | WarnDeprecated,
 
@@ -80,7 +82,7 @@ public:
     };
 
     // error(), warning() and message() from .pro file
-    virtual void fileMessage(const QString &msg) = 0;
+    virtual void fileMessage(int type, const QString &msg) = 0;
 
     enum EvalFileType { EvalProjectFile, EvalIncludeFile, EvalConfigFile, EvalFeatureFile, EvalAuxFile };
     virtual void aboutToEval(ProFile *parent, ProFile *proFile, EvalFileType type) = 0;
diff --git a/src/linguist/shared/qmakeparser.h b/src/linguist/shared/qmakeparser.h
index dd55659d8..15897cffe 100644
--- a/src/linguist/shared/qmakeparser.h
+++ b/src/linguist/shared/qmakeparser.h
@@ -58,8 +58,9 @@ class QMAKE_EXPORT QMakeParserHandler
 public:
     enum {
         CategoryMask = 0xf00,
-        WarningMessage = 0x000,
-        ErrorMessage = 0x100,
+        InfoMessage = 0x100,
+        WarningMessage = 0x200,
+        ErrorMessage = 0x300,
 
         SourceMask = 0xf0,
         SourceParser = 0,
diff --git a/src/qtconfig/mainwindow.cpp b/src/qtconfig/mainwindow.cpp
index 90a50e382..0d69044a9 100644
--- a/src/qtconfig/mainwindow.cpp
+++ b/src/qtconfig/mainwindow.cpp
@@ -67,13 +67,6 @@
 
 #include <stdlib.h>
 
-#ifndef QT_NO_GSTREAMER
-#include <gst/gst.h>
-#endif
-#ifdef HAVE_PHONON
-#include <phonon/phononnamespace.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 // from qapplication.cpp and qapplication_x11.cpp - These are NOT for
@@ -146,14 +139,6 @@ static const char *printer_text = QT_TRANSLATE_NOOP("MainWindow",
 "Qt should search for embeddable font files.  By default, the X "
 "server font path is used.");
 
-static const char *phonon_text = QT_TRANSLATE_NOOP("MainWindow",
-"<p><b><font size+=2>Phonon</font></b></p>"
-"<hr>"
-"<p>Use this tab to configure the Phonon GStreamer multimedia backend. "
-"<p>It is reccommended to leave all settings on \"Auto\" to let "
-"Phonon determine your settings automatically.");
-
-
 QPalette::ColorGroup MainWindow::groupFromIndex(int item)
 {
     switch (item) {
@@ -211,8 +196,6 @@ MainWindow::MainWindow()
     connect(ui->wheelScrollLinesSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
     connect(ui->menuEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
     connect(ui->comboEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->audiosinkCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
-    connect(ui->videomodeCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
     connect(ui->toolTipEffectCombo, SIGNAL(activated(int)), SLOT(somethingModified()));
     connect(ui->strutWidthSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
     connect(ui->strutHeightSpinBox, SIGNAL(valueChanged(int)), SLOT(somethingModified()));
@@ -417,72 +400,6 @@ MainWindow::MainWindow()
     fontpaths = settings.value(QLatin1String("fontPath")).toStringList();
     ui->fontpathListBox->insertItems(0, fontpaths);
 
-    ui->audiosinkCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
-    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("Auto (default)")),
-                                    tr("Choose audio output automatically."), Qt::ToolTipRole);
-    ui->audiosinkCombo->addItem(tr("aRts"), QLatin1String("artssink"));
-    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(tr("aRts")),
-                                    tr("Experimental aRts support for GStreamer."),
-                                    Qt::ToolTipRole);
-#ifdef HAVE_PHONON
-    ui->phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
-#endif
-#ifndef QT_NO_GSTREAMER
-    if (gst_init_check(0, 0, 0)) {
-        gchar *versionString = gst_version_string();
-        ui->gstVersionLabel->setText(QLatin1String(versionString));
-        g_free(versionString);
-        GList *factoryList = gst_registry_get_feature_list(gst_registry_get_default(),
-                                                           GST_TYPE_ELEMENT_FACTORY);
-        QString name, klass, description;
-        for (GList *iter = g_list_first(factoryList) ; iter != NULL ; iter = g_list_next(iter)) {
-            GstPluginFeature *feature = GST_PLUGIN_FEATURE(iter->data);
-            klass = QLatin1String(gst_element_factory_get_klass(GST_ELEMENT_FACTORY(feature)));
-            if (klass == QLatin1String("Sink/Audio")) {
-                name = QLatin1String(GST_PLUGIN_FEATURE_NAME(feature));
-                if (name == QLatin1String("sfsink"))
-                    continue; // useless to output audio to file when you cannot set the file path
-                else if (name == QLatin1String("autoaudiosink"))
-                    continue; //This is used implicitly from the auto setting
-                GstElement *sink = gst_element_factory_make (qPrintable(name), NULL);
-                if (sink) {
-                    description = QLatin1String(gst_element_factory_get_description(GST_ELEMENT_FACTORY(feature)));
-                    ui->audiosinkCombo->addItem(name, name);
-                    ui->audiosinkCombo->setItemData(ui->audiosinkCombo->findText(name), description,
-                                                    Qt::ToolTipRole);
-                    gst_object_unref (sink);
-                }
-            }
-        }
-        g_list_free(factoryList);
-    }
-#else
-    ui->phononTab->setEnabled(false);
-    ui->phononLabel->setText(tr("Phonon GStreamer backend not available."));
-#endif
-
-    ui->videomodeCombo->addItem(tr("Auto (default)"), QLatin1String("Auto"));
-    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Auto (default)")),
-                                    tr("Choose render method automatically"), Qt::ToolTipRole);
-#ifdef Q_WS_X11
-    ui->videomodeCombo->addItem(tr("X11"), QLatin1String("X11"));
-    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("X11")),
-                                    tr("Use X11 Overlays"), Qt::ToolTipRole);
-#endif
-#ifndef QT_NO_OPENGL
-    ui->videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL"));
-    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("OpenGL")),
-                                    tr("Use OpenGL if available"), Qt::ToolTipRole);
-#endif
-    ui->videomodeCombo->addItem(tr("Software"), QLatin1String("Software"));
-    ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Software")),
-                                    tr("Use simple software rendering"), Qt::ToolTipRole);
-
-    QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
-    QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
-    ui->audiosinkCombo->setCurrentIndex(ui->audiosinkCombo->findData(audioSink));
-    ui->videomodeCombo->setCurrentIndex(ui->videomodeCombo->findData(videoMode));
-
     settings.endGroup(); // Qt
 
     ui->helpView->setText(tr(appearance_text));
@@ -569,13 +486,6 @@ void MainWindow::fileSave()
         settings.setValue(QLatin1String("DefaultInputMethod"), ui->inputMethodCombo->currentText());
 #endif
 
-        QString audioSink = settings.value(QLatin1String("audiosink"), QLatin1String("Auto")).toString();
-        QString videoMode = settings.value(QLatin1String("videomode"), QLatin1String("Auto")).toString();
-        settings.setValue(QLatin1String("audiosink"),
-                          ui->audiosinkCombo->itemData(ui->audiosinkCombo->currentIndex()));
-        settings.setValue(QLatin1String("videomode"),
-                          ui->videomodeCombo->itemData(ui->videomodeCombo->currentIndex()));
-
         QStringList effects;
         if (ui->effectsCheckBox->isChecked()) {
             effects << QLatin1String("general");
@@ -925,8 +835,6 @@ void MainWindow::pageChanged(int pageNumber)
         ui->helpView->setText(tr(font_text));
     else if (page == ui->printerTab)
         ui->helpView->setText(tr(printer_text));
-    else if (page == ui->phononTab)
-        ui->helpView->setText(tr(phonon_text));
 }
 
 void MainWindow::closeEvent(QCloseEvent *e)
diff --git a/src/qtconfig/mainwindow.ui b/src/qtconfig/mainwindow.ui
index b1a66256f..a36f53477 100644
--- a/src/qtconfig/mainwindow.ui
+++ b/src/qtconfig/mainwindow.ui
@@ -1041,171 +1041,6 @@
         </item>
        </layout>
       </widget>
-      <widget class="QWidget" name="phononTab">
-       <attribute name="title">
-        <string>Phonon</string>
-       </attribute>
-       <layout class="QVBoxLayout" name="verticalLayout">
-        <item>
-         <widget class="QGroupBox" name="aboutPhononGroup">
-          <property name="title">
-           <string>About Phonon</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_2">
-           <item row="0" column="0">
-            <widget class="QLabel" name="phononVersionBuddyLabel">
-             <property name="text">
-              <string>Current Version:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="phononVersionLabel">
-             <property name="text">
-              <string>Not available</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="phononWebsiteBuddyLabel">
-             <property name="text">
-              <string>Website:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLabel" name="phononWebsiteLabel">
-             <property name="text">
-              <string>&lt;a href=&quot;http://phonon.kde.org&quot;&gt;http://phonon.kde.org/&lt;/a&gt;</string>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="aboutGStreamerGroup">
-          <property name="title">
-           <string>About GStreamer</string>
-          </property>
-          <layout class="QGridLayout">
-           <item row="0" column="0">
-            <widget class="QLabel" name="gstVersionBuddyLabel">
-             <property name="text">
-              <string>Current Version:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QLabel" name="gstVersionLabel">
-             <property name="text">
-              <string>Not available</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="gstWebsiteBuddyLabel">
-             <property name="text">
-              <string>Website:</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QLabel" name="gstWebsiteLabel">
-             <property name="text">
-              <string>&lt;a href=&quot;http://gstreamer.freedesktop.org/&quot;&gt;http://gstreamer.freedesktop.org/&lt;/a&gt;</string>
-             </property>
-             <property name="openExternalLinks">
-              <bool>true</bool>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QGroupBox" name="gstBackendGroup">
-          <property name="title">
-           <string>GStreamer backend settings</string>
-          </property>
-          <layout class="QGridLayout" name="gridLayout_3">
-           <item row="0" column="0">
-            <widget class="QLabel" name="audiosinkLabel">
-             <property name="text">
-              <string>Preferred audio sink:</string>
-             </property>
-             <property name="buddy">
-              <cstring>audiosinkCombo</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
-            <widget class="QComboBox" name="audiosinkCombo"/>
-           </item>
-           <item row="1" column="0">
-            <widget class="QLabel" name="videomodeLabel">
-             <property name="text">
-              <string>Preferred render method:</string>
-             </property>
-             <property name="buddy">
-              <cstring>videomodeCombo</cstring>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="1">
-            <widget class="QComboBox" name="videomodeCombo"/>
-           </item>
-           <item row="2" column="0" colspan="2">
-            <widget class="QLabel" name="gstBackendNoteLabel">
-             <property name="text">
-              <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;Note: changes to these settings may prevent applications from starting up correctly.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-             </property>
-             <property name="textFormat">
-              <enum>Qt::RichText</enum>
-             </property>
-             <property name="scaledContents">
-              <bool>false</bool>
-             </property>
-             <property name="wordWrap">
-              <bool>true</bool>
-             </property>
-             <property name="margin">
-              <number>2</number>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="phononLabel">
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="verticalSpacer">
-          <property name="orientation">
-           <enum>Qt::Vertical</enum>
-          </property>
-          <property name="sizeHint" stdset="0">
-           <size>
-            <width>20</width>
-            <height>40</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-       </layout>
-      </widget>
      </widget>
     </item>
    </layout>
@@ -1347,8 +1182,6 @@ p, li { white-space: pre-wrap; }
   <tabstop>fontPathLineEdit</tabstop>
   <tabstop>browseFontPathButton</tabstop>
   <tabstop>addFontPathButton</tabstop>
-  <tabstop>audiosinkCombo</tabstop>
-  <tabstop>videomodeCombo</tabstop>
  </tabstops>
  <resources/>
  <connections>
diff --git a/src/qtconfig/qtconfig.pro b/src/qtconfig/qtconfig.pro
index 775a6b1dc..057e21b75 100644
--- a/src/qtconfig/qtconfig.pro
+++ b/src/qtconfig/qtconfig.pro
@@ -1,12 +1,6 @@
 CONFIG   += x11
 QT += gui-private widgets
 
-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, phonon) {
-    QT += phonon
-    DEFINES += HAVE_PHONON
-}
 SOURCES        += colorbutton.cpp main.cpp previewframe.cpp previewwidget.cpp mainwindow.cpp paletteeditoradvanced.cpp
 HEADERS        += colorbutton.h previewframe.h previewwidget.h mainwindow.h paletteeditoradvanced.h