Merge branch 'streams' into 'master'

Setup utf8qtextstream in the way consistent with other Qt components See merge request OpenMW/openmw!2611
2 years ago · 25d7ee7fdc
parent 599f68029e 8da93d4b12
commit 25d7ee7fdc
1 changed files with 2 additions and 2 deletions
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@ -197,7 +197,7 @@ add_component_dir (esm4
 )

 add_component_dir (misc
-    constants utf8stream utf8qtextstream resourcehelpers rng messageformatparser weakcache thread
+    constants utf8stream resourcehelpers rng messageformatparser weakcache thread
    compression osguservalues color tuplemeta tuplehelpers
    )

@ -378,7 +378,7 @@ if (USE_QT)
        )

    add_component_qt_dir (misc
-        helpviewer
+        helpviewer utf8qtextstream
        )

    add_component_qt_dir (files