diff src/MainWindow.cpp @ 50:8b7383948381

Bring in latest build fixes etc from SV -- now builds with either Qt4 or Qt5

--- a/src/MainWindow.cpp	Fri Jul 12 13:56:34 2013 +0100
+++ b/src/MainWindow.cpp	Fri Jul 12 15:26:11 2013 +0100
@@ -434,16 +434,16 @@
     m_recentFilesMenu->clear();
     vector<QString> files = m_recentFiles.getRecent();
     for (size_t i = 0; i < files.size(); ++i) {
-    QAction *action = new QAction(files[i], this);
-    connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
+        QAction *action = new QAction(files[i], this);
+        connect(action, SIGNAL(triggered()), this, SLOT(openRecentFile()));
         if (i == 0) {
             action->setShortcut(tr("Ctrl+R"));
             m_keyReference->registerShortcut
                 (tr("Re-open"),
-                 action->shortcut(),
+                 action->shortcut().toString(),
                  tr("Re-open the current or most recently opened file"));
         }
-    m_recentFilesMenu->addAction(action);
+        m_recentFilesMenu->addAction(action);
     }
 }