0002-qtbase-fix-building-issue.patch 1.4 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From 425586bd274f36270cffffa2100b7a7fe209fb86 Mon Sep 17 00:00:00 2001
  2. From: Andy Hu <andy.hu@starfivetech.com>
  3. Date: Tue, 27 Sep 2022 12:21:30 +0800
  4. Subject: [PATCH 2/6] qtbase: fix building issue
  5. ---
  6. .../auto/corelib/thread/qatomicinteger/qatomicinteger.pri | 2 ++
  7. qtbase/tests/auto/tools/moc/moc.pro | 6 ++++++
  8. 2 files changed, 8 insertions(+)
  9. diff --git a/qtbase/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri b/qtbase/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri
  10. index f1030d41ef..e37ee6fed7 100644
  11. --- a/qtbase/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri
  12. +++ b/qtbase/tests/auto/corelib/thread/qatomicinteger/qatomicinteger.pri
  13. @@ -9,3 +9,5 @@ QT = core testlib
  14. TARGET = tst_qatomicinteger_$$lower($$suffix)
  15. SOURCES = $$PWD/tst_qatomicinteger.cpp
  16. DEFINES += QATOMIC_TEST_TYPE=$$TYPE tst_QAtomicIntegerXX=tst_QAtomicInteger_$$suffix
  17. +
  18. +linux:LIBS += -latomic
  19. diff --git a/qtbase/tests/auto/tools/moc/moc.pro b/qtbase/tests/auto/tools/moc/moc.pro
  20. index cafc7bc184..a0c1d47af8 100644
  21. --- a/qtbase/tests/auto/tools/moc/moc.pro
  22. +++ b/qtbase/tests/auto/tools/moc/moc.pro
  23. @@ -1,4 +1,10 @@
  24. CONFIG += testcase
  25. +
  26. +qtConfig(c++11): CONFIG += c++11
  27. +qtConfig(c++14): CONFIG += c++14
  28. +#CONFIG += c++14 # for std::shared_timed_mutex
  29. +#CONFIG += c++1z # for std::shared_mutex
  30. +
  31. TARGET = tst_moc
  32. #exists(/usr/include/boost/spirit.hpp) {
  33. --
  34. 2.36.0