diff options
author | Martin Smith <msmith@trolltech.com> | 2010-03-02 11:18:11 (GMT) |
---|---|---|
committer | Martin Smith <msmith@trolltech.com> | 2010-03-02 11:18:11 (GMT) |
commit | caaf11aeacaf8922413668b37834dbb4e63ac78c (patch) | |
tree | 5a1ef86436d4699370e45e8ec06c1186f88845ee /src/gui/kernel/qapplication_p.h | |
parent | 671a6a0dc82857dd84feddf49d38540dd59186df (diff) | |
parent | 2c0dec10520ce1ae25eaef2d1c67969528ac278d (diff) | |
download | Qt-caaf11aeacaf8922413668b37834dbb4e63ac78c.zip Qt-caaf11aeacaf8922413668b37834dbb4e63ac78c.tar.gz Qt-caaf11aeacaf8922413668b37834dbb4e63ac78c.tar.bz2 |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
-rw-r--r-- | src/gui/kernel/qapplication_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index e0a6103..8653dec 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -514,7 +514,7 @@ public: int symbianResourceChange(const QSymbianEvent *symbianEvent); #endif -#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) +#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) || defined(Q_WS_MAC) void sendSyntheticEnterLeave(QWidget *widget); #endif |