diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-07-26 19:34:08 +0200 |
|---|---|---|
| committer | Zeno Albisser <zeno.albisser@digia.com> | 2013-07-26 23:30:30 +0200 |
| commit | aebb91d9a2293b027b64601aea10d56240759050 (patch) | |
| tree | fec19421f8b40aef12c886b9c4bc6c8fec33281d /lib/web_engine_context.cpp | |
| parent | 0c6e6d63d93882c3d682cdcf15f96c3d682c338d (diff) | |
Fix BrowserContextQt::GetPath() to return path to user data directory
Besides returning a proper application specific user data directory,
this patch removes the duplicate definition of GetPath() which
was added by accident with the recent chromium update.
Change-Id: Ia30d598e3ef99eb88000498ef3a00ccae0593ff8
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'lib/web_engine_context.cpp')
| -rw-r--r-- | lib/web_engine_context.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/web_engine_context.cpp b/lib/web_engine_context.cpp index ecd4b6643..0a3f28eb8 100644 --- a/lib/web_engine_context.cpp +++ b/lib/web_engine_context.cpp @@ -41,6 +41,7 @@ #include "web_engine_context.h" +#include "shared/shared_globals.h" #include <math.h> #include "base/command_line.h" @@ -63,15 +64,6 @@ namespace { static WebEngineContext* sContext = 0; -static inline base::FilePath::StringType qStringToStringType(const QString &str) -{ -#if defined(OS_POSIX) - return str.toStdString(); -#elif defined(OS_WIN) - return str.toStdWString(); -#endif -} - static QByteArray subProcessPath() { static bool initialized = false; #ifdef QTWEBENGINEPROCESS_PATH |