Fix build issues if Nepomuk is not available

svn path=/trunk/KDE/kdebase/apps/; revision=1190010

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9d8df1adf4ae91358d55f3fe9ad356187b905272..e435cfb446eec8f470eedbefc496703a237b3626 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,6 @@ set(dolphin_SRCS
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp
     dolphincontextmenu.cpp
     filterbar/filterbar.cpp
     main.cpp

-    panels/facets/facetpanel.cpp

     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
     panels/information/pixmapviewer.cpp
     panels/information/informationpanel.cpp
     panels/information/informationpanelcontent.cpp
     panels/information/pixmapviewer.cpp


@@ -149,6 +148,7 @@ kde4_add_kcfg_files(dolphin_SRCS
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}
 if(Nepomuk_FOUND)
     set(dolphin_SRCS
         ${dolphin_SRCS}

+        panels/facets/facetpanel.cpp

         search/filters/abstractsearchfilterwidget.cpp
         search/filters/datesearchfilterwidget.cpp
         search/filters/ratingsearchfilterwidget.cpp
         search/filters/abstractsearchfilterwidget.cpp
         search/filters/datesearchfilterwidget.cpp
         search/filters/ratingsearchfilterwidget.cpp

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index da94ffcd501d87d4376e702436ca12792ef1d6fe..efae23d6e092e69fe96ba65be8edbdf305c41e9b 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -1564,6 +1564,7 @@ void DolphinMainWindow::setupDockWidgets()
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
 
     // setup "Facets"
             this, SLOT(handlePlacesClick(KUrl, Qt::MouseButtons)));
 
     // setup "Facets"

+#ifdef HAVE_NEPOMUK

    QDockWidget* facetDock = new QDockWidget(i18nc("@title:window", "Filter"));
    facetDock->setObjectName("facetDock");
    facetDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
    QDockWidget* facetDock = new QDockWidget(i18nc("@title:window", "Filter"));
    facetDock->setObjectName("facetDock");
    facetDock->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);


@@ -1576,6 +1577,7 @@ void DolphinMainWindow::setupDockWidgets()
    addDockWidget(Qt::RightDockWidgetArea, facetDock);
    connect(this, SIGNAL(urlChanged(KUrl)),
            facetPanel, SLOT(setUrl(KUrl)));
    addDockWidget(Qt::RightDockWidgetArea, facetDock);
    connect(this, SIGNAL(urlChanged(KUrl)),
            facetPanel, SLOT(setUrl(KUrl)));

+#endif

 
     // setup "Terminal"
 #ifndef Q_OS_WIN
 
     // setup "Terminal"
 #ifndef Q_OS_WIN


@@ -1631,7 +1633,9 @@ void DolphinMainWindow::setupDockWidgets()
     panelsMenu->addAction(placesAction);
     panelsMenu->addAction(infoAction);
     panelsMenu->addAction(foldersAction);
     panelsMenu->addAction(placesAction);
     panelsMenu->addAction(infoAction);
     panelsMenu->addAction(foldersAction);

+#ifdef HAVE_NEPOMUK

     panelsMenu->addAction(facetAction);
     panelsMenu->addAction(facetAction);

+#endif

 #ifndef Q_OS_WIN
     panelsMenu->addAction(terminalAction);
 #endif
 #ifndef Q_OS_WIN
     panelsMenu->addAction(terminalAction);
 #endif