diff src/mainwindow.cpp @ 559:95877ad67d3e

Merge from branch "find"
author Chris Cannam
date Mon, 27 Feb 2012 17:08:47 +0000
parents d932ce55c364
children 533519ebc0cb
line wrap: on
line diff
--- a/src/mainwindow.cpp	Fri Feb 17 10:58:41 2012 +0000
+++ b/src/mainwindow.cpp	Mon Feb 27 17:08:47 2012 +0000
@@ -112,7 +112,7 @@
     m_hgTabs = new HgTabWidget(central, m_workFolderPath);
     connectTabsSignals();
 
-    cl->addWidget(m_hgTabs, row++, 0);
+    cl->addWidget(m_hgTabs, row++, 0, 1, 2);
 
     connect(m_hgTabs, SIGNAL(selectionChanged()),
             this, SLOT(enableDisableActions()));
@@ -153,6 +153,11 @@
 }
 
 
+void MainWindow::resizeEvent(QResizeEvent *)
+{
+}
+
+
 QString MainWindow::getUserInfo() const
 {
     QSettings settings;