diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-03 22:06:18 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-03 22:06:20 +0300 |
| commit | ecf543b23e3cc746c435a58032b0d0a7146b4574 (patch) | |
| tree | 3532d36c368e0790d494b71205eefcfb4efb937a /src | |
| parent | 93ad74b467980a45537141e14d385cd8a75956b3 (diff) | |
GlobalShortcut: enable use of hooks for Windows x64 now that we have HardHook available.
This allows GlobalShortcut keys to be suppressed
on Windows x64.
Diffstat (limited to 'src')
| -rw-r--r-- | src/mumble/GlobalShortcut_win.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mumble/GlobalShortcut_win.cpp b/src/mumble/GlobalShortcut_win.cpp index d08b722ed..054b20b3d 100644 --- a/src/mumble/GlobalShortcut_win.cpp +++ b/src/mumble/GlobalShortcut_win.cpp @@ -52,7 +52,6 @@ static uint qHash(const GUID &a) { return val; } -#ifndef Q_OS_WIN64 static HWND WINAPI HookWindowFromPoint(POINT p); static BOOL WINAPI HookSetForegroundWindow(HWND hwnd); @@ -84,7 +83,6 @@ static BOOL WINAPI HookSetForegroundWindow(HWND hwnd) { return ret; } -#endif /** * Returns a platform specific GlobalShortcutEngine object. @@ -104,10 +102,6 @@ GlobalShortcutWin::GlobalShortcutWin() { // Hidden setting to disable hooking bHook = g.qs->value(QLatin1String("winhooks"), true).toBool(); -#ifdef Q_OS_WIN64 - qWarning("GlobalShortcutWin: force-disabling 'winhooks' on x64"); - bHook = false; -#endif GetKeyboardState(ucKeyState); |