Merge branch 'develop' of github.com:mapmapteam/mapmap into develop

This commit is contained in:
Alexandre Quessy
2016-03-05 19:12:36 -05:00
6 changed files with 3 additions and 89 deletions
+1
View File
@@ -428,6 +428,7 @@ bool MainWindow::eventFilter(QObject *obj, QEvent *event)
void MainWindow::keyPressEvent(QKeyEvent *event)
{
#ifdef Q_OS_OSX // On Mac OS X
Q_UNUSED(event);
// Do nothing
#endif