fix qtifw path

Author: Skycoder42

.github/workflows/build.yml

@@ -115,13 +115,9 @@ jobs:
           ${{steps.qt.outputs.make}} install
           pkg-config --exists packagekitqt5
         working-directory: src/3rdparty/PackageKit-Qt
-      - name: copy QtIfw from cache
-        if: steps.qt.outputs.tests == 'true'
-        run: cp -a "${{steps.qt.outputs.qtdir}}/Tools" "${{steps.qt.outputs.qtdir}}/../../"
-        shell: bash
       - name: qmake
         run: |
-          qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}}
+          qmake CONFIG+=install_ok QT_PLATFORM=${{matrix.platform}} "QT_TOOL_PATH=${{steps.qt.outputs.qtdir}}/Tools"
           ${{steps.qt.outputs.make}} qmake_all
       - name: make module
         run: |

tests/auto/plugins/QtIfwTest/QtIfwTest.pro

@@ -20,10 +20,11 @@ DISTFILES += \
 	installer/config/config.xml \
 	installer/config/controller.qs
 
-isEmpty(QT_IFW_VERSION): QT_IFW_VERSION = 3.1
+isEmpty(QT_IFW_VERSION): QT_IFW_VERSION = 3.2
+isEmpty(QT_TOOL_PATH): QT_TOOL_PATH = $$[QT_INSTALL_BINS]/../../../Tools
 
 DEFINES += SRCDIR=\\\"$$PWD/\\\"
-DEFINES += BINDIR=\\\"$$[QT_INSTALL_BINS]/../../../Tools/QtInstallerFramework/$$QT_IFW_VERSION/bin/\\\"
+DEFINES += BINDIR=\\\"$$QT_TOOL_PATH/QtInstallerFramework/$$QT_IFW_VERSION/bin/\\\"
 DEFINES += QTDIR=\\\"$$[QT_INSTALL_BINS]/../../../\\\"
 
 include($$PWD/../testlib/testlib.pri)