From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sun, 17 Nov 2019 17:54:40 +0000 (+0100)
Subject: Merge branch 'release/19.12'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/6bcdb624291f98dbbdb0a30477689bdb89dd70e8?hp=-c

Merge branch 'release/19.12'
---

6bcdb624291f98dbbdb0a30477689bdb89dd70e8
diff --combined src/CMakeLists.txt
index 648053014,617d59480..e240f7106
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -216,6 -216,7 +216,7 @@@ set(dolphinstatic_SRC
      panels/folders/folderspanel.cpp
      panels/terminal/terminalpanel.cpp
      search/dolphinfacetswidget.cpp
+     search/dolphinquery.cpp
      search/dolphinsearchbox.cpp
      settings/general/behaviorsettingspage.cpp
      settings/general/configurepreviewplugindialog.cpp
@@@ -300,10 -301,9 +301,10 @@@ ecm_add_app_icon(dolphin_SRCS ICONS ${I
  kf5_add_kdeinit_executable(dolphin ${dolphin_SRCS})
  
  
 -target_link_libraries(kdeinit_dolphin PRIVATE
 -    dolphinstatic
 +target_link_libraries(kdeinit_dolphin PUBLIC
      dolphinprivate
 +    PRIVATE
 +    dolphinstatic
      KF5::Crash
  )