Changeset d0c60491

Timestamp:

01/06/2023 10:17:43 AM (16 months ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

ad9eab68

Parents:

535d7e1

Message:

Fix qt5 so that all headers are installed

The patch for qt-5.15.8 creates a header file, which needs to be
known by the build machinery. In a git repository, this is done
automatically, but in a build tree coming from a tarball, the header
file is ignored.
So we add a .git directory into qtbase, which fakes a git repository,
and allows the header file to be used and installed by the build system
(it may be needed when compiling programs using Qt thread mutexes).

File:

• x/lib/qt5.xml (modified) (1 diff)

x/lib/qt5.xml

@@ -274 +274 @@
 
     <para>
-      Add a file that is not created by the patch:
-    </para>
-
-<screen><userinput remap="pre">echo '#include "../../src/corelib/thread/qtsan_impl.h"' &gt;qtbase/include/QtCore/qtsan_impl.h</userinput></screen>
+      The patch is supposed to be used in a git repository, because the
+      behavior of the <command>configure</command> command below is changed
+      in this case. It is enough to create a
+      <filename class="directory">.git</filename> directory in the
+      <filename class="directory">qmake</filename> directory, where the
+      <command>configure</command> script is run:
+    </para>
+
+    <screen><userinput remap="pre">mkdir -pv qtbase/.git</userinput></screen>
 
     <para>