mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
kde-baseapps frameworks dolphin with snapshot frameworks branch baloo/baloo-widgets path fixes.
This commit is contained in:
parent
6bccf73e92
commit
e41c969063
|
@ -1,4 +1,4 @@
|
||||||
find_package(Baloo 4.97)
|
find_package(KF5Baloo 4.97)
|
||||||
set_package_properties(Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
|
set_package_properties(Baloo PROPERTIES DESCRIPTION "Baloo Core libraries"
|
||||||
URL "http://www.kde.org"
|
URL "http://www.kde.org"
|
||||||
TYPE OPTIONAL
|
TYPE OPTIONAL
|
||||||
|
@ -18,7 +18,7 @@ set_package_properties(KFileMetaData PROPERTIES
|
||||||
PURPOSE "For accessing file metadata labels"
|
PURPOSE "For accessing file metadata labels"
|
||||||
)
|
)
|
||||||
|
|
||||||
if (Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
|
if (KF5Baloo_FOUND AND BalooWidgets_FOUND AND KFileMetaData_FOUND)
|
||||||
set(HAVE_BALOO TRUE)
|
set(HAVE_BALOO TRUE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
|
@ -44,9 +44,9 @@
|
||||||
|
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include "private/kbaloorolesprovider.h"
|
#include "private/kbaloorolesprovider.h"
|
||||||
#include <baloo/file.h>
|
#include <KF5/Baloo/file.h>
|
||||||
#include <baloo/filefetchjob.h>
|
#include <KF5/Baloo/filefetchjob.h>
|
||||||
#include <baloo/filemonitor.h>
|
#include <KF5/Baloo/filemonitor.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// #define KFILEITEMMODELROLESUPDATER_DEBUG
|
// #define KFILEITEMMODELROLESUPDATER_DEBUG
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
#include <KGlobal>
|
#include <KGlobal>
|
||||||
#include <KLocale>
|
#include <KLocale>
|
||||||
|
|
||||||
#include <baloo/file.h>
|
#include <KF5/Baloo/file.h>
|
||||||
#include <kfilemetadata/propertyinfo.h>
|
#include <kfilemetadata/propertyinfo.h>
|
||||||
|
|
||||||
#include <QTime>
|
#include <QTime>
|
||||||
|
|
|
@ -53,8 +53,8 @@
|
||||||
#include <views/viewproperties.h>
|
#include <views/viewproperties.h>
|
||||||
|
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/query.h>
|
#include <KF5/Baloo/query.h>
|
||||||
#include <baloo/indexerconfig.h>
|
#include <KF5/Baloo/indexerconfig.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
|
|
||||||
#include <config-baloo.h>
|
#include <config-baloo.h>
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/term.h>
|
#include <KF5/Baloo/term.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
class QButtonGroup;
|
class QButtonGroup;
|
||||||
|
|
|
@ -42,9 +42,9 @@
|
||||||
|
|
||||||
#include <config-baloo.h>
|
#include <config-baloo.h>
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/query.h>
|
#include <KF5/Baloo/query.h>
|
||||||
#include <baloo/term.h>
|
#include <KF5/Baloo/term.h>
|
||||||
#include <baloo/indexerconfig.h>
|
#include <KF5/Baloo/indexerconfig.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
|
DolphinSearchBox::DolphinSearchBox(QWidget* parent) :
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
#include <QVBoxLayout>
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/indexerconfig.h>
|
#include <KF5/Baloo/indexerconfig.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
|
AdditionalInfoDialog::AdditionalInfoDialog(QWidget* parent,
|
||||||
|
|
|
@ -79,7 +79,7 @@
|
||||||
#include "zoomlevelinfo.h"
|
#include "zoomlevelinfo.h"
|
||||||
|
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/indexerconfig.h>
|
#include <KF5/Baloo/indexerconfig.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
|
|
|
@ -44,7 +44,7 @@
|
||||||
#include <KDebug>
|
#include <KDebug>
|
||||||
|
|
||||||
#ifdef HAVE_BALOO
|
#ifdef HAVE_BALOO
|
||||||
#include <baloo/indexerconfig.h>
|
#include <KF5/Baloo/indexerconfig.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
|
DolphinViewActionHandler::DolphinViewActionHandler(KActionCollection* collection, QObject* parent) :
|
||||||
|
|
Loading…
Reference in a new issue