diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-04-09 16:44:22 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-04-09 16:46:34 +0100 |
| commit | 6cae1db889f62051580d5a365f62585412a53a8c (patch) | |
| tree | 4d3db074d50ca3e2109cced17bec77f207a0c1fd /gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch | |
| parent | 410e699e0933653e69d03a4cdadf11854c6723f4 (diff) | |
| parent | 35e1d9247e39f3c91512cf3d9ef1467962389e35 (diff) | |
Merge remote-tracking branch 'savannah/master' into mesa-updates
Change-Id: Iad185e2ced97067b3dff8fd722435a6c5e2c00e5
Diffstat (limited to 'gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch')
| -rw-r--r-- | gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch b/gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch new file mode 100644 index 0000000000..63bfde6af0 --- /dev/null +++ b/gnu/packages/patches/jami-tests-qtwebengine-ifdef-to-if.patch @@ -0,0 +1,26 @@ +Upstream-status: https://lists.gnu.org/archive/html/jami/2024-03/msg00005.html + +Fix macro value checking. + +diff --git a/tests/qml/main.cpp b/tests/qml/main.cpp +index 2fbecebe..8cb3de69 100644 +--- a/tests/qml/main.cpp ++++ b/tests/qml/main.cpp +@@ -35,7 +35,7 @@ + #include <QtQuickTest/quicktest.h> + #include <QSignalSpy> + +-#ifdef WITH_WEBENGINE ++#if WITH_WEBENGINE + #include <QtWebEngineCore> + #include <QtWebEngineQuick> + #endif +@@ -192,7 +192,7 @@ main(int argc, char** argv) + // Allow the user to enable fatal warnings for certain tests. + Utils::remove_argument(argv, argc, "--failonwarn", [&]() { qputenv("QT_FATAL_WARNINGS", "1"); }); + +-#ifdef WITH_WEBENGINE ++#if WITH_WEBENGINE + QtWebEngineQuick::initialize(); + #endif + QTEST_SET_MAIN_SOURCE_PATH |