diff options
| author | Christophe Giboudeaux <[email protected]> | 2013-01-07 18:22:28 +0100 |
|---|---|---|
| committer | Christophe Giboudeaux <[email protected]> | 2013-01-07 18:22:28 +0100 |
| commit | feae9f9dfc9e1a04135ddc7efa16eb1294be4850 (patch) | |
| tree | dbd3d5dc909d77fb6b68a1352623f0b9afa3faca /src/views/tooltips/filemetadatatooltip.cpp | |
| parent | 2e88d73423fd88f676620d714ce159587656e6ca (diff) | |
| parent | 6b351820a3405a1ce60916132a277435efabd685 (diff) | |
Merge branch 'KDE/4.10'
Conflicts:
dolphin/src/CMakeLists.txt
Diffstat (limited to 'src/views/tooltips/filemetadatatooltip.cpp')
| -rw-r--r-- | src/views/tooltips/filemetadatatooltip.cpp | 8 |
1 files changed, 8 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)), |