From cc68367cd6074430fda0ab3ca601fa698d0c5956 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Mon, 9 Oct 2017 11:11:17 +0200
Subject: [PATCH] New osx files.

---
 resources/scripts/.travis-install-osx.sh | 3 +++
 src/gui/dialogs/oauthlogin.cpp           | 6 ++++++
 src/gui/guiutilities.cpp                 | 2 +-
 src/gui/guiutilities.h                   | 3 ++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh
index b9640b0fb..9737b0b49 100755
--- a/resources/scripts/.travis-install-osx.sh
+++ b/resources/scripts/.travis-install-osx.sh
@@ -4,6 +4,9 @@ mkdir rssguard-build && cd rssguard-build
 qmake ..
 make
 make install
+
+rm -rf "RSS Guard.app/Contents/Frameworks"
+
 make dmg
 make zip
 
diff --git a/src/gui/dialogs/oauthlogin.cpp b/src/gui/dialogs/oauthlogin.cpp
index e04d67bec..10b040668 100755
--- a/src/gui/dialogs/oauthlogin.cpp
+++ b/src/gui/dialogs/oauthlogin.cpp
@@ -18,6 +18,10 @@
 
 #include "gui/dialogs/oauthlogin.h"
 
+#include "gui/guiutilities.h"
+#include "miscellaneous/application.h"
+#include "miscellaneous/iconfactory.h"
+
 #include <QUrlQuery>
 #include <QWebEngineCookieStore>
 #include <QWebEngineProfile>
@@ -25,6 +29,8 @@
 OAuthLogin::OAuthLogin(QWidget* parent) : QDialog(parent) {
   m_ui.setupUi(this);
 
+  GuiUtilities::applyDialogProperties(*this);
+
   connect(this, &OAuthLogin::rejected, this, &OAuthLogin::authRejected);
   connect(m_ui.m_loginPage, &WebViewer::urlChanged, this, &OAuthLogin::urlChanged);
 }
diff --git a/src/gui/guiutilities.cpp b/src/gui/guiutilities.cpp
index 6531244e0..36ba1d0e1 100755
--- a/src/gui/guiutilities.cpp
+++ b/src/gui/guiutilities.cpp
@@ -38,7 +38,7 @@ void GuiUtilities::setLabelAsNotice(QLabel& label, bool is_warning) {
 }
 
 void GuiUtilities::applyDialogProperties(QWidget& widget, const QIcon& icon, const QString& title) {
-  widget.setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
+  widget.setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint | Qt::WindowTitleHint);
   widget.setWindowIcon(icon);
 
   if (!title.isEmpty()) {
diff --git a/src/gui/guiutilities.h b/src/gui/guiutilities.h
index 4f6ad5282..1e1075675 100755
--- a/src/gui/guiutilities.h
+++ b/src/gui/guiutilities.h
@@ -19,13 +19,14 @@
 #ifndef GUIUTILITIES_H
 #define GUIUTILITIES_H
 
+#include <QIcon>
 #include <QLabel>
 #include <QWidget>
 
 class GuiUtilities {
   public:
     static void setLabelAsNotice(QLabel& label, bool is_warning);
-    static void applyDialogProperties(QWidget& widget, const QIcon& icon, const QString& title = QString());
+    static void applyDialogProperties(QWidget& widget, const QIcon& icon = QIcon(), const QString& title = QString());
     static void applyResponsiveDialogResize(QWidget& widget, double factor = 0.6);
 
   private: