[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kde-baseapps/frameworks] lib/konq/src: Only install konqpopupmenuplugin.desktop if the KF5 version 
From:       Frank Reininghaus <frank78ac () googlemail ! com>
Date:       2015-11-11 19:17:51
Message-ID: E1Zwatz-0006gO-AC () scm ! kde ! org
[Download RAW message or body]

Git commit b919367c8550024aca53c7f4d219a5b4c3317964 by Frank Reininghaus.
Committed on 11/11/2015 at 19:16.
Pushed by freininghaus into branch 'frameworks'.

Only install konqpopupmenuplugin.desktop if the KF5 version is < 5.16

Since version 5.16, this file is installed by KIO.

REVIEW: 125995
CCBUG: 353642

M  +8    -1    lib/konq/src/CMakeLists.txt

http://commits.kde.org/kde-baseapps/b919367c8550024aca53c7f4d219a5b4c3317964

diff --git a/lib/konq/src/CMakeLists.txt b/lib/konq/src/CMakeLists.txt
index b2d0c7e..a79d11e 100644
--- a/lib/konq/src/CMakeLists.txt
+++ b/lib/konq/src/CMakeLists.txt
@@ -64,10 +64,17 @@ install(FILES
     COMPONENT Devel
 )
 
-install(FILES konqpopupmenuplugin.desktop konqdndpopupmenuplugin.desktop
+install(FILES konqdndpopupmenuplugin.desktop
     DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
 )
 
+# TODO: Remove this block and the corresponding file if we depend on a KIO version >= 5.16
+if ("${KF5_VERSION}" VERSION_LESS "5.16")
+    install(FILES konqpopupmenuplugin.desktop
+        DESTINATION ${KDE_INSTALL_KSERVICETYPES5DIR}
+    )
+endif()
+
 add_subdirectory(pics)
 add_subdirectory(favicons)
 add_subdirectory(Templates)
[prev in list] [next in list] [prev in thread] [next in thread]