summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2010-06-12 09:17:23 (GMT)
committerKevin Smith <git@kismith.co.uk>2010-06-12 09:17:23 (GMT)
commit710cf2f8f1941fa8beb9f7d92e3de03fee9265e3 (patch)
tree7cb9c52cb4f270b3d08c08155c0fa99f562b4276 /Swift/QtUI
parenta5928fb2a77e4ba899ecd67aeb2412b70945058c (diff)
downloadswift-710cf2f8f1941fa8beb9f7d92e3de03fee9265e3.zip
swift-710cf2f8f1941fa8beb9f7d92e3de03fee9265e3.tar.bz2
Allow quitting, debug console and about with Qt 4.6.3.
Resolves: #461
Diffstat (limited to 'Swift/QtUI')
-rw-r--r--Swift/QtUI/QtLoginWindow.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Swift/QtUI/QtLoginWindow.cpp b/Swift/QtUI/QtLoginWindow.cpp
index 66ac2db..952e066 100644
--- a/Swift/QtUI/QtLoginWindow.cpp
+++ b/Swift/QtUI/QtLoginWindow.cpp
@@ -130,13 +130,13 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
#endif
QAction* aboutAction = new QAction("About Swift", this);
- connect(aboutAction, SIGNAL(activated()), SLOT(handleAbout()));
+ connect(aboutAction, SIGNAL(triggered()), SLOT(handleAbout()));
swiftMenu_->addAction(aboutAction);
toolsMenu_ = new QMenu(tr("Tools"), this);
QAction* xmlConsoleAction = new QAction(tr("Show Debug Console"), this);
- connect(xmlConsoleAction, SIGNAL(activated()), SLOT(handleShowXMLConsole()));
+ connect(xmlConsoleAction, SIGNAL(triggered()), SLOT(handleShowXMLConsole()));
toolsMenu_->addAction(xmlConsoleAction);
toggleSoundsAction_ = new QAction(tr("Play Sounds"), this);
@@ -147,7 +147,7 @@ QtLoginWindow::QtLoginWindow(UIEventStream* uiEventStream) : QMainWindow() {
QAction* quitAction = new QAction("Quit", this);
- connect(quitAction, SIGNAL(activated()), SLOT(handleQuit()));
+ connect(quitAction, SIGNAL(triggered()), SLOT(handleQuit()));
swiftMenu_->addAction(quitAction);
setInitialMenus();