qt5*: adjust Qt5 suite to previously applied path/name changes

diff --git a/frameworks/qt5/qt5graphicaleffects/Makefile b/frameworks/qt5/qt5graphicaleffects/Makefile
index 139f716bfa69aca1f8768f39bc52bf4fe5cc7729..a09897ccc764d39f3fb64c556f649910a9def597 100644 (file)
--- 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 4787c26c4185eaf3c0ca80d83474198579cdf721..e94f3f2e18a2e61b2f3d05cc2975487f8bdbd2c4 100644 (file)
--- 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 92d82ffd7cd1492edbd680c1b67927be29aeae96..8e1627b480fb77fb7e246be0cfd9572ca0005fda 100644 (file)
--- 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 e80c442c93a596a3fdec1895ba7c0ead69b35633..5b5eac0dd8a858106e8c6d1ecf169a97514a1fd1 100644 (file)
--- 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 3ea84cf5e45d9a6167ec41177db5d02c0179bd4f..7155c3bc19968a32c7f22e87629fd42df961b78c 100644 (file)
--- 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 89219c41d6b694cdf272ffd79cd03a9f5682fa78..3b3381d21ba5e2835e8c055acb180836a8f7b442 100644 (file)
--- 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