Merge branch 'release/2.1.3' into develop

2017-03-01 23:37:14 +01:00
parent 4061fc7cf8 52ab7b8865
commit 93c212f28d
9 changed files with 15 additions and 11 deletions
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@@ -301,6 +301,10 @@ MainWindow::MainWindow()
    connect(m_ui->welcomeWidget, SIGNAL(importKeePass1Database()), SLOT(switchToKeePass1Database()));

    connect(m_ui->actionAbout, SIGNAL(triggered()), SLOT(showAboutDialog()));
+    
+#ifdef Q_OS_MAC
+    setUnifiedTitleAndToolBarOnMac(true);
+#endif

    connect(m_ui->tabWidget, SIGNAL(messageGlobal(QString,MessageWidget::MessageType)), this, SLOT(displayGlobalMessage(QString, MessageWidget::MessageType)));
    connect(m_ui->tabWidget, SIGNAL(messageDismissGlobal()), this, SLOT(hideGlobalMessage()));