diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2016-06-22 17:01:46 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-12-05 17:03:10 +0100 |
| commit | 3c85bde5920b7ad0a40bc873d042436bd4138b64 (patch) | |
| tree | a9bff34e92d43fa50475e6420dd3237fefc07a45 /chromium/content | |
| parent | 02ee97bd784a3dc855f90018ed808abf9d7d10a9 (diff) | |
| download | qtwebengine-chromium-3c85bde5920b7ad0a40bc873d042436bd4138b64.tar.gz | |
Do not call Ole(Un)Initialize
The Windows platform plugin already calls OleInitialize. When
ScopedOleInitializer detects that OleInitialize was already called it
will yield an error message. This is not much of a problem but unsettles
users.
Task-number: QTBUG-53746
Change-Id: If5e978c6ef022a7ec0637a2e171fc0f9b3e92a41
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'chromium/content')
| -rw-r--r-- | chromium/content/browser/browser_main_runner.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/chromium/content/browser/browser_main_runner.cc b/chromium/content/browser/browser_main_runner.cc index 6d510b3fcd9..2974724c930 100644 --- a/chromium/content/browser/browser_main_runner.cc +++ b/chromium/content/browser/browser_main_runner.cc @@ -85,10 +85,12 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { notification_service_.reset(new NotificationServiceImpl); #if defined(OS_WIN) +#if !defined(TOOLKIT_QT) // Ole must be initialized before starting message pump, so that TSF // (Text Services Framework) module can interact with the message pump // on Windows 8 Metro mode. ole_initializer_.reset(new ui::ScopedOleInitializer); +#endif // Enable DirectWrite font rendering if needed. gfx::win::MaybeInitializeDirectWrite(); #endif // OS_WIN @@ -200,7 +202,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { main_loop_->ShutdownThreadsAndCleanUp(); ui::ShutdownInputMethod(); - #if defined(OS_WIN) + #if defined(OS_WIN) && !defined(TOOLKIT_QT) ole_initializer_.reset(NULL); #endif #if defined(OS_ANDROID) @@ -227,7 +229,7 @@ class BrowserMainRunnerImpl : public BrowserMainRunner { std::unique_ptr<NotificationServiceImpl> notification_service_; std::unique_ptr<BrowserMainLoop> main_loop_; -#if defined(OS_WIN) +#if defined(OS_WIN) && !defined(TOOLKIT_QT) std::unique_ptr<ui::ScopedOleInitializer> ole_initializer_; #endif |