commit f7b16502a52593a9ef1ead30c6e3135d98d030e3
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue May 23 12:19:12 2017 +0100

    Update version number for 5.8.7
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 760e1ba..c9c1171 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KDE-CLI-Tools)
-set(PROJECT_VERSION "5.8.6")
+set(PROJECT_VERSION "5.8.7")
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")

commit 19a6bb179d5fd5056f34568651bab34e9db390f7
Author: Albert Astals Cid <aacid@kde.org>
Date:   Sat Apr 8 19:10:12 2017 +0200

    Fix query for available modules
    
    Summary:
    The old query was bad because two reasons:
     * it didn't use the same query systemsettings uses
     * it didn't use exist so if the first property did not exist the second one was not evaluated since the parser bailed out
    
    Test Plan: Ran kcmshell5 --list, it's better now
    
    Subscribers: plasma-devel
    
    Tags: #plasma
    
    BUGS: 378548
    
    Differential Revision: https://phabricator.kde.org/D5355

diff --git a/kcmshell/main.cpp b/kcmshell/main.cpp
index 27b60af..c49373a 100644
--- a/kcmshell/main.cpp
+++ b/kcmshell/main.cpp
@@ -57,7 +57,9 @@ static bool caseInsensitiveLessThan(const KService::Ptr s1, const KService::Ptr
 
 static void listModules()
 {
-    const KService::List services = KServiceTypeTrader::self()->query( "KCModule", "[X-KDE-ParentApp] == 'kcontrol' or [X-KDE-ParentApp] == 'kinfocenter'" );
+    // First condition is what systemsettings does, second what kinfocenter does, make sure this is kept in sync
+    // We need the exist calls because otherwise the trader language aborts if the property doesn't exist and the second part of the or is not evaluated
+    const KService::List services = KServiceTypeTrader::self()->query( QStringLiteral("KCModule"), QStringLiteral("(exist [X-KDE-System-Settings-Parent-Category] and [X-KDE-System-Settings-Parent-Category] != '') or (exist [X-KDE-ParentApp] and [X-KDE-ParentApp] == 'kinfocenter')") );
     for( KService::List::const_iterator it = services.constBegin(); it != services.constEnd(); ++it) {
         const KService::Ptr s = (*it);
         if (!KAuthorized::authorizeControlModule(s->menuId()))

commit 33b284e286aec41f3801f98e3e01976b23bef5b9
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Feb 21 11:39:34 2017 +0000

    Update version number for 5.8.6
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4adc589..760e1ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KDE-CLI-Tools)
-set(PROJECT_VERSION "5.8.5")
+set(PROJECT_VERSION "5.8.6")
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")

commit bc8a645a72cf9d275f85b1dd0dd3b1be9a511a8b
Author: Jonathan Riddell <jr@jriddell.org>
Date:   Tue Dec 27 09:22:55 2016 +0000

    Update version number for 5.8.5
    GIT_SILENT

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1af9928..4adc589 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 project(KDE-CLI-Tools)
-set(PROJECT_VERSION "5.8.4")
+set(PROJECT_VERSION "5.8.5")
 
 cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
 set(QT_MIN_VERSION "5.4.0")