diff options
| author | Christoph Feck <[email protected]> | 2019-03-18 23:00:25 +0100 |
|---|---|---|
| committer | Christoph Feck <[email protected]> | 2019-03-18 23:00:25 +0100 |
| commit | b2b1f76031f872b42ae060dbb7a2f98d9b90496c (patch) | |
| tree | b175968ed8de0f4cc4f035c986709ee0ea880cd5 /src/dolphinviewcontainer.h | |
| parent | 81ff2a73f9d0985bca9e22f4e56d2b6738d15b4c (diff) | |
| parent | 5b463d82fed9a443b098888c0aee8a7b3b322666 (diff) | |
Merge remote-tracking branch 'origin/Applications/19.04'
Diffstat (limited to 'src/dolphinviewcontainer.h')
| -rw-r--r-- | src/dolphinviewcontainer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/dolphinviewcontainer.h b/src/dolphinviewcontainer.h index f33a5a118..2c4c7a7e1 100644 --- a/src/dolphinviewcontainer.h +++ b/src/dolphinviewcontainer.h @@ -20,7 +20,7 @@ #ifndef DOLPHINVIEWCONTAINER_H #define DOLPHINVIEWCONTAINER_H -#include "config-dolphin.h" +#include "config-kactivities.h" #include "views/dolphinview.h" #include <KCompletion> @@ -32,7 +32,7 @@ #include <QPushButton> #include <QWidget> -#ifdef KF5Activities_FOUND +#ifdef HAVE_KACTIVITIES namespace KActivities { class ResourceInstance; } @@ -343,7 +343,7 @@ private: QElapsedTimer m_statusBarTimestamp; // Time in ms since last update bool m_autoGrabFocus; -#ifdef KF5Activities_FOUND +#ifdef HAVE_KACTIVITIES private: KActivities::ResourceInstance * m_activityResourceInstance; #endif |