Avoid warnings about threading model for qt5.

Fixes #64 qt5.jam warning <threading>multi ignored.
boostorg · Aug 4, 2021 · 37622df · 37622df
1 parent 6dda409
commit 37622df
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 3 deletions.
diff --git a/src/tools/qt5.jam b/src/tools/qt5.jam
@@ -306,7 +306,6 @@ rule init ( prefix : version ? : condition * : namespace ? : infix ? : full_bin
        local usage-requirements =
            <include>$(.incprefix)
            <library-path>$(.libprefix)
-           <threading>multi
            <allow>qt5 ;
 
        if $(link) in shared

diff --git a/test/qt5.py b/test/qt5.py
@@ -10,10 +10,11 @@
 
 # Run test in real directory in order to find Boost.Test via Boost Top-Level
 # Jamroot.
-qt5_dir = os.getcwd() + "/qt5"
+qt5_dir = os.path.dirname(os.path.abspath(__file__)) + "/qt5"
 
 t = BoostBuild.Tester(workdir=qt5_dir)
 
 t.run_build_system()
-
+# Fails if a warning is thrown
+t.fail_test( t.stdout().find("warning") != -1 )
 t.cleanup()
diff --git a/test/qt5/initialization.cpp b/test/qt5/initialization.cpp
@@ -0,0 +1,7 @@
+#include <iostream>
+
+int main()
+{
+    // dummy file to test initialization of qt
+    return 0;
+}
diff --git a/test/qt5/jamroot.jam b/test/qt5/jamroot.jam
@@ -9,6 +9,20 @@ import cast ;
 
 path-constant CWD : . ;
 
+if ! [ qt5.initialized ]
+{
+    # assuming qt5 from system
+    using qt5 : /usr/ ;
+
+    project qttest-initialization : ;
+
+    alias qt-tests-initialization :
+      [ run initialization.cpp /qt5//QtCore ]
+    : # requirements
+    : # default-build
+    : # usage-requirements
+    ; 
+}
 
 if [ qt5.initialized ]
 {

diff --git a/test/test_all.py b/test/test_all.py
@@ -284,6 +284,8 @@ def reorder_tests(tests, first_test):
          "project_test3",
          "project_test4",
          "property_expansion",
+# FIXME: Disabled due lack of qt5 detection
+#         "qt5",
          "rebuilds",
          "relative_sources",
          "remove_requirement",