summaryrefslogtreecommitdiffstats
path: root/src/plugins/gfxdrivers
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-11-19 10:53:10 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-11-19 10:53:42 (GMT)
commit80dfb33cc5fec8fd19e78a959e02588ce58736ee (patch)
treed9afe6da9127c63409862623b5a4ffa4598e1bf2 /src/plugins/gfxdrivers
parenta73e660fd05bafc402d63d71e811a621e46f452d (diff)
parent1b14c3d33dea0fe4814f2749c49cf916ca13e012 (diff)
downloadQt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.zip
Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.gz
Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.bz2
Merge oslo-staging-2/4.6 into upstream/4.6
Diffstat (limited to 'src/plugins/gfxdrivers')
-rw-r--r--src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
index eb771ba..4cb0184 100644
--- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp
@@ -131,8 +131,8 @@ QDirectFBScreenPrivate::QDirectFBScreenPrivate(QDirectFBScreen *qptr)
QWSSignalHandler::instance()->addObject(this);
#endif
#ifdef QT_DIRECTFB_WM
- connect(QWSServer::instance(), SIGNAL(windowEvent(QWSWindow*, QWSServer::WindowEvent)),
- this, SLOT(onWindowEvent(QWSWindow*, QWSServer::WindowEvent)));
+ connect(QWSServer::instance(), SIGNAL(windowEvent(QWSWindow*,QWSServer::WindowEvent)),
+ this, SLOT(onWindowEvent(QWSWindow*,QWSServer::WindowEvent)));
#endif
}