]> cloud.milkyroute.net Git - dolphin.git/commit
Restore settings label and prevent warning when Baloo is unavailable
authorHenrik Fehlauer <rkflx@lab12.net>
Wed, 22 Aug 2018 21:48:53 +0000 (23:48 +0200)
committerHenrik Fehlauer <rkflx@lab12.net>
Wed, 22 Aug 2018 21:49:17 +0000 (23:49 +0200)
commit79c485a66de7444e87708ae25c5f8a661a89dd21
tree23e659931bd3d70132b963d27d4ab5f739114854
parent6674c9c387d0986e99698332727bf797257bf07d
Restore settings label and prevent warning when Baloo is unavailable

Summary:
As discussed in D14814, 6674c9c387d0 removed the {nav Show tooltips}
checkbox in Dolphin's preferences when Baloo is unavailabe at compile
time and thus the tooltip would not be functional. The {nav Miscellaneous}
label in front of the checkbox was also removed, even though it relates
to all options in that group.

In addition, after 6674c9c387d0 running Dolphin without Baloo support
would print
  QWidget::insertAction: Attempt to insert null action
on startup.

Both issues can be fixed with more `#ifdefs`.

Test Plan:
After building with `-DCMAKE_DISABLE_FIND_PACKAGE_KF5Baloo=ON`, the
{nav Show tooltips} checkbox is removed, the {nav Miscellaneous} label
is still there, and there is no warning printed.

Reviewers: elvisangelaccio

Reviewed By: elvisangelaccio

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D14980
src/dolphinmainwindow.cpp
src/settings/general/behaviorsettingspage.cpp