Fix build without KF5Activities

BUG: 340961
FIXED-IN: 5.2.0
REVIEW: 121202
This commit is contained in:
Martin Gräßlin 2014-11-21 16:48:39 +01:00
parent 26cf3195be
commit 482f89b91f
5 changed files with 14 additions and 1 deletions

View file

@ -1734,6 +1734,8 @@ void Client::setOnAllActivities(bool on)
} else {
setOnActivity(Activities::self()->current(), true);
}
#else
Q_UNUSED(on)
#endif
}

View file

@ -120,6 +120,7 @@ bool DBusInterface::startActivity(const QString &in0)
#ifdef KWIN_BUILD_ACTIVITIES
return Activities::self()->start(in0);
#else
Q_UNUSED(in0)
return false;
#endif
}
@ -129,6 +130,7 @@ bool DBusInterface::stopActivity(const QString &in0)
#ifdef KWIN_BUILD_ACTIVITIES
return Activities::self()->stop(in0);
#else
Q_UNUSED(in0)
return false;
#endif
}

View file

@ -110,7 +110,7 @@ RootInfo *RootInfo::create()
NET::WM2FullPlacement |
NET::WM2FullscreenMonitors |
NET::WM2KDEShadow;
#if KWIN_BUILD_ACTIVITIES
#ifdef KWIN_BUILD_ACTIVITIES
properties2 |= NET::WM2Activities;
#endif
const NET::Actions actions = NET::ActionMove |

View file

@ -18,7 +18,10 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*********************************************************************/
#include "scripting_model.h"
#include <config-kwin.h>
#ifdef KWIN_BUILD_ACTIVITIES
#include "activities.h"
#endif
#include "client.h"
#include "screens.h"
#include "workspace.h"
@ -496,6 +499,8 @@ void ForkLevel::activityAdded(const QString &activityId)
childLevel->init();
addChild(childLevel);
emit endInsert();
#else
Q_UNUSED(activityId)
#endif
}
@ -513,6 +518,8 @@ void ForkLevel::activityRemoved(const QString &activityId)
break;
}
}
#else
Q_UNUSED(activityId)
#endif
}

View file

@ -810,6 +810,8 @@ void UserActionsMenu::slotToggleOnActivity(QAction *action)
}
}
}
#else
Q_UNUSED(action)
#endif
}