Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
meta-nemo
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
NemoMobile
meta-nemo
Commits
6ea24611
Commit
6ea24611
authored
Oct 31, 2016
by
Florent Revest
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkcal: Fix build with GCC 6
parent
a64a01d4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
27 additions
and
1 deletion
+27
-1
0002-Fixes-an-incorrect-returned-variable.patch
...qt5/mkcal/0002-Fixes-an-incorrect-returned-variable.patch
+25
-0
mkcal_git.bb
recipes-qt/qt5/mkcal_git.bb
+2
-1
No files found.
recipes-qt/qt5/mkcal/0002-Fixes-an-incorrect-returned-variable.patch
0 → 100644
View file @
6ea24611
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 ¬ebook, const Extend
QString ServiceHandler::displayName(const Notebook::Ptr ¬ebook, const ExtendedStorage::Ptr &storage)
{
if ( storage.isNull() || notebook.isNull() )
- return false;
+ return QString();
ServiceInterface* service = d->getServicePlugin(notebook, storage);
--
2.10.1
recipes-qt/qt5/mkcal_git.bb
View file @
6ea24611
...
@@ -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}"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment