diff options
| author | Khem Raj <raj.khem@gmail.com> | 2017-07-26 11:55:40 -0700 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-08 20:44:41 +0200 |
| commit | 904296915495f7f606f5a07cb444d76903093ca0 (patch) | |
| tree | a544b4a64761e19d60c9e44603fb1906d9f1e9be | |
| parent | d53382fcb332846194080d8772d6069770ffae69 (diff) | |
qtbase: Fix ptests with clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch | 32 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch b/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch new file mode 100644 index 00000000..77b357cb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch @@ -0,0 +1,32 @@ +From 8284ebfe59c0011db71df7fb143b8e6a99f6952e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 25 Jul 2017 19:40:52 -0700 +Subject: [PATCH 10/10] tst_qstring: Disable Wformat-security with clang as + well + +Currently, its only disabled for gcc, but we need to disable +it with clang as well in order to compile it successfully with +clang + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/auto/corelib/tools/qstring/tst_qstring.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/tests/auto/corelib/tools/qstring/tst_qstring.cpp b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +index a0a872710c..20a9a9f9db 100644 +--- a/tests/auto/corelib/tools/qstring/tst_qstring.cpp ++++ b/tests/auto/corelib/tools/qstring/tst_qstring.cpp +@@ -1066,6 +1066,9 @@ void tst_QString::acc_01() + + QT_WARNING_PUSH + QT_WARNING_DISABLE_GCC("-Wformat-security") ++#ifdef __clang__ ++QT_WARNING_DISABLE_CLANG("-Wformat-security") ++#endif + + void tst_QString::isNull() + { +-- +2.13.3 + diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 8464873b..7b82c00f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -24,6 +24,7 @@ SRC_URI += "\ file://0009-Disable-all-unknown-features-instead-of-erroring-out.patch \ file://0010-Pretend-Qt5-wasn-t-found-if-OE_QMAKE_PATH_EXTERNAL_H.patch \ file://0001-Delete-qlonglong-and-qulonglong.patch \ + file://0010-tst_qstring-Disable-Wformat-security-with-clang-as-w.patch \ file://run-ptest \ " |