Fix Qt4 build

KDAB · Jul 20, 2018 · bf2d8a1 · bf2d8a1
1 parent 471cb3c
commit bf2d8a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/3rdparty/kuserfeedback/CMakeLists.txt b/3rdparty/kuserfeedback/CMakeLists.txt
@@ -6,7 +6,6 @@ set(gammaray_userfeedback_srcs
     common/surveytargetexpressionparser_p.cpp
     core/abstractdatasource.cpp
     core/applicationversionsource.cpp
-    core/auditloguicontroller.cpp
     core/compilerinfosource.cpp
     core/feedbackconfiguicontroller.cpp
     core/openglinfosource.cpp
@@ -17,11 +16,16 @@ set(gammaray_userfeedback_srcs
     core/startcountsource.cpp
     core/surveyinfo.cpp
     core/usagetimesource.cpp
-    widgets/auditlogbrowserdialog.cpp
     widgets/feedbackconfigdialog.cpp
     widgets/feedbackconfigwidget.cpp
     widgets/notificationpopup.cpp
 )
+if (Qt5Core_FOUND)
+    list(APPEND gammaray_userfeedback_srcs
+        core/auditloguicontroller.cpp
+        widgets/auditlogbrowserdialog.cpp
+    )
+endif()
 
 add_library(gammaray_kuserfeedback SHARED ${gammaray_userfeedback_srcs})
 # Disable warnings for generated stuff

diff --git a/3rdparty/kuserfeedback/core/auditloguicontroller.cpp b/3rdparty/kuserfeedback/core/auditloguicontroller.cpp
@@ -199,7 +199,7 @@ QString AuditLogUiController::logEntry(const QDateTime &dt) const
         entries.push_back(e);
     }
 
-    std::sort(entries.begin(), entries.end(), [](const Entry &lhs, const Entry &rhs) {
+    std::sort(entries.begin(), entries.end(), [](const Entry &lhs, const Entry &rhs) -> bool {
         if (lhs.mode == rhs.mode)
             return lhs.key < rhs.key;
         return lhs.mode < rhs.mode;