diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-09 14:52:26 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-07-15 08:35:46 +0000 |
commit | 80bceea0a7b3f9b8f52a6ddc481e61ad3e43d85f (patch) | |
tree | 890efa6f78f15a1a56c76ef1ff19a11c0a146f1a /src/core/web_engine_library_info.cpp | |
parent | 15176bb7a518b7cf509c4bacdd6a84054391b058 (diff) |
Remove code dealing with now removed ffmpegsumo plugin
Chromium now links statically to ffmpeg, and the ffmpegsumo plugin is
no longer built.
This also makes the plugin dir unneeded.
Change-Id: I2204ce966b067886d57a9548d8aec829b73642d8
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
-rw-r--r-- | src/core/web_engine_library_info.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index b9b60f587..69fa418c6 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -152,14 +152,10 @@ QString pluginsPath() if (!initialized) { initialized = true; - if (!QFileInfo::exists(potentialPluginsPath)) { - qWarning("Installed Qt plugins directory not found at location %s. Trying application directory...", qPrintable(potentialPluginsPath)); + if (!QFileInfo::exists(potentialPluginsPath)) potentialPluginsPath = QCoreApplication::applicationDirPath() % QDir::separator() % QLatin1String("qtwebengine"); - } - if (!QFileInfo::exists(potentialPluginsPath)) { - qWarning("Qt WebEngine Plugins directory not found at location %s. Trying fallback directory... Plugins as for example video codecs MAY NOT work.", qPrintable(potentialPluginsPath)); + if (!QFileInfo::exists(potentialPluginsPath)) potentialPluginsPath = fallbackDir(); - } } return potentialPluginsPath; |