diff --git a/src/lib/3rdparty/fancytabwidget.cpp b/src/lib/3rdparty/fancytabwidget.cpp
index 1ad855b19..de27bbbb0 100644
--- a/src/lib/3rdparty/fancytabwidget.cpp
+++ b/src/lib/3rdparty/fancytabwidget.cpp
@@ -502,18 +502,18 @@ FancyTabWidget::FancyTabWidget(QWidget* parent)
       proxy_style_(new FancyTabProxyStyle)
 {
     side_layout_->setSpacing(0);
-    side_layout_->setMargin(0);
+    side_layout_->setContentsMargins(0, 0, 0, 0);
     side_layout_->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Fixed, QSizePolicy::Expanding));
 
     side_widget_->setLayout(side_layout_);
     side_widget_->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
 
-    top_layout_->setMargin(0);
+    top_layout_->setContentsMargins(0, 0, 0, 0);
     top_layout_->setSpacing(0);
     top_layout_->addLayout(stack_);
 
     QHBoxLayout* main_layout = new QHBoxLayout;
-    main_layout->setMargin(0);
+    main_layout->setContentsMargins(0, 0, 0, 0);
     main_layout->setSpacing(1);
     main_layout->addWidget(side_widget_);
     main_layout->addLayout(top_layout_);
diff --git a/src/lib/popupwindow/popupwindow.cpp b/src/lib/popupwindow/popupwindow.cpp
index bbef550c4..833da0733 100644
--- a/src/lib/popupwindow/popupwindow.cpp
+++ b/src/lib/popupwindow/popupwindow.cpp
@@ -63,7 +63,7 @@ PopupWindow::PopupWindow(PopupWebView* view)
     m_notificationWidget = new QWidget(this);
     m_notificationWidget->setAutoFillBackground(true);
     QPalette pal = m_notificationWidget->palette();
-    pal.setColor(QPalette::Background, pal.window().color().darker(110));
+    pal.setColor(QPalette::Window, pal.window().color().darker(110));
     m_notificationWidget->setPalette(pal);
 
     QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget);
@@ -73,7 +73,7 @@ PopupWindow::PopupWindow(PopupWebView* view)
 
     QWidget *viewSpacer = new QWidget(this);
     pal = viewSpacer->palette();
-    pal.setColor(QPalette::Background, pal.window().color().darker(125));
+    pal.setColor(QPalette::Window, pal.window().color().darker(125));
     viewSpacer->setPalette(pal);
     viewSpacer->setFixedHeight(1);
     viewSpacer->setAutoFillBackground(true);
diff --git a/src/lib/webtab/webtab.cpp b/src/lib/webtab/webtab.cpp
index 797b58ab5..7bb7e9062 100644
--- a/src/lib/webtab/webtab.cpp
+++ b/src/lib/webtab/webtab.cpp
@@ -169,7 +169,7 @@ WebTab::WebTab(QWidget *parent)
     m_notificationWidget = new QWidget(this);
     m_notificationWidget->setAutoFillBackground(true);
     QPalette pal = m_notificationWidget->palette();
-    pal.setColor(QPalette::Background, pal.window().color().darker(110));
+    pal.setColor(QPalette::Window, pal.window().color().darker(110));
     m_notificationWidget->setPalette(pal);
 
     QVBoxLayout *nlayout = new QVBoxLayout(m_notificationWidget);
diff --git a/tests/modeltest/modeltest.cpp b/tests/modeltest/modeltest.cpp
index 11094f3cb..8407d6c01 100644
--- a/tests/modeltest/modeltest.cpp
+++ b/tests/modeltest/modeltest.cpp
@@ -459,12 +459,12 @@ void ModelTest::data()
     }
 
     // General Purpose roles that should return a QColor
-    QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
+    QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundRole);
     if (colorVariant.isValid()) {
         Q_ASSERT(colorVariant.canConvert<QColor>());
     }
 
-    colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
+    colorVariant = model->data(model->index(0, 0), Qt::ForegroundRole);
     if (colorVariant.isValid()) {
         Q_ASSERT(colorVariant.canConvert<QColor>());
     }