Fixed a broken merge. v4.7.0-beta2
authorDenis Dzyubenko <denis.dzyubenko@nokia.com>
Fri, 11 Jun 2010 11:26:05 +0000 (13:26 +0200)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 30 Jun 2010 01:26:55 +0000 (11:26 +1000)
commit53c58703223bdc8cef84b0d26f80573be3de91fb
tree8ac01ec45fd5e7f9b0e82b05a937c12b99f39ee2
parentd7513a5994c734ed48e95ec55d1abd9147c75405
Fixed a broken merge.

Reviewed-by: trustme
(cherry picked from commit 24bcac9de46c89f4d8b533946e7b0feeacca1b0d)
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwinnativepangesturerecognizer_win_p.h