From e8e789efc34f8d3eb79155bb0588a4d0771ccfdb Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Mon, 12 May 2025 00:37:46 +0000 Subject: [PATCH] qt5*: adjust Qt5 suite to previously applied path/name changes --- frameworks/qt5/qt5graphicaleffects/Makefile | 2 +- frameworks/qt5/qt5quick2-controls2/Makefile | 2 +- frameworks/qt5/qt5quick2/Makefile | 2 +- frameworks/qt5/qt5script/Makefile | 2 +- frameworks/qt5/qt5tools/Makefile | 16 ++++++++-------- frameworks/qt5/qt5translations/Makefile | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/frameworks/qt5/qt5graphicaleffects/Makefile b/frameworks/qt5/qt5graphicaleffects/Makefile index 139f716..a09897c 100644 --- a/frameworks/qt5/qt5graphicaleffects/Makefile +++ b/frameworks/qt5/qt5graphicaleffects/Makefile @@ -23,7 +23,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5graphicaleffects SECTION:=video-frameworks diff --git a/frameworks/qt5/qt5quick2-controls2/Makefile b/frameworks/qt5/qt5quick2-controls2/Makefile index 4787c26..e94f3f2 100644 --- a/frameworks/qt5/qt5quick2-controls2/Makefile +++ b/frameworks/qt5/qt5quick2-controls2/Makefile @@ -22,7 +22,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5quick2-controls2 SECTION:=video-frameworks diff --git a/frameworks/qt5/qt5quick2/Makefile b/frameworks/qt5/qt5quick2/Makefile index 92d82ff..8e1627b 100644 --- a/frameworks/qt5/qt5quick2/Makefile +++ b/frameworks/qt5/qt5quick2/Makefile @@ -23,7 +23,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5quick2/Default SECTION:=video-frameworks diff --git a/frameworks/qt5/qt5script/Makefile b/frameworks/qt5/qt5script/Makefile index e80c442..5b5eac0 100644 --- a/frameworks/qt5/qt5script/Makefile +++ b/frameworks/qt5/qt5script/Makefile @@ -23,7 +23,7 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5script/Default SECTION:=video-frameworks diff --git a/frameworks/qt5/qt5tools/Makefile b/frameworks/qt5/qt5tools/Makefile index 3ea84cf..7155c3b 100644 --- a/frameworks/qt5/qt5tools/Makefile +++ b/frameworks/qt5/qt5tools/Makefile @@ -27,7 +27,7 @@ HOST_BUILD_DEPENDS:=qt5base/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5tools SECTION:=video-frameworks @@ -45,20 +45,20 @@ define Host/Install $(INSTALL_DIR) \ $(STAGING_DIR_HOST)/lib \ - $(STAGING_DIR_HOST)/bin + $(STAGING_DIR_HOST)/bin/qt5 $(CP) \ $(HOST_INSTALL_DIR)/lib/* \ $(STAGING_DIR_HOST)/lib/ $(CP) \ - $(HOST_INSTALL_DIR)/bin/* \ - $(STAGING_DIR_HOST)/bin/ + $(HOST_INSTALL_DIR)/bin/qt5/* \ + $(STAGING_DIR_HOST)/bin/qt5/ - ln -sf $(STAGING_DIR_HOST)/bin/lrelease \ - $(STAGING_DIR)/host/bin/ - ln -sf $(STAGING_DIR_HOST)/bin/lupdate \ - $(STAGING_DIR)/host/bin/ + ln -sf $(STAGING_DIR_HOST)/bin/qt5/lrelease \ + $(STAGING_DIR)/host/bin/qt5/ + ln -sf $(STAGING_DIR_HOST)/bin/qt5/lupdate \ + $(STAGING_DIR)/host/bin/qt5/ endef diff --git a/frameworks/qt5/qt5translations/Makefile b/frameworks/qt5/qt5translations/Makefile index 89219c4..3b3381d 100644 --- a/frameworks/qt5/qt5translations/Makefile +++ b/frameworks/qt5/qt5translations/Makefile @@ -23,7 +23,7 @@ PKG_BUILD_DEPENDS:=qt5tools/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk --include $(STAGING_DIR)/host/mk/qmake.mk +-include $(STAGING_DIR)/host/mk/qmake5.mk define Package/qt5translations SECTION:=video-frameworks -- 2.30.2