summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-06-14 16:58:41 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-06-14 15:15:43 +0000
commit994dcd2ea2b13cdfae17b2d01ae8dfa0c58306f3 (patch)
treea974b1d6a15c7dc2d10b4418495a5748f841bbf6 /src
parent712dad5b9aa2d08ac29dec1bd380fdd08d9ffe3f (diff)
Load the devtools resources as optional
We separated the devtools resources so users might remove them if they do not need them. We should therefore avoid error messages when they are not present. Task-number: QTBUG-53879 Change-Id: I52321b7a04683a33ec4cfe8e389889f0ea721f70 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src')
-rw-r--r--src/core/resource_bundle_qt.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/resource_bundle_qt.cpp b/src/core/resource_bundle_qt.cpp
index 2a482c52d..fa5c04524 100644
--- a/src/core/resource_bundle_qt.cpp
+++ b/src/core/resource_bundle_qt.cpp
@@ -50,7 +50,7 @@ void ResourceBundle::LoadCommonResources()
AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_PAK), SCALE_FACTOR_NONE);
AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_100P_PAK), SCALE_FACTOR_100P);
AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_200P_PAK), SCALE_FACTOR_200P);
- AddDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_DEVTOOLS_PAK), SCALE_FACTOR_NONE);
+ AddOptionalDataPackFromPath(WebEngineLibraryInfo::getPath(QT_RESOURCES_DEVTOOLS_PAK), SCALE_FACTOR_NONE);
}
gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id, ImageRTL rtl)