diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-22 10:55:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-01-25 15:41:53 +0100 |
| commit | cde72003881c6b5680ac8ac0fe6d6971bb43e0d5 (patch) | |
| tree | fcb50002765c1cb179dd6f62054380c3fed85e80 /src/core/renderer_host | |
| parent | 3fb215dab139fd7b61473ce3fe1058b87a6b4fe3 (diff) | |
| parent | 75d061bbc68875c08b3dc243e464e32a80da71df (diff) | |
Merge remote-tracking branch 'origin/5.15' into dev
Including update to 87-based
Change-Id: I36b6054e00de97ab055d0bc800cff08d0408fac6
Diffstat (limited to 'src/core/renderer_host')
| -rw-r--r-- | src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp index d54a9cdf2..af547fcf2 100644 --- a/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp +++ b/src/core/renderer_host/pepper/pepper_flash_browser_host_qt.cpp @@ -61,7 +61,7 @@ #if defined(OS_WIN) #include <windows.h> -#elif defined(OS_MACOSX) +#elif defined(OS_MAC) #include <CoreServices/CoreServices.h> #endif @@ -109,7 +109,7 @@ int32_t PepperFlashBrowserHostQt::OnUpdateActivity(ppapi::host::HostMessageConte int value = 0; if (SystemParametersInfo(SPI_GETSCREENSAVETIMEOUT, 0, &value, 0)) SystemParametersInfo(SPI_SETSCREENSAVETIMEOUT, value, NULL, 0); -#elif defined(OS_MACOSX) +#elif defined(OS_MAC) UpdateSystemActivity(OverallAct); #endif return PP_OK; |