diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-12-12 14:02:09 +0100 |
|---|---|---|
| committer | Jüri Valdmann <juri.valdmann@qt.io> | 2019-12-12 14:15:14 +0100 |
| commit | d3f61e444b33688648e4c4798e1da7c578502b81 (patch) | |
| tree | 73467be10a029e652d781d950303c2262ea7df1f | |
| parent | 670013ee8e38944dc9cbde73afa3706ded5dcb96 (diff) | |
Fix ResourceBundle::GetNativeImageNamed
Follow Chromium's aura, android, windows, and fuchsia implementations of
GetNativeImageNamed by forwarding the call to GetImageNamed.
Fixes DCHECK when enabling TouchEmulator in devtools.
Change-Id: If5fdc30293bc18843c85d932f75f7cb2c70e5815
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | src/core/resource_bundle_qt.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp index dc7507f34..0e80859ae 100644 --- a/src/core/resource_bundle_qt.cpp +++ b/src/core/resource_bundle_qt.cpp @@ -66,9 +66,7 @@ void ResourceBundle::LoadCommonResources() gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) { - LOG(WARNING) << "Unable to load image with id " << resource_id; - NOTREACHED(); // Want to assert in debug mode. - return GetEmptyImage(); + return GetImageNamed(resource_id); } // static |