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

Conflicts:
	src/plugins/gstreamer/mediacapture/qgstreameraudioencode.cpp

Change-Id: I7c30c2d13fdd07ee07e4449d5d3e256e988d3793

3 files changed, 0 insertions, 20 deletions

diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp
index e787aa269..ab048838a 100644
--- a/examples/multimediawidgets/player/player.cpp
+++ b/examples/multimediawidgets/player/player.cpp
@@ -55,9 +55,7 @@ Player::Player(QWidget *parent)
     , videoWidget(0)
     , coverLabel(0)
     , slider(0)
-#ifndef PLAYER_NO_COLOROPTIONS
     , colorDialog(0)
-#endif
 {
 //! [create-objs]
     player = new QMediaPlayer(this);
@@ -135,11 +133,9 @@ Player::Player(QWidget *parent)
     fullScreenButton = new QPushButton(tr("FullScreen"), this);
     fullScreenButton->setCheckable(true);
 
-#ifndef PLAYER_NO_COLOROPTIONS
     colorButton = new QPushButton(tr("Color Options..."), this);
     colorButton->setEnabled(false);
     connect(colorButton, SIGNAL(clicked()), this, SLOT(showColorDialog()));
-#endif
 
     QBoxLayout *displayLayout = new QHBoxLayout;
     displayLayout->addWidget(videoWidget, 2);
@@ -152,9 +148,7 @@ Player::Player(QWidget *parent)
     controlLayout->addWidget(controls);
     controlLayout->addStretch(1);
     controlLayout->addWidget(fullScreenButton);
-#ifndef PLAYER_NO_COLOROPTIONS
     controlLayout->addWidget(colorButton);
-#endif
 
     QBoxLayout *layout = new QVBoxLayout;
     layout->addLayout(displayLayout);
@@ -175,9 +169,7 @@ Player::Player(QWidget *parent)
         controls->setEnabled(false);
         playlistView->setEnabled(false);
         openButton->setEnabled(false);
-#ifndef PLAYER_NO_COLOROPTIONS
         colorButton->setEnabled(false);
-#endif
         fullScreenButton->setEnabled(false);
     }
 
@@ -347,9 +339,7 @@ void Player::videoAvailableChanged(bool available)
         if (fullScreenButton->isChecked())
             videoWidget->setFullScreen(true);
     }
-#ifndef PLAYER_NO_COLOROPTIONS
     colorButton->setEnabled(available);
-#endif
 }
 
 void Player::setTrackInfo(const QString &info)
@@ -389,7 +379,6 @@ void Player::updateDurationInfo(qint64 currentInfo)
     labelDuration->setText(tStr);
 }
 
-#ifndef PLAYER_NO_COLOROPTIONS
 void Player::showColorDialog()
 {
     if (!colorDialog) {
@@ -434,4 +423,3 @@ void Player::showColorDialog()
     }
     colorDialog->show();
 }
-#endif
diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h
index 7f5d0881b..ca643bd7d 100644
--- a/examples/multimediawidgets/player/player.h
+++ b/examples/multimediawidgets/player/player.h
@@ -94,9 +94,7 @@ private slots:
 
     void displayErrorMessage();
 
-#ifndef PLAYER_NO_COLOROPTIONS
     void showColorDialog();
-#endif
 
 private:
     void setTrackInfo(const QString &info);
@@ -111,10 +109,8 @@ private:
     QSlider *slider;
     QLabel *labelDuration;
     QPushButton *fullScreenButton;
-#ifndef PLAYER_NO_COLOROPTIONS
     QPushButton *colorButton;
     QDialog *colorDialog;
-#endif
 
     QLabel *labelHistogram;
     HistogramWidget *histogram;
diff --git a/examples/multimediawidgets/player/player.pro b/examples/multimediawidgets/player/player.pro
index 067b31b11..0c5be6888 100644
--- a/examples/multimediawidgets/player/player.pro
+++ b/examples/multimediawidgets/player/player.pro
@@ -20,9 +20,5 @@ SOURCES = main.cpp \
     videowidget.cpp \
     histogramwidget.cpp
 
-maemo* {
-    DEFINES += PLAYER_NO_COLOROPTIONS
-}
-
 target.path = $$[QT_INSTALL_EXAMPLES]/multimediawidgets/player
 INSTALLS += target