summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-01-02 14:03:11 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-01-14 07:40:42 +0000
commitfbb8b1ee626955fce61af7fc21f64ebed2c8cb5c (patch)
treed32b96794cfd94e3cbe601d97a5519859b30ba2e
parente2275ade82540561ca026325ff945fdfa90f13fe (diff)
Fix warnings about deprecated QPalette enumerations and functions
videowidget.cpp:625:32: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:56:36: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:56:36: warning: 'Background' is deprecated: Use QPalette::Window instead [-Wdeprecated-declarations] qgstreamervideowidget.cpp:83:55: warning: 'const QBrush& QPalette::background() const' is deprecated: Use QPalette::window() instead [-Wdeprecated-declarations] Change-Id: Ieb55a57c5672d3023a48461ec347fbb30210fd1e Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
-rw-r--r--examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp2
-rw-r--r--src/gsttools/qgstreamervideowidget.cpp4
-rw-r--r--src/multimediawidgets/qvideowidget.cpp2
3 files changed, 4 insertions, 4 deletions
diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
index 7ee3eb541..513df4f31 100644
--- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
+++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp
@@ -64,7 +64,7 @@ VideoWidget::VideoWidget(QWidget *parent)
setAttribute(Qt::WA_NoSystemBackground, true);
QPalette palette = this->palette();
- palette.setColor(QPalette::Background, Qt::black);
+ palette.setColor(QPalette::Window, Qt::black);
setPalette(palette);
setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp
index 633f39fa2..bb85e1eb7 100644
--- a/src/gsttools/qgstreamervideowidget.cpp
+++ b/src/gsttools/qgstreamervideowidget.cpp
@@ -53,7 +53,7 @@ public:
{
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QPalette palette;
- palette.setColor(QPalette::Background, Qt::black);
+ palette.setColor(QPalette::Window, Qt::black);
setPalette(palette);
}
@@ -80,7 +80,7 @@ public:
void paint_helper()
{
QPainter painter(this);
- painter.fillRect(rect(), palette().background());
+ painter.fillRect(rect(), palette().window());
}
protected:
diff --git a/src/multimediawidgets/qvideowidget.cpp b/src/multimediawidgets/qvideowidget.cpp
index ab552b90d..ee40151af 100644
--- a/src/multimediawidgets/qvideowidget.cpp
+++ b/src/multimediawidgets/qvideowidget.cpp
@@ -623,7 +623,7 @@ QVideoWidget::QVideoWidget(QVideoWidgetPrivate &dd, QWidget *parent)
d_ptr->q_ptr = this;
QPalette palette = QWidget::palette();
- palette.setColor(QPalette::Background, Qt::black);
+ palette.setColor(QPalette::Window, Qt::black);
setPalette(palette);
}