fixing a typo in an include and properly making qwebkit optional

diff --git a/src/qtui/chatscene.cpp b/src/qtui/chatscene.cpp
index cab42c6..e99509e 100644 (file)
--- a/src/qtui/chatscene.cpp
+++ b/src/qtui/chatscene.cpp
@@ -483,6 +483,11 @@ void ChatScene::updateSceneRect(const QRectF &rect) {
 
 
 void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {
 
 
 void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const QRectF &urlRect) {

+#ifndef HAVE_WEBKIT
+  Q_UNUSED(parentItem)
+  Q_UNUSED(url)
+  Q_UNUSED(urlRect)
+#else

   if(webPreview.parentItem != parentItem)
     webPreview.parentItem = parentItem;
 
   if(webPreview.parentItem != parentItem)
     webPreview.parentItem = parentItem;
 


@@ -508,9 +513,13 @@ void ChatScene::loadWebPreview(ChatItem *parentItem, const QString &url, const Q
 
     webPreview.previewItem->setPos(previewX, previewY);
   }
 
     webPreview.previewItem->setPos(previewX, previewY);
   }

+#endif

 }
 
 void ChatScene::clearWebPreview(ChatItem *parentItem) {
 }
 
 void ChatScene::clearWebPreview(ChatItem *parentItem) {

+#ifndef HAVE_WEBKIT
+  Q_UNUSED(parentItem)
+#else

   if(parentItem == 0 || webPreview.parentItem == parentItem) {
     if(webPreview.previewItem) {
       removeItem(webPreview.previewItem);
   if(parentItem == 0 || webPreview.parentItem == parentItem) {
     if(webPreview.previewItem) {
       removeItem(webPreview.previewItem);


@@ -521,4 +530,5 @@ void ChatScene::clearWebPreview(ChatItem *parentItem) {
     webPreview.url = QString();
     webPreview.urlRect = QRectF();
   }
     webPreview.url = QString();
     webPreview.urlRect = QRectF();
   }

+#endif

 }
 }

diff --git a/src/qtui/webpreviewitem.cpp b/src/qtui/webpreviewitem.cpp
index 7070c11..29dfede 100644 (file)
--- a/src/qtui/webpreviewitem.cpp
+++ b/src/qtui/webpreviewitem.cpp
@@ -24,7 +24,7 @@
 
 #include <QGraphicsProxyWidget>
 #include <QPainter>
 
 #include <QGraphicsProxyWidget>
 #include <QPainter>

-#include <QWebview>
+#include <QWebView>

 
 WebPreviewItem::WebPreviewItem(const QString &url)
   : QGraphicsItem(0), // needs to be a top level item as we otherwise cannot guarantee that it's on top of other chatlines
 
 WebPreviewItem::WebPreviewItem(const QString &url)
   : QGraphicsItem(0), // needs to be a top level item as we otherwise cannot guarantee that it's on top of other chatlines