diff options
author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:10 (GMT) |
---|---|---|
committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:42 (GMT) |
commit | 80dfb33cc5fec8fd19e78a959e02588ce58736ee (patch) | |
tree | d9afe6da9127c63409862623b5a4ffa4598e1bf2 /src/gui/widgets/qmdisubwindow.cpp | |
parent | a73e660fd05bafc402d63d71e811a621e46f452d (diff) | |
parent | 1b14c3d33dea0fe4814f2749c49cf916ca13e012 (diff) | |
download | Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.zip Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.gz Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.bz2 |
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/gui/widgets/qmdisubwindow.cpp')
-rw-r--r-- | src/gui/widgets/qmdisubwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qmdisubwindow.cpp b/src/gui/widgets/qmdisubwindow.cpp index b5e28da..350f8579 100644 --- a/src/gui/widgets/qmdisubwindow.cpp +++ b/src/gui/widgets/qmdisubwindow.cpp @@ -2268,8 +2268,8 @@ QMdiSubWindow::QMdiSubWindow(QWidget *parent, Qt::WindowFlags flags) else d->menuIcon = windowIcon(); #endif - connect(qApp, SIGNAL(focusChanged(QWidget *, QWidget *)), - this, SLOT(_q_processFocusChanged(QWidget *, QWidget *))); + connect(qApp, SIGNAL(focusChanged(QWidget*,QWidget*)), + this, SLOT(_q_processFocusChanged(QWidget*,QWidget*))); } /*! |