Commit 6ea24611 authored by Florent Revest's avatar Florent Revest

mkcal: Fix build with GCC 6

parent a64a01d4
From 908d07c85c6f239a2e7be885bddba550b5eeea53 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Sun, 30 Oct 2016 21:27:08 +0100
Subject: [PATCH] Fixes an incorrect returned variable
---
src/servicehandler.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/servicehandler.cpp b/src/servicehandler.cpp
index 86ff41a..d951f08 100644
--- a/src/servicehandler.cpp
+++ b/src/servicehandler.cpp
@@ -271,7 +271,7 @@ QString ServiceHandler::emailAddress(const Notebook::Ptr &notebook, const Extend
QString ServiceHandler::displayName(const Notebook::Ptr &notebook, const ExtendedStorage::Ptr &storage)
{
if ( storage.isNull() || notebook.isNull() )
- return false;
+ return QString();
ServiceInterface* service = d->getServicePlugin(notebook, storage);
--
2.10.1
...@@ -4,7 +4,8 @@ LICENSE = "LGPL-2.1" ...@@ -4,7 +4,8 @@ LICENSE = "LGPL-2.1"
LIC_FILES_CHKSUM = "file://src/mkcal_export.h;beginline=1;endline=20;md5=6b5a610cd22589226883c2df189ff891" LIC_FILES_CHKSUM = "file://src/mkcal_export.h;beginline=1;endline=20;md5=6b5a610cd22589226883c2df189ff891"
SRC_URI = "git://git.merproject.org/mer-core/mkcal.git;protocol=https \ SRC_URI = "git://git.merproject.org/mer-core/mkcal.git;protocol=https \
file://0001-Removes-unused-reference-to-host-include-directories.patch" file://0001-Removes-unused-reference-to-host-include-directories.patch \
file://0002-Fixes-an-incorrect-returned-variable.patch"
SRCREV = "bccf4e2f28c65006c2cfa8a36acc584a59bcf501" SRCREV = "bccf4e2f28c65006c2cfa8a36acc584a59bcf501"
PR = "r1" PR = "r1"
PV = "+git${SRCREV}" PV = "+git${SRCREV}"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment