diff options
author | Samuli Piippo <samuli.piippo@qt.io> | 2020-01-08 14:10:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-11 14:03:48 +0100 |
commit | ca649e3f6f03c5351a090852ff93a23e7382c86a (patch) | |
tree | 3273897abf1ea0991a78ae884f967b2c88fa9811 /recipes-qt/qt5/qtbase | |
parent | ede15adc71f7f1c2acd63e96777b5d02d052a681 (diff) | |
download | meta-qt5-ca649e3f6f03c5351a090852ff93a23e7382c86a.tar.gz |
qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
6 files changed, 25 insertions, 24 deletions
diff --git a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch index b08ab11f..6157a52c 100644 --- a/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch +++ b/recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch | |||
@@ -18,7 +18,7 @@ diff --git a/configure.pri b/configure.pri | |||
18 | index 3778ece180..94bdfd2649 100644 | 18 | index 3778ece180..94bdfd2649 100644 |
19 | --- a/configure.pri | 19 | --- a/configure.pri |
20 | +++ b/configure.pri | 20 | +++ b/configure.pri |
21 | @@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) { | 21 | @@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) { |
22 | 22 | ||
23 | $${currentConfig}.output.qconfigSource = \ | 23 | $${currentConfig}.output.qconfigSource = \ |
24 | "/* Installation Info */" \ | 24 | "/* Installation Info */" \ |
diff --git a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch index 00db5344..d5c23c38 100644 --- a/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch +++ b/recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch | |||
@@ -7,13 +7,13 @@ musl does not have feenableexcept function | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | --- | 9 | --- |
10 | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +- | 10 | tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +- |
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 13 | diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
14 | index be2e2a2e08..68aa8369a5 100644 | 14 | index 676c66d..ba05aad 100644 |
15 | --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 15 | --- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
16 | +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 16 | +++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp |
17 | @@ -46,7 +46,7 @@ | 17 | @@ -46,7 +46,7 @@ |
18 | #include <private/qlocale_tools_p.h> | 18 | #include <private/qlocale_tools_p.h> |
19 | #include <qnumeric.h> | 19 | #include <qnumeric.h> |
diff --git a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch index e8d35776..1f1ec8bd 100644 --- a/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch +++ b/recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch | |||
@@ -25,15 +25,15 @@ diff --git a/mkspecs/common/clang.conf b/mkspecs/common/clang.conf | |||
25 | index df210fe42d..79a3ddf2f8 100644 | 25 | index df210fe42d..79a3ddf2f8 100644 |
26 | --- a/mkspecs/common/clang.conf | 26 | --- a/mkspecs/common/clang.conf |
27 | +++ b/mkspecs/common/clang.conf | 27 | +++ b/mkspecs/common/clang.conf |
28 | @@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX | 28 | @@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch |
29 | CONFIG += clang_pch_style | 29 | |
30 | QMAKE_PCH_OUTPUT_EXT = .pch | 30 | QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz |
31 | 31 | ||
32 | -QMAKE_CFLAGS_ISYSTEM = -isystem | 32 | -QMAKE_CFLAGS_ISYSTEM = -isystem |
33 | +QMAKE_CFLAGS_ISYSTEM = | 33 | +QMAKE_CFLAGS_ISYSTEM = |
34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} | 34 | QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT} |
35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} | 35 | QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT} |
36 | QMAKE_CFLAGS_LTCG = -flto | 36 | QMAKE_CFLAGS_LTCG = -flto=thin |
37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf | 37 | diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf |
38 | index 44b4267207..9756a02014 100644 | 38 | index 44b4267207..9756a02014 100644 |
39 | --- a/mkspecs/common/gcc-base.conf | 39 | --- a/mkspecs/common/gcc-base.conf |
diff --git a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch index b56224b9..34e41a18 100644 --- a/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch +++ b/recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch | |||
@@ -22,7 +22,7 @@ index a94f6d0eeb..ccab725843 100644 | |||
22 | static:no-static-ltcg { | 22 | static:no-static-ltcg { |
23 | # Static library but no-static-ltcg enabled: skip LTCG | 23 | # Static library but no-static-ltcg enabled: skip LTCG |
24 | -} else: CONFIG(release, debug|release) { | 24 | -} else: CONFIG(release, debug|release) { |
25 | +} else: CONFIG(release, debug|release)!host_build { | 25 | +} else: CONFIG(release, debug|release):!host_build { |
26 | # We need fat object files when creating static libraries on some platforms | 26 | separate_debug_info { |
27 | # so the linker will know to load a particular object from the library | 27 | # Evaluate single-$ variable references that have no valid value at mkspec loading time |
28 | # in the first place. On others, we have special ar and nm to create the symbol | 28 | QMAKE_LFLAGS_LTCG_SEPARATE_DEBUG_INFO ~= s/\\$\\{/\$\$\{/ |
diff --git a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch index 4832464f..c027fb68 100644 --- a/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch +++ b/recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch | |||
@@ -29,8 +29,8 @@ index 3555763..e7dc57c 100644 | |||
29 | QT_BEGIN_NAMESPACE | 29 | QT_BEGIN_NAMESPACE |
30 | 30 | ||
31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") | 31 | Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input") |
32 | @@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in | 32 | @@ -150,7 +155,10 @@ |
33 | qCDebug(qLcEvdevKey) << "switchLed" << led << state; | 33 | qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state)); |
34 | 34 | ||
35 | struct ::input_event led_ie; | 35 | struct ::input_event led_ie; |
36 | - ::gettimeofday(&led_ie.time, 0); | 36 | - ::gettimeofday(&led_ie.time, 0); |
@@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p | |||
45 | index 78728ef..1d65f9b 100644 | 45 | index 78728ef..1d65f9b 100644 |
46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 46 | --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp | 47 | +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp |
48 | @@ -55,6 +55,11 @@ | 48 | @@ -58,6 +58,11 @@ |
49 | #include <linux/input.h> | 49 | #include <linux/input.h> |
50 | #endif | 50 | #endif |
51 | 51 | ||
@@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644 | |||
57 | #include <math.h> | 57 | #include <math.h> |
58 | 58 | ||
59 | #if QT_CONFIG(mtdev) | 59 | #if QT_CONFIG(mtdev) |
60 | @@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput | 60 | @@ -573,7 +578,7 @@ |
61 | 61 | ||
62 | // update timestamps | 62 | // update timestamps |
63 | m_lastTimeStamp = m_timeStamp; | 63 | m_lastTimeStamp = m_timeStamp; |
diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch index 6d480105..2393673f 100644 --- a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch +++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch | |||
@@ -27,7 +27,7 @@ diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qcon | |||
27 | index 10458e41d7..8cfa40e461 100644 | 27 | index 10458e41d7..8cfa40e461 100644 |
28 | --- a/src/corelib/global/qconfig-bootstrapped.h | 28 | --- a/src/corelib/global/qconfig-bootstrapped.h |
29 | +++ b/src/corelib/global/qconfig-bootstrapped.h | 29 | +++ b/src/corelib/global/qconfig-bootstrapped.h |
30 | @@ -100,14 +100,14 @@ | 30 | @@ -104,7 +104,7 @@ |
31 | #define QT_FEATURE_process -1 | 31 | #define QT_FEATURE_process -1 |
32 | #define QT_FEATURE_regularexpression -1 | 32 | #define QT_FEATURE_regularexpression -1 |
33 | #ifdef __GLIBC_PREREQ | 33 | #ifdef __GLIBC_PREREQ |
@@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644 | |||
36 | #else | 36 | #else |
37 | # define QT_FEATURE_renameat2 -1 | 37 | # define QT_FEATURE_renameat2 -1 |
38 | #endif | 38 | #endif |
39 | #define QT_FEATURE_sharedmemory -1 | 39 | @@ -112,7 +112,7 @@ |
40 | #define QT_FEATURE_signaling_nan -1 | ||
40 | #define QT_FEATURE_slog2 -1 | 41 | #define QT_FEATURE_slog2 -1 |
41 | #ifdef __GLIBC_PREREQ | 42 | #ifdef __GLIBC_PREREQ |
42 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) | 43 | -# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) |
@@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644 | |||
45 | # define QT_FEATURE_statx -1 | 46 | # define QT_FEATURE_statx -1 |
46 | #endif | 47 | #endif |
47 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp | 48 | diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp |
48 | index b78e037865..9574d1a044 100644 | 49 | index c3abec8..6229c61 100644 |
49 | --- a/src/corelib/io/qfilesystemengine_unix.cpp | 50 | --- a/src/corelib/io/qfilesystemengine_unix.cpp |
50 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp | 51 | +++ b/src/corelib/io/qfilesystemengine_unix.cpp |
51 | @@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy | 52 | @@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy |
52 | if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) | 53 | Q_CHECK_FILE_NAME(srcPath, false); |
53 | return emptyFileEntryWarning(), false; | 54 | Q_CHECK_FILE_NAME(tgtPath, false); |
54 | 55 | ||
55 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) | 56 | -#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) |
56 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) | 57 | - if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) |