|
|
|
@ -364,11 +364,15 @@ int main(int argv, char** argc) try { |
|
|
|
|
" start in bookmark-edition mode\n" |
|
|
|
|
" <url> optional full URL\n" |
|
|
|
|
"Environment:\n" |
|
|
|
|
" LANGUAGE \"de\", \"en\", ... (actual: %5)\n" |
|
|
|
|
" PROXY_TYPE \"http\" or \"socks\" or \"\" (actual: %2)\n" |
|
|
|
|
" LANGUAGE \"de\", \"en\", ... " |
|
|
|
|
"(actual: %5)\n" |
|
|
|
|
" PROXY_TYPE \"http\" or \"socks\" or \"\" " |
|
|
|
|
"(actual: %2)\n" |
|
|
|
|
" PROXY_PORT proxy port number (actual: %3)\n" |
|
|
|
|
" PROXY_HOST proxy host name (actual: %4)\n" |
|
|
|
|
" SWISS_USERAGENT fake user agent (actual: %6)\n") |
|
|
|
|
" SWISS_USERAGENT fake user agent (actual: %6)\n" |
|
|
|
|
" QT_PLUGIN_PATH path to plugins dir (actual: %7)\n" |
|
|
|
|
" QTWEBKIT_PLUGIN_PATH path to netscape plugins (actual: %8)\n") |
|
|
|
|
.arg(QFileInfo(argc[0]).fileName()) |
|
|
|
|
.arg(env["PROXY_TYPE"]).arg(env["PROXY_PORT"]).arg(env["PROXY_HOST"]) |
|
|
|
|
.arg(env["LANGUAGE"]).arg(env["SWISS_USERAGENT"]) |
|
|
|
@ -435,10 +439,16 @@ int main(int argv, char** argc) try { |
|
|
|
|
} |
|
|
|
|
QSslConfiguration::setDefaultConfiguration(sslConfig); |
|
|
|
|
//............................................................................
|
|
|
|
|
std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString() |
|
|
|
|
<<std::endl;
|
|
|
|
|
if (env.contains("QT_PLUGIN_PATH")) { |
|
|
|
|
foreach (QString path, env["QT_PLUGIN_PATH"].split(":")) { |
|
|
|
|
std::cerr<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl; |
|
|
|
|
app.addLibraryPath(path); |
|
|
|
|
} |
|
|
|
|
} else { |
|
|
|
|
std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl; |
|
|
|
|
abort(); |
|
|
|
|
} |
|
|
|
|
if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories(); |
|
|
|
|
Browser browser(actlib, urls, settings.get(), mimetypes, silent, |
|
|
|
|