Merge branch 'KDE/4.10'

Conflicts:
	dolphin/src/CMakeLists.txt

2 files changed, 17 insertions, 0 deletions

diff --git a/src/views/tooltips/filemetadatatooltip.cpp b/src/views/tooltips/filemetadatatooltip.cpp
index d0cba741e..77a07e268 100644
--- a/src/views/tooltips/filemetadatatooltip.cpp
+++ b/src/views/tooltips/filemetadatatooltip.cpp
@@ -30,7 +30,11 @@
 #include <QStylePainter>
 #include <QVBoxLayout>
 
+#ifndef HAVE_NEPOMUK
+#include <KFileMetaDataWidget>
+#else
 #include <nepomuk2/filemetadatawidget.h>
+#endif
 
 // For the blurred tooltip background
 #include <plasma/windoweffects.h>
@@ -56,7 +60,11 @@ FileMetaDataToolTip::FileMetaDataToolTip(QWidget* parent) :
     m_name->setFont(font);
 
     // Create widget for the meta data
+#ifndef HAVE_NEPOMUK
+    m_fileMetaDataWidget = new KFileMetaDataWidget(this);
+#else
     m_fileMetaDataWidget = new Nepomuk2::FileMetaDataWidget(this);
+#endif
     m_fileMetaDataWidget->setForegroundRole(QPalette::ToolTipText);
     m_fileMetaDataWidget->setReadOnly(true);
     connect(m_fileMetaDataWidget, SIGNAL(metaDataRequestFinished(KFileItemList)),
diff --git a/src/views/tooltips/filemetadatatooltip.h b/src/views/tooltips/filemetadatatooltip.h
index aa7ce63ed..e7cb3f039 100644
--- a/src/views/tooltips/filemetadatatooltip.h
+++ b/src/views/tooltips/filemetadatatooltip.h
@@ -23,13 +23,18 @@
 #define FILEMETADATATOOLTIP_H
 
 #include <QWidget>
+#include "config-nepomuk.h"
 
 class KFileItemList;
 class QLabel;
 
+#ifndef HAVE_NEPOMUK
+class KFileMetaDataWidget;
+#else
 namespace Nepomuk2 {
     class FileMetaDataWidget;
 }
+#endif
 
 /**
  * @brief Tooltip, that shows the meta information and a preview of one
@@ -71,7 +76,11 @@ protected:
 private:
     QLabel* m_preview;
     QLabel* m_name;
+#ifndef HAVE_NEPOMUK
+    KFileMetaDataWidget* m_fileMetaDataWidget;
+#else
     Nepomuk2::FileMetaDataWidget* m_fileMetaDataWidget;
+#endif
 };
 
 #endif