From 395864e32c20517d70503d8cbf28c3ac394be991 Mon Sep 17 00:00:00 2001
From: Tony Theodore <tonyt@logyst.com>
Date: Sat, 18 Nov 2017 12:58:19 +1100
Subject: [PATCH] qt5-freeze plugin: enable side-by-side install

Closes #1980
---
 plugins/examples/qt5-freeze/README.md         | 32 +++++++++++++-
 plugins/examples/qt5-freeze/qt3d.mk           |  6 +--
 plugins/examples/qt5-freeze/qtactiveqt.mk     |  4 +-
 plugins/examples/qt5-freeze/qtbase.mk         | 44 ++++++++++++-------
 plugins/examples/qt5-freeze/qtcanvas3d.mk     |  4 +-
 plugins/examples/qt5-freeze/qtcharts.mk       |  4 +-
 plugins/examples/qt5-freeze/qtconnectivity.mk |  4 +-
 plugins/examples/qt5-freeze/qtdatavis3d.mk    |  4 +-
 .../qt5-freeze/qtdeclarative-render2d.mk      |  4 +-
 plugins/examples/qt5-freeze/qtdeclarative.mk  |  4 +-
 plugins/examples/qt5-freeze/qtgamepad.mk      |  4 +-
 .../examples/qt5-freeze/qtgraphicaleffects.mk |  4 +-
 plugins/examples/qt5-freeze/qtimageformats.mk |  4 +-
 plugins/examples/qt5-freeze/qtlocation.mk     |  4 +-
 plugins/examples/qt5-freeze/qtmultimedia.mk   |  4 +-
 plugins/examples/qt5-freeze/qtpurchasing.mk   |  4 +-
 .../examples/qt5-freeze/qtquickcontrols.mk    |  4 +-
 .../examples/qt5-freeze/qtquickcontrols2.mk   |  4 +-
 plugins/examples/qt5-freeze/qtscript.mk       |  4 +-
 plugins/examples/qt5-freeze/qtscxml.mk        |  4 +-
 plugins/examples/qt5-freeze/qtsensors.mk      |  4 +-
 plugins/examples/qt5-freeze/qtserialbus.mk    |  4 +-
 plugins/examples/qt5-freeze/qtserialport.mk   |  4 +-
 plugins/examples/qt5-freeze/qtsvg.mk          |  4 +-
 plugins/examples/qt5-freeze/qttools.mk        | 12 +++--
 plugins/examples/qt5-freeze/qttranslations.mk |  4 +-
 .../examples/qt5-freeze/qtvirtualkeyboard.mk  |  4 +-
 plugins/examples/qt5-freeze/qtwebchannel.mk   |  4 +-
 plugins/examples/qt5-freeze/qtwebkit.mk       |  8 ++--
 plugins/examples/qt5-freeze/qtwebsockets.mk   |  4 +-
 plugins/examples/qt5-freeze/qtwebview.mk      |  4 +-
 plugins/examples/qt5-freeze/qtwinextras.mk    |  4 +-
 plugins/examples/qt5-freeze/qtxmlpatterns.mk  |  4 +-
 33 files changed, 99 insertions(+), 115 deletions(-)

diff --git a/plugins/examples/qt5-freeze/README.md b/plugins/examples/qt5-freeze/README.md
index 78383cc3..f7a5effc 100644
--- a/plugins/examples/qt5-freeze/README.md
+++ b/plugins/examples/qt5-freeze/README.md
@@ -4,7 +4,8 @@ Freezing Qt5 version
 This plugin demonstrates freezing a version of Qt5 in a local plugin,
 possibly for Win XP support (see #1827, #1734). It's possible to simply
 stay on a git checkout, but then other toolchain features are also
-frozen.
+frozen. This example uses 5.7.1, but 5.6 is an LTS release and probably
+a better option.
 
 *N.B.* This is unsupported and exists solely as an example of how one
 might maintain a local version.
@@ -47,3 +48,32 @@ modified. `MXE_PLUGIN_DIRS` can also be added to `settings.mk`
 make qt5 MXE_PLUGIN_DIRS=$PLUGIN_DIR qtbase_CONFIGURE_OPTS='-no-sql-mysql'
 
 ```
+
+##### Side-by-side install
+
+Qt can have multiple installs since it puts everything under a single
+prefix. You can set the variable `qtbase_VERSION_ID=qt5.7` and
+it should be fine for qmake-based projects using the full path
+`${prefix}/${target}/qt5.7/bin/qmake` or `${target}-qmake-qt5.7`.
+
+See #1980:
+```
+# WinXp
+make \
+    qt5 libzip libusb1 libftdi1 glibmm boost check \
+    MXE_TARGETS='x86_64-w64-mingw32.static.posix i686-w64-mingw32.static.posix' \
+    MXE_PLUGIN_DIRS='plugins/gcc7 plugins/examples/qt5-freeze' \
+    qtbase_VERSION_ID=qt5.7 \
+    qtbase_CONFIGURE_OPTS='-no-sql-mysql'
+
+rm usr/*/installed/qtbase
+
+# Other - will only build qtbase and downstream
+make \
+    qt5  \
+    MXE_TARGETS='x86_64-w64-mingw32.static.posix i686-w64-mingw32.static.posix' \
+    MXE_PLUGIN_DIRS='plugins/gcc7'
+```
+
+There could be issues for pkg-config and cmake projects, the simple
+`qtbase` and `qttools` tests build - any tips and notes are welcome.
diff --git a/plugins/examples/qt5-freeze/qt3d.mk b/plugins/examples/qt5-freeze/qt3d.mk
index 3a8e6765..b596bcc2 100644
--- a/plugins/examples/qt5-freeze/qt3d.mk
+++ b/plugins/examples/qt5-freeze/qt3d.mk
@@ -17,7 +17,7 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' || $(MAKE) -C '$(1)' -j  1
-    $(MAKE) -C '$(1)' -j 1 install
+    cd '$(BUILD_DIR)' && $(QMAKE_EXECUTABLE) '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' || $(MAKE) -C '$(BUILD_DIR)' -j 1
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/plugins/examples/qt5-freeze/qtactiveqt.mk b/plugins/examples/qt5-freeze/qtactiveqt.mk
index d01e814b..fa6da88d 100644
--- a/plugins/examples/qt5-freeze/qtactiveqt.mk
+++ b/plugins/examples/qt5-freeze/qtactiveqt.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtbase.mk b/plugins/examples/qt5-freeze/qtbase.mk
index 55455800..737b2a7c 100644
--- a/plugins/examples/qt5-freeze/qtbase.mk
+++ b/plugins/examples/qt5-freeze/qtbase.mk
@@ -12,6 +12,17 @@ $(PKG)_FILE     := $(PKG)-opensource-src-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://download.qt.io/official_releases/qt/5.7/$($(PKG)_VERSION)/submodules/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc dbus fontconfig freetds freetype harfbuzz jpeg libmysqlclient libpng openssl pcre postgresql sqlite zlib
 
+# allows for side-by-side install with later Qt
+# pkg-config and cmake will need tweaking to really get working
+$(PKG)_VERSION_ID := qt5
+QMAKE_EXECUTABLE   = $(TARGET)-qmake-$(qtbase_VERSION_ID)
+
+define QMAKE_MAKE_INSTALL
+    cd '$(BUILD_DIR)' && $(QMAKE_EXECUTABLE) '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
+endef
+
 define $(PKG)_UPDATE
     $(WGET) -q -O- http://download.qt-project.org/official_releases/qt/5.5/ | \
     $(SED) -n 's,.*href="\(5\.[0-9]\.[^/]*\)/".*,\1,p' | \
@@ -37,7 +48,7 @@ define $(PKG)_BUILD
             -no-use-gold-linker \
             -release \
             -static \
-            -prefix '$(PREFIX)/$(TARGET)/qt5' \
+            -prefix '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)' \
             -no-icu \
             -opengl desktop \
             -no-glib \
@@ -65,41 +76,42 @@ define $(PKG)_BUILD
             $($(PKG)_CONFIGURE_OPTS)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)'
-    rm -rf '$(PREFIX)/$(TARGET)/qt5'
+    rm -rf '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)'
     $(MAKE) -C '$(1)' -j 1 install
-    ln -sf '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-qt5
+    ln -sf '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/bin/qmake' '$(PREFIX)/bin/$(TARGET)'-qmake-$($(PKG)_VERSION_ID)
 
     mkdir            '$(1)/test-qt'
-    cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qt-test.pro'
+    cd               '$(1)/test-qt' && '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/bin/qmake' '$(PWD)/src/qt-test.pro'
     $(MAKE)       -C '$(1)/test-qt' -j '$(JOBS)' $(BUILD_TYPE)
-    $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/'
+    $(INSTALL) -m755 '$(1)/test-qt/$(BUILD_TYPE)/test-qt5.exe' '$(PREFIX)/$(TARGET)/bin/test-$($(PKG)_VERSION_ID).exe'
 
     # build test the manual way
     mkdir '$(1)/test-$(PKG)-pkgconfig'
-    '$(PREFIX)/$(TARGET)/qt5/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
-    '$(PREFIX)/$(TARGET)/qt5/bin/moc' \
+    '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/bin/uic' -o '$(1)/test-$(PKG)-pkgconfig/ui_qt-test.h' '$(TOP_DIR)/src/qt-test.ui'
+    '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/bin/moc' \
         -o '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
         -I'$(1)/test-$(PKG)-pkgconfig' \
         '$(TOP_DIR)/src/qt-test.hpp'
-    '$(PREFIX)/$(TARGET)/qt5/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc'
+    '$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/bin/rcc' -name qt-test -o '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' '$(TOP_DIR)/src/qt-test.qrc'
     '$(TARGET)-g++' \
         -W -Wall -Werror -std=c++0x -pedantic \
         '$(TOP_DIR)/src/qt-test.cpp' \
         '$(1)/test-$(PKG)-pkgconfig/moc_qt-test.cpp' \
         '$(1)/test-$(PKG)-pkgconfig/qrc_qt-test.cpp' \
-        -o '$(PREFIX)/$(TARGET)/bin/test-$(PKG)-pkgconfig.exe' \
+        -o '$(PREFIX)/$(TARGET)/bin/test-$($(PKG)_VERSION_ID)-pkgconfig.exe' \
         -I'$(1)/test-$(PKG)-pkgconfig' \
-        `'$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs`
+        `PKG_CONFIG_PATH_$(subst .,_,$(subst -,_,$(TARGET)))=$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)/lib/pkgconfig \
+         '$(TARGET)-pkg-config' Qt5Widgets$(BUILD_TYPE_SUFFIX) --cflags --libs`
 
     # setup cmake toolchain
-    echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/qt5" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG).cmake'
+    echo 'set(CMAKE_SYSTEM_PREFIX_PATH "$(PREFIX)/$(TARGET)/$($(PKG)_VERSION_ID)" ${CMAKE_SYSTEM_PREFIX_PATH})' > '$(CMAKE_TOOLCHAIN_DIR)/$(PKG)-$($(PKG)_VERSION_ID).cmake'
 
     # batch file to run test programs
-    (printf 'set PATH=..\\lib;..\\qt5\\bin;..\\qt5\\lib;%%PATH%%\r\n'; \
-     printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\qt5\\plugins\r\n'; \
-     printf 'test-qt5.exe\r\n'; \
-     printf 'test-qtbase-pkgconfig.exe\r\n';) \
-     > '$(PREFIX)/$(TARGET)/bin/test-qt5.bat'
+    (printf 'set PATH=..\\lib;..\\$($(PKG)_VERSION_ID)\\bin;..\\$($(PKG)_VERSION_ID)\\lib;%%PATH%%\r\n'; \
+     printf 'set QT_QPA_PLATFORM_PLUGIN_PATH=..\\$($(PKG)_VERSION_ID)\\plugins\r\n'; \
+     printf 'test-$($(PKG)_VERSION_ID).exe\r\n'; \
+     printf 'test-$($(PKG)_VERSION_ID)-pkgconfig.exe\r\n';) \
+     > '$(PREFIX)/$(TARGET)/bin/test-$($(PKG)_VERSION_ID).bat'
 endef
 
 
diff --git a/plugins/examples/qt5-freeze/qtcanvas3d.mk b/plugins/examples/qt5-freeze/qtcanvas3d.mk
index 6073a2ea..51c83acc 100644
--- a/plugins/examples/qt5-freeze/qtcanvas3d.mk
+++ b/plugins/examples/qt5-freeze/qtcanvas3d.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtcharts.mk b/plugins/examples/qt5-freeze/qtcharts.mk
index 6f53e456..4fa58e51 100644
--- a/plugins/examples/qt5-freeze/qtcharts.mk
+++ b/plugins/examples/qt5-freeze/qtcharts.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtconnectivity.mk b/plugins/examples/qt5-freeze/qtconnectivity.mk
index 1bd29157..12620981 100644
--- a/plugins/examples/qt5-freeze/qtconnectivity.mk
+++ b/plugins/examples/qt5-freeze/qtconnectivity.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtdatavis3d.mk b/plugins/examples/qt5-freeze/qtdatavis3d.mk
index 3e0ea00c..836bcc3b 100644
--- a/plugins/examples/qt5-freeze/qtdatavis3d.mk
+++ b/plugins/examples/qt5-freeze/qtdatavis3d.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk b/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk
index 7f271225..e3ff95ce 100644
--- a/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk
+++ b/plugins/examples/qt5-freeze/qtdeclarative-render2d.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtdeclarative.mk b/plugins/examples/qt5-freeze/qtdeclarative.mk
index ed7c95b3..95ea991b 100644
--- a/plugins/examples/qt5-freeze/qtdeclarative.mk
+++ b/plugins/examples/qt5-freeze/qtdeclarative.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtgamepad.mk b/plugins/examples/qt5-freeze/qtgamepad.mk
index 5e22c713..355549e1 100644
--- a/plugins/examples/qt5-freeze/qtgamepad.mk
+++ b/plugins/examples/qt5-freeze/qtgamepad.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtgraphicaleffects.mk b/plugins/examples/qt5-freeze/qtgraphicaleffects.mk
index cdcaf49c..0c9172d9 100644
--- a/plugins/examples/qt5-freeze/qtgraphicaleffects.mk
+++ b/plugins/examples/qt5-freeze/qtgraphicaleffects.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtimageformats.mk b/plugins/examples/qt5-freeze/qtimageformats.mk
index 4ee8c57c..84f64b68 100644
--- a/plugins/examples/qt5-freeze/qtimageformats.mk
+++ b/plugins/examples/qt5-freeze/qtimageformats.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtlocation.mk b/plugins/examples/qt5-freeze/qtlocation.mk
index 29a3ba88..b95447d2 100644
--- a/plugins/examples/qt5-freeze/qtlocation.mk
+++ b/plugins/examples/qt5-freeze/qtlocation.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtmultimedia.mk b/plugins/examples/qt5-freeze/qtmultimedia.mk
index 76e4d739..5cb164c1 100644
--- a/plugins/examples/qt5-freeze/qtmultimedia.mk
+++ b/plugins/examples/qt5-freeze/qtmultimedia.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtpurchasing.mk b/plugins/examples/qt5-freeze/qtpurchasing.mk
index a31fd968..36b92bac 100644
--- a/plugins/examples/qt5-freeze/qtpurchasing.mk
+++ b/plugins/examples/qt5-freeze/qtpurchasing.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtquickcontrols.mk b/plugins/examples/qt5-freeze/qtquickcontrols.mk
index 3d045233..58d61d6c 100644
--- a/plugins/examples/qt5-freeze/qtquickcontrols.mk
+++ b/plugins/examples/qt5-freeze/qtquickcontrols.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtquickcontrols2.mk b/plugins/examples/qt5-freeze/qtquickcontrols2.mk
index f8c7942e..0ef25bc3 100644
--- a/plugins/examples/qt5-freeze/qtquickcontrols2.mk
+++ b/plugins/examples/qt5-freeze/qtquickcontrols2.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtscript.mk b/plugins/examples/qt5-freeze/qtscript.mk
index 58e8492d..2a903e17 100644
--- a/plugins/examples/qt5-freeze/qtscript.mk
+++ b/plugins/examples/qt5-freeze/qtscript.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtscxml.mk b/plugins/examples/qt5-freeze/qtscxml.mk
index dc64b1cb..3a4e3bcd 100644
--- a/plugins/examples/qt5-freeze/qtscxml.mk
+++ b/plugins/examples/qt5-freeze/qtscxml.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtsensors.mk b/plugins/examples/qt5-freeze/qtsensors.mk
index 2a63c960..e3284109 100644
--- a/plugins/examples/qt5-freeze/qtsensors.mk
+++ b/plugins/examples/qt5-freeze/qtsensors.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtserialbus.mk b/plugins/examples/qt5-freeze/qtserialbus.mk
index 6176fa57..e50689cb 100644
--- a/plugins/examples/qt5-freeze/qtserialbus.mk
+++ b/plugins/examples/qt5-freeze/qtserialbus.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtserialport.mk b/plugins/examples/qt5-freeze/qtserialport.mk
index 0bcb2189..72f01ef2 100644
--- a/plugins/examples/qt5-freeze/qtserialport.mk
+++ b/plugins/examples/qt5-freeze/qtserialport.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtsvg.mk b/plugins/examples/qt5-freeze/qtsvg.mk
index fa60bc2a..a117d30a 100644
--- a/plugins/examples/qt5-freeze/qtsvg.mk
+++ b/plugins/examples/qt5-freeze/qtsvg.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qttools.mk b/plugins/examples/qt5-freeze/qttools.mk
index 2c288868..c7e14ea0 100644
--- a/plugins/examples/qt5-freeze/qttools.mk
+++ b/plugins/examples/qt5-freeze/qttools.mk
@@ -19,14 +19,12 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 
     # test QUiLoader
-    mkdir '$(1)'.test
-    cd '$(1)'.test && '$(TARGET)-cmake' '$($(PKG)_TEST_DIR)'
-    $(MAKE) -C '$(1)'.test
-    cp '$(1)'.test/mxe-cmake-qtuitools.exe \
+    mkdir '$(BUILD_DIR)'.test
+    cd '$(BUILD_DIR)'.test && '$(TARGET)-cmake' '$($(PKG)_TEST_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)'.test
+    cp '$(BUILD_DIR)'.test/mxe-cmake-qtuitools.exe \
         '$(PREFIX)/$(TARGET)/bin/test-qttools.exe'
 endef
diff --git a/plugins/examples/qt5-freeze/qttranslations.mk b/plugins/examples/qt5-freeze/qttranslations.mk
index 0202da49..338a82af 100644
--- a/plugins/examples/qt5-freeze/qttranslations.mk
+++ b/plugins/examples/qt5-freeze/qttranslations.mk
@@ -17,8 +17,6 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
 
diff --git a/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk b/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk
index a2d0bc24..446a6ce2 100644
--- a/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk
+++ b/plugins/examples/qt5-freeze/qtvirtualkeyboard.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtwebchannel.mk b/plugins/examples/qt5-freeze/qtwebchannel.mk
index da62620f..d27fdd05 100644
--- a/plugins/examples/qt5-freeze/qtwebchannel.mk
+++ b/plugins/examples/qt5-freeze/qtwebchannel.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtwebkit.mk b/plugins/examples/qt5-freeze/qtwebkit.mk
index 62a78328..fd902eb4 100644
--- a/plugins/examples/qt5-freeze/qtwebkit.mk
+++ b/plugins/examples/qt5-freeze/qtwebkit.mk
@@ -18,8 +18,8 @@ endef
 
 define $(PKG)_BUILD_SHARED
     # looks for build tools with .exe suffix and tries to use win_flex
-    $(SED) -i 's,\.exe,,' '$(1)/Tools/qmake/mkspecs/features/functions.prf'
-    cd '$(1)' && mkdir -p .git && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' FLEX=flex
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(SED) -i 's,\.exe,,' '$(SOURCE_DIR)/Tools/qmake/mkspecs/features/functions.prf'
+    cd '$(BUILD_DIR)' && mkdir -p .git && $(QMAKE_EXECUTABLE) FLEX=flex '$(SOURCE_DIR)'
+    $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 endef
diff --git a/plugins/examples/qt5-freeze/qtwebsockets.mk b/plugins/examples/qt5-freeze/qtwebsockets.mk
index 00369d71..9dae41f0 100644
--- a/plugins/examples/qt5-freeze/qtwebsockets.mk
+++ b/plugins/examples/qt5-freeze/qtwebsockets.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtwebview.mk b/plugins/examples/qt5-freeze/qtwebview.mk
index 96ef4b5a..bca9b59b 100644
--- a/plugins/examples/qt5-freeze/qtwebview.mk
+++ b/plugins/examples/qt5-freeze/qtwebview.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtwinextras.mk b/plugins/examples/qt5-freeze/qtwinextras.mk
index 068a5a34..44d08deb 100644
--- a/plugins/examples/qt5-freeze/qtwinextras.mk
+++ b/plugins/examples/qt5-freeze/qtwinextras.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef
diff --git a/plugins/examples/qt5-freeze/qtxmlpatterns.mk b/plugins/examples/qt5-freeze/qtxmlpatterns.mk
index 6f6af7be..833bb5ca 100644
--- a/plugins/examples/qt5-freeze/qtxmlpatterns.mk
+++ b/plugins/examples/qt5-freeze/qtxmlpatterns.mk
@@ -17,7 +17,5 @@ define $(PKG)_UPDATE
 endef
 
 define $(PKG)_BUILD
-    cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
-    $(MAKE) -C '$(1)' -j '$(JOBS)'
-    $(MAKE) -C '$(1)' -j 1 install
+    $(QMAKE_MAKE_INSTALL)
 endef