diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-09 17:59:51 +0200 |
| commit | 22e96c4d342de3bfe4fc27f4cd7233edcfe737cc (patch) | |
| tree | 6bdd02cdd8603cf16383fb339a2cfdbce82491da /src/plugins/platforms/windows/qwindowsintegration.h | |
| parent | bd79c4e28c307ba87aca02155b845774c7ffec1f (diff) | |
| parent | fa95eb055401f5264cbc6aca761cb9b5feb4affc (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I36e6b890b65d12bf6931757540bcc9c553b5eb8f
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsintegration.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.h b/src/plugins/platforms/windows/qwindowsintegration.h index 437253cedc..4258f908e7 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.h +++ b/src/plugins/platforms/windows/qwindowsintegration.h @@ -60,7 +60,9 @@ public: DisableArb = 0x4, NoNativeDialogs = 0x8, XpNativeDialogs = 0x10, - DontPassOsMouseEventsSynthesizedFromTouch = 0x20 // Do not pass OS-generated mouse events from touch. + DontPassOsMouseEventsSynthesizedFromTouch = 0x20, // Do not pass OS-generated mouse events from touch. + DontUseDirectWriteFonts = 0x40, + DontUseColorFonts = 0x80 }; explicit QWindowsIntegration(const QStringList ¶mList); |