equal
deleted
inserted
replaced
318 m_pluginPathsWithTimes.clear(); |
318 m_pluginPathsWithTimes.clear(); |
319 m_registeredMIMETypes.clear(); |
319 m_registeredMIMETypes.clear(); |
320 m_preferredPlugins.clear(); |
320 m_preferredPlugins.clear(); |
321 } |
321 } |
322 |
322 |
323 #if (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX)) |
323 #if (!PLATFORM(WINCE)) && (!PLATFORM(SYMBIAN)) && (!PLATFORM(WIN_OS) || PLATFORM(WX) || !ENABLE(NETSCAPE_PLUGIN_API)) |
324 // For Safari/Win the following three methods are implemented |
324 // For Safari/Win the following three methods are implemented |
325 // in PluginDatabaseWin.cpp, but if we can use WebCore constructs |
325 // in PluginDatabaseWin.cpp, but if we can use WebCore constructs |
326 // for the logic we should perhaps move it here under XP_WIN? |
326 // for the logic we should perhaps move it here under XP_WIN? |
327 |
327 |
328 Vector<String> PluginDatabase::defaultPluginDirectories() |
328 Vector<String> PluginDatabase::defaultPluginDirectories() |
378 #endif |
378 #endif |
379 |
379 |
380 // Add paths specific to each port |
380 // Add paths specific to each port |
381 #if PLATFORM(QT) |
381 #if PLATFORM(QT) |
382 Vector<String> qtPaths; |
382 Vector<String> qtPaths; |
383 String qtPath(getenv("QTWEBKIT_PLUGIN_PATH")); |
383 String qtPath(qgetenv("QTWEBKIT_PLUGIN_PATH").constData()); |
384 qtPath.split(UChar(':'), /* allowEmptyEntries */ false, qtPaths); |
384 qtPath.split(UChar(':'), /* allowEmptyEntries */ false, qtPaths); |
385 paths.append(qtPaths); |
385 paths.append(qtPaths); |
386 #endif |
386 #endif |
387 |
387 |
388 return paths; |
388 return paths; |