diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-10 18:15:09 (GMT) |
| commit | cd4cab01810b817cdf8eb80ab9fc3174a798dd10 (patch) | |
| tree | a849171a850e91851e871544d1e49a56484d37c7 /src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp | |
| parent | d895af5713a7b7ee011b2b29cb5844fbf964df5e (diff) | |
| parent | 7005ca9f0f6b1e535ad2b26d3fcf46dffacc3f13 (diff) | |
| download | Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.zip Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.gz Qt-cd4cab01810b817cdf8eb80ab9fc3174a798dd10.tar.bz2 | |
Merge branch '4.6'
Conflicts:
src/gui/styles/qcommonstyle.cpp
tools/assistant/lib/lib.pro
tools/assistant/lib/qhelp_global.cpp
tools/assistant/tools/assistant/assistant.qch
tools/assistant/tools/assistant/mainwindow.cpp
Diffstat (limited to 'src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp')
| -rw-r--r-- | src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp index c7979d1..ea8e4ad 100644 --- a/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/PluginDatabase.cpp @@ -320,7 +320,7 @@ void PluginDatabase::clear() m_preferredPlugins.clear(); } -#if (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX)) +#if (!PLATFORM(WINCE)) && (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX) || !ENABLE(NETSCAPE_PLUGIN_API)) // For Safari/Win the following three methods are implemented // in PluginDatabaseWin.cpp, but if we can use WebCore constructs // for the logic we should perhaps move it here under XP_WIN? @@ -380,7 +380,7 @@ Vector<String> PluginDatabase::defaultPluginDirectories() // Add paths specific to each port #if PLATFORM(QT) Vector<String> qtPaths; - String qtPath(getenv("QTWEBKIT_PLUGIN_PATH")); + String qtPath(qgetenv("QTWEBKIT_PLUGIN_PATH").constData()); qtPath.split(UChar(':'), /* allowEmptyEntries */ false, qtPaths); paths.append(qtPaths); #endif |