diff options
| author | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-04-19 13:21:23 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@theqtcompany.com> | 2016-05-04 17:56:56 +0000 |
| commit | 903a07a5c5cf4d22609b4b01295e8563680d9d97 (patch) | |
| tree | 5068da05960f259f5fdf1b82aa6fa92236ac44ed /src/core/web_engine_library_info.cpp | |
| parent | 37d68796ce8e9e6ddec39342f955a349d2298920 (diff) | |
Remove warnings about missing dictionaries
Current logic of setting resource paths will
always complain about missing dictionaries
see QTBUG-52682. Remove warnings so now
only SpellcheckService warns about missing
or corrupted dictionary on lazy load.
Use only one global and one local search path.
Task-number: QTBUG-52506
Change-Id: I33b613ea8c0a7533f51742e6c155c6ee2c8ceda1
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/core/web_engine_library_info.cpp')
| -rw-r--r-- | src/core/web_engine_library_info.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/core/web_engine_library_info.cpp b/src/core/web_engine_library_info.cpp index a67bce94c..2de3d39ff 100644 --- a/src/core/web_engine_library_info.cpp +++ b/src/core/web_engine_library_info.cpp @@ -211,20 +211,12 @@ QString dictionariesPath() #if defined(OS_MACOSX) && defined(QT_MAC_FRAMEWORK_BUILD) return getResourcesPath(frameworkBundle()) % QLatin1String("/qtwebengine_dictionaries"); #else - static bool initialized = false; - static QString potentialDictionariesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QDir::separator() % QLatin1String("qtwebengine_dictionaries"); + // first local path + static QString potentialDictionariesPath = QCoreApplication::applicationDirPath() % QDir::separator() % QLatin1String("qtwebengine_dictionaries"); - if (!initialized) { - initialized = true; - if (!QFileInfo::exists(potentialDictionariesPath)) { - qWarning("Installed Qt WebEngine dictionaries directory not found at location %s. Trying application directory...", qPrintable(potentialDictionariesPath)); - potentialDictionariesPath = QCoreApplication::applicationDirPath() % QDir::separator() % QLatin1String("qtwebengine_dictionaries"); - } - if (!QFileInfo::exists(potentialDictionariesPath)) { - qWarning("Qt WebEngine dictionaries directory not found at location %s. Trying fallback directory... Spellcheck MAY NOT work.", qPrintable(potentialDictionariesPath)); - potentialDictionariesPath = fallbackDir(); - } - } + // now global one + if (!QFileInfo::exists(potentialDictionariesPath)) + potentialDictionariesPath = QLibraryInfo::location(QLibraryInfo::DataPath) % QDir::separator() % QLatin1String("qtwebengine_dictionaries"); return potentialDictionariesPath; #endif |