aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2020-01-08 14:10:13 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-01-11 14:03:48 +0100
commitca649e3f6f03c5351a090852ff93a23e7382c86a (patch)
tree3273897abf1ea0991a78ae884f967b2c88fa9811 /recipes-qt/qt5/qtbase
parentede15adc71f7f1c2acd63e96777b5d02d052a681 (diff)
qt5: Update to Qt 5.14.0
Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'recipes-qt/qt5/qtbase')
-rw-r--r--recipes-qt/qt5/qtbase/0004-configure-bump-path-length-from-256-to-512-character.patch2
-rw-r--r--recipes-qt/qt5/qtbase/0011-tst_qlocale-Enable-QT_USE_FENV-only-on-glibc.patch10
-rw-r--r--recipes-qt/qt5/qtbase/0012-mkspecs-common-gcc-base.conf-Use-I-instead-of-isyste.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0013-Disable-ltcg-for-host_build.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0018-input-Make-use-of-timeval-portable-for-64bit-time_t.patch8
-rw-r--r--recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch13
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
index 3778ece180..94bdfd2649 100644
--- a/configure.pri
+++ b/configure.pri
-@@ -851,10 +851,10 @@ defineTest(qtConfOutput_preparePaths) {
+@@ -844,10 +844,10 @@ defineTest(qtConfOutput_preparePaths) {
$${currentConfig}.output.qconfigSource = \
"/* 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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 2 +-
+ tests/auto/corelib/text/qlocale/tst_qlocale.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
-index be2e2a2e08..68aa8369a5 100644
---- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
-+++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp
+diff --git a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
+index 676c66d..ba05aad 100644
+--- a/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
++++ b/tests/auto/corelib/text/qlocale/tst_qlocale.cpp
@@ -46,7 +46,7 @@
#include <private/qlocale_tools_p.h>
#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
index df210fe42d..79a3ddf2f8 100644
--- a/mkspecs/common/clang.conf
+++ b/mkspecs/common/clang.conf
-@@ -16,7 +16,7 @@ QMAKE_LINK_SHLIB = $$QMAKE_CXX
- CONFIG += clang_pch_style
- QMAKE_PCH_OUTPUT_EXT = .pch
+@@ -18,7 +18,7 @@ QMAKE_PCH_OUTPUT_EXT = .pch
+
+ QMAKE_CFLAGS_OPTIMIZE_SIZE = -Oz
-QMAKE_CFLAGS_ISYSTEM = -isystem
+QMAKE_CFLAGS_ISYSTEM =
QMAKE_CFLAGS_PRECOMPILE = -x c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
QMAKE_CFLAGS_USE_PRECOMPILE = -Xclang -include-pch -Xclang ${QMAKE_PCH_OUTPUT}
- QMAKE_CFLAGS_LTCG = -flto
+ QMAKE_CFLAGS_LTCG = -flto=thin
diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf
index 44b4267207..9756a02014 100644
--- 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
static:no-static-ltcg {
# Static library but no-static-ltcg enabled: skip LTCG
-} else: CONFIG(release, debug|release) {
-+} else: CONFIG(release, debug|release)!host_build {
- # We need fat object files when creating static libraries on some platforms
- # so the linker will know to load a particular object from the library
- # in the first place. On others, we have special ar and nm to create the symbol
++} else: CONFIG(release, debug|release):!host_build {
+ separate_debug_info {
+ # Evaluate single-$ variable references that have no valid value at mkspec loading time
+ 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
QT_BEGIN_NAMESPACE
Q_LOGGING_CATEGORY(qLcEvdevKey, "qt.qpa.input")
-@@ -149,7 +154,10 @@ void QEvdevKeyboardHandler::switchLed(in
- qCDebug(qLcEvdevKey) << "switchLed" << led << state;
+@@ -150,7 +155,10 @@
+ qCDebug(qLcEvdevKey, "switchLed %d %d", led, int(state));
struct ::input_event led_ie;
- ::gettimeofday(&led_ie.time, 0);
@@ -45,7 +45,7 @@ diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp b/src/p
index 78728ef..1d65f9b 100644
--- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
+++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler.cpp
-@@ -55,6 +55,11 @@
+@@ -58,6 +58,11 @@
#include <linux/input.h>
#endif
@@ -57,7 +57,7 @@ index 78728ef..1d65f9b 100644
#include <math.h>
#if QT_CONFIG(mtdev)
-@@ -568,7 +573,7 @@ void QEvdevTouchScreenData::processInput
+@@ -573,7 +578,7 @@
// update timestamps
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
index 10458e41d7..8cfa40e461 100644
--- a/src/corelib/global/qconfig-bootstrapped.h
+++ b/src/corelib/global/qconfig-bootstrapped.h
-@@ -100,14 +100,14 @@
+@@ -104,7 +104,7 @@
#define QT_FEATURE_process -1
#define QT_FEATURE_regularexpression -1
#ifdef __GLIBC_PREREQ
@@ -36,7 +36,8 @@ index 10458e41d7..8cfa40e461 100644
#else
# define QT_FEATURE_renameat2 -1
#endif
- #define QT_FEATURE_sharedmemory -1
+@@ -112,7 +112,7 @@
+ #define QT_FEATURE_signaling_nan -1
#define QT_FEATURE_slog2 -1
#ifdef __GLIBC_PREREQ
-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1)
@@ -45,12 +46,12 @@ index 10458e41d7..8cfa40e461 100644
# define QT_FEATURE_statx -1
#endif
diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp
-index b78e037865..9574d1a044 100644
+index c3abec8..6229c61 100644
--- a/src/corelib/io/qfilesystemengine_unix.cpp
+++ b/src/corelib/io/qfilesystemengine_unix.cpp
-@@ -1232,16 +1232,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
- if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty()))
- return emptyFileEntryWarning(), false;
+@@ -1223,16 +1223,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy
+ Q_CHECK_FILE_NAME(srcPath, false);
+ Q_CHECK_FILE_NAME(tgtPath, false);
-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2)
- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0)