done ... set plugin path, abort if env variable is not set; refs #130

This commit is contained in:
Marc Wäckerlin
2012-05-07 09:44:34 +00:00
parent 1190fd311e
commit 5df301d37e

View File

@@ -435,16 +435,10 @@ int main(int argv, char** argc) try {
} }
QSslConfiguration::setDefaultConfiguration(sslConfig); QSslConfiguration::setDefaultConfiguration(sslConfig);
//............................................................................ //............................................................................
std::cerr<<"LIBRARY PATHES:\n"<<app.libraryPaths().join("\n").toStdString()<<std::endl;
if (env.contains("QT_PLUGIN_PATH")) { if (env.contains("QT_PLUGIN_PATH")) {
foreach (QString path, env["QT_PLUGIN_PATH"].split(":")) { foreach (QString path, env["QT_PLUGIN_PATH"].split(":")) {
std::cerr<<"**** Setting: PLUGIN-PATH to "<<path.toStdString()<<std::endl;
app.addLibraryPath(path); app.addLibraryPath(path);
} }
} else {
std::cerr<<"**** Error: PLUGIN-PATH is not defined"<<std::endl;
app.addLibraryPath("lib");
abort();
} }
if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories(); if (env.contains("QTWEBKIT_PLUGIN_PATH")) qt_drt_overwritePluginDirectories();
Browser browser(actlib, urls, settings.get(), mimetypes, silent, Browser browser(actlib, urls, settings.get(), mimetypes, silent,