Commit 06b365ed authored by Sebastian Eichelbaum's avatar Sebastian Eichelbaum
Browse files

[FIX] - when qt webkit was not installed, this caused an error since the...

[FIX]  - when qt webkit was not installed, this caused an error since the m_frame member was not defined there. This is fixed.
parent 3808b57b
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <QtGui/QPixmap> #include <QtGui/QPixmap>
#include <QtGui/QIcon> #include <QtGui/QIcon>
#include <QtGui/QAction> #include <QtGui/QAction>
#include <QtCore/QUrl>
#else #else
#include <QtGui/QTextEdit> #include <QtGui/QTextEdit>
#endif #endif
...@@ -266,6 +267,7 @@ WQtModuleMetaInfo::~WQtModuleMetaInfo() ...@@ -266,6 +267,7 @@ WQtModuleMetaInfo::~WQtModuleMetaInfo()
void WQtModuleMetaInfo::resetContent() void WQtModuleMetaInfo::resetContent()
{ {
#ifndef QT4GUI_NOWEBKIT
// we use the module resource path as search URL // we use the module resource path as search URL
std::string moduleLocation( m_module->getLocalPath().string() ); std::string moduleLocation( m_module->getLocalPath().string() );
QString locationURL( QString( "file://" ) + QString::fromStdString( moduleLocation ) + "/" ); QString locationURL( QString( "file://" ) + QString::fromStdString( moduleLocation ) + "/" );
...@@ -273,4 +275,5 @@ void WQtModuleMetaInfo::resetContent() ...@@ -273,4 +275,5 @@ void WQtModuleMetaInfo::resetContent()
// set content // set content
std::string processedContent = htmlify( m_module->getMetaInformation() ); std::string processedContent = htmlify( m_module->getMetaInformation() );
m_frame->setHtml( processedContent.c_str(), QUrl( locationURL ) ); m_frame->setHtml( processedContent.c_str(), QUrl( locationURL ) );
#endif
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment