diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2018-09-11 16:42:32 +0300 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2018-09-25 09:34:49 +0000 |
commit | 3e7da25564d74195610adede9391ca733a0a1412 (patch) | |
tree | 6cc77f6d18df75d2c86191aea62e7336f24a1dbc /recipes-qt/qt5/qtbase | |
parent | cd0da4e4836cc1f35ad522b34ed254a83b270167 (diff) |
qt5: update to Qt 5.11.2
Update The-Qt-Company-Commercial license to the actual commercial
license which also replaces preview license in qtbase. Remove old
licenses that are no longer used in any module.
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r-- | recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch | 69 |
1 files changed, 0 insertions, 69 deletions
diff --git a/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch b/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch deleted file mode 100644 index 0cfd5428..00000000 --- a/recipes-qt/qt5/qtbase/0014-Fix-qmake-build-with-glibc-2.28.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 721d05fbe9e70518ed2288c089ff5d4036ea7ac7 Mon Sep 17 00:00:00 2001 -From: Thiago Macieira <thiago.macieira@intel.com> -Date: Tue, 7 Aug 2018 09:38:42 -0700 -Subject: [PATCH] Fix qmake build with glibc 2.28 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We haven't yet run the configure checks to see if statx and renameat2 -are present in glibc, so this fails when we redefine the structures and -functions. - -linux/stat.h:56:8: error: redefinition of 'struct statx_timestamp' -bits/statx.h:25:8: note: previous definition of 'struct statx_timestamp' -qfilesystemengine_unix.cpp:110:12: error: 'int renameat2(int, const char*, int, const char*, unsigned int)' was declared 'extern' and later 'static' [-fpermissive] - -Change-Id: Ia741b559c24d46c78fb2fffd1548a792d22e3368 -Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> -Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> ---- - src/corelib/global/qconfig-bootstrapped.h | 12 ++++++++++-- - src/corelib/io/qfilesystemengine_unix.cpp | 2 +- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 3469ebe5e6..c5585ea32a 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -98,10 +98,18 @@ - #define QT_NO_QOBJECT - #define QT_FEATURE_process -1 - #define QT_FEATURE_regularexpression -1 --#define QT_FEATURE_renameat2 -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_renameat2 -1 -+#endif - #define QT_FEATURE_sharedmemory -1 - #define QT_FEATURE_slog2 -1 --#define QT_FEATURE_statx -1 -+#ifdef __GLIBC_PREREQ -+# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+#else -+# define QT_FEATURE_statx -1 -+#endif - #define QT_FEATURE_syslog -1 - #define QT_NO_SYSTEMLOCALE - #define QT_FEATURE_systemsemaphore -1 -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index be6ce48d0c..3e4f33a3ba 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -91,7 +91,6 @@ extern "C" NSString *NSTemporaryDirectory(); - # include <sys/syscall.h> - # include <sys/sendfile.h> - # include <linux/fs.h> --# include <linux/stat.h> - - // in case linux/fs.h is too old and doesn't define it: - #ifndef FICLONE -@@ -112,6 +111,7 @@ static int renameat2(int oldfd, const char *oldpath, int newfd, const char *newp - # endif - - # if !QT_CONFIG(statx) && defined(SYS_statx) -+# include <linux/stat.h> - static int statx(int dirfd, const char *pathname, int flag, unsigned mask, struct statx *statxbuf) - { return syscall(SYS_statx, dirfd, pathname, flag, mask, statxbuf); } - # elif !QT_CONFIG(statx) && !defined(SYS_statx) |