Fix redefinition of QAddConst
f765c29924a1
Actions

Authored by kfunk on Apr 5 2017, 8:18 AM.

Description

Fix redefinition of QAddConst

Summary:

/home/kfunk/devel/src/kf5/akonadi/src/server/helper_p.h:27:30: error: redefinition of 'QAddConst'
template <typename T> struct QAddConst {
                             ^
/home/kfunk/devel/src/kf5/akonadi/src/server/utils.h:35:30: note: previous definition is here
template <typename T> struct QAddConst {
                             ^

Fixed build against Qt 5.6

Reviewers: mlaurent

Reviewed By: mlaurent

Subscribers: KDE PIM

Tags: KDE PIM

Differential Revision: https://phabricator.kde.org/D5304

Details

Committed

kfunk

Apr 6 2017, 1:05 PM

Reviewer

mlaurent

Differential Revision

D5304: Fix redefinition of QAddConst

Parents

R165:37394cbc4502: Port some foreach code

Branches

Unknown

Tags

Unknown

kfunk committed R165:f765c29924a1: Fix redefinition of QAddConst (authored by kfunk).Apr 6 2017, 1:05 PM

Changes (10)

				Path	Packages
	M			src/server/collectionscheduler.cpp
	M			src/server/handler/create.cpp
	M			src/server/handler/fetchhelper.cpp
	M			src/server/handler/list.cpp
	M			src/server/handler/searchpersistent.cpp
	M			src/server/notificationmanager.cpp
	M			src/server/preprocessormanager.cpp
	M			src/server/search/searchmanager.cpp
	M			src/server/storage/querybuilder.cpp
	M			src/server/utils.h