Merge branch 'release/2.1.2' into develop

This commit is contained in:
Janek Bevendorff 2017-02-17 04:03:12 +01:00
commit e0e6f2b8e9
No known key found for this signature in database
GPG key ID: CFEC2F6850BFFA53
70 changed files with 7701 additions and 723 deletions

View file

@ -54,6 +54,13 @@ DatabaseOpenWidget::DatabaseOpenWidget(QWidget* parent)
connect(m_ui->buttonBox, SIGNAL(accepted()), SLOT(openDatabase()));
connect(m_ui->buttonBox, SIGNAL(rejected()), SLOT(reject()));
#ifdef Q_OS_MACOS
// add random padding to layouts to align widgets properly
m_ui->dialogButtonsLayout->setContentsMargins(10, 0, 15, 0);
m_ui->gridLayout->setContentsMargins(10, 0, 0, 0);
m_ui->labelLayout->setContentsMargins(10, 0, 10, 0);
#endif
}
DatabaseOpenWidget::~DatabaseOpenWidget()