diff src/qttools.mk @ 4518:c48b41efdcf4

qtbase: move dll files from qt5/bin to bin
author John W. Eaton <jwe@octave.org>
date Thu, 19 Oct 2017 11:37:35 -0400
parents 2c34ec679fb3
children 4cea16af20b4
line wrap: on
line diff
--- a/src/qttools.mk	Thu Oct 19 09:00:14 2017 -0400
+++ b/src/qttools.mk	Thu Oct 19 11:37:35 2017 -0400
@@ -18,5 +18,18 @@
     cd '$(1)' && '$(MXE_QMAKE)'
     $(MAKE) -C '$(1)' -j '$(JOBS)'
     $(MAKE) -C '$(1)' -j 1 install
+
+    if [ $(MXE_WINDOWS_BUILD) = yes ]; then \
+      $(INSTALL) -d '$(HOST_BINDIR)'; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5CLucened.dll '$(HOST_BINDIR)'/Qt5CLucened.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5CLucene.dll '$(HOST_BINDIR)'/Qt5CLucene.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Helpd.dll '$(HOST_BINDIR)'/Qt5Helpd.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/Qt5Help.dll '$(HOST_BINDIR)'/Qt5Help.dll; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qdbus.exe '$(HOST_BINDIR)'/qdbus.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qdbusviewer.exe '$(HOST_BINDIR)'/qdbusviewer.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtdiag.exe '$(HOST_BINDIR)'/qtdiag.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtpaths.exe '$(HOST_BINDIR)'/qtpaths.exe; \
+      mv '$(HOST_PREFIX)'/qt5/bin/qtplugininfo.exe '$(HOST_BINDIR)'/qtplugininfo.exe; \
+    fi
 endef