From 37c7989d11d10eea10d15157338932cfae1e525c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Mon, 18 Sep 2017 09:56:06 +0200 Subject: Replace use of cfree with free Quote from Linux man-pages: This function should never be used. Use free(3) instead. Starting with version 2.26, it has been removed from glibc. Arch Linux has switched to glibc 2.26 now, so cfree(ptr) is no longer available. Since cfree(ptr) is equivalent to free(ptr) (even on SunOS?), this patch replaces it with free(ptr). Change-Id: I50859ecfe45c965a9477541b3b7644fcbcc330e2 Reviewed-by: Michal Klocek --- src/core/api/qtbug-61521.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/api/qtbug-61521.cpp') diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp index 86d5998ef..1dcc4cfac 100644 --- a/src/core/api/qtbug-61521.cpp +++ b/src/core/api/qtbug-61521.cpp @@ -100,7 +100,7 @@ SHIM_HIDDEN void* ShimCalloc(size_t n, size_t size) { } SHIM_HIDDEN void ShimCFree(void* ptr) { - cfree(ptr); + free(ptr); } SHIM_HIDDEN void* ShimMemalign(size_t align, size_t s) { -- cgit v1.2.1 From 430802f773674f08a53260b1d0558353a8aefcda Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Thu, 14 Sep 2017 15:16:54 +0200 Subject: Fix license headers for libraries and plugins Task-number: QTBUG-60006 Change-Id: Ibc0507f300f52154e6f131056d826a4dcef009c2 Reviewed-by: Allan Sandfeld Jensen --- src/core/api/qtbug-61521.cpp | 1 - 1 file changed, 1 deletion(-) (limited to 'src/core/api/qtbug-61521.cpp') diff --git a/src/core/api/qtbug-61521.cpp b/src/core/api/qtbug-61521.cpp index 1dcc4cfac..002a1af22 100644 --- a/src/core/api/qtbug-61521.cpp +++ b/src/core/api/qtbug-61521.cpp @@ -5,7 +5,6 @@ ** ** This file is part of the QtWebEngine module of the Qt Toolkit. ** -** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in -- cgit v1.2.1