@@ -265,7 +265,7 @@ jobs:
265265 if : false
266266 working-directory : ${{env.SOURCE_DIR}}
267267 env :
268- QT_ROOT : ${{env.Qt5_Dir }}
268+ QT_ROOT : ${{env.Qt6_DIR }}
269269 run : |
270270 if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qxmpp ]; then
271271 git clone -b v1.10.3 https://invent.kde.org/libraries/qxmpp.git
@@ -292,6 +292,35 @@ jobs:
292292 cmake --install . --config ${{matrix.BUILD_TYPE}} --strip
293293 fi
294294
295+ - name : build lxqt-build-tools
296+ working-directory : ${{env.SOURCE_DIR}}
297+ run : |
298+ if [ ! -d ${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools ]; then
299+ git clone -b 2.2.0 --depth=1 "https://github.com/lxqt/lxqt-build-tools.git"
300+ cd lxqt-build-tools
301+ cmake -E make_directory build
302+ cd build
303+ ${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
304+ -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}}
305+ cmake --build . --config ${{matrix.BUILD_TYPE}}
306+ cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
307+ fi
308+
309+ - name : build qtermwidget
310+ working-directory : ${{env.SOURCE_DIR}}
311+ run : |
312+ if [ ! -d ${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6 ]; then
313+ git clone --depth=1 "https://github.com/KangLin/qtermwidget.git"
314+ cd qtermwidget
315+ cmake -E make_directory build
316+ cd build
317+ ${Qt6_DIR}/bin/qt-cmake .. -DCMAKE_BUILD_TYPE=${{matrix.BUILD_TYPE}} \
318+ -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_DIR}} \
319+ -Dlxqt2-build-tools_DIR=${{env.INSTALL_DIR}}/share/cmake/lxqt2-build-tools
320+ cmake --build . --config ${{matrix.BUILD_TYPE}}
321+ cmake --build . --config ${{matrix.BUILD_TYPE}} --target install
322+ fi
323+
295324 - name : git clone RabbitCommon
296325 working-directory : ${{env.SOURCE_DIR}}
297326 run : git clone https://github.com/KangLin/RabbitCommon.git
@@ -332,7 +361,8 @@ jobs:
332361 -DRabbitVNC_DIR=${{env.INSTALL_DIR}}/lib/cmake/RabbitVNC \
333362 -Dtigervnc_DIR=${{env.INSTALL_DIR}}/lib/cmake/tigervnc \
334363 -DQXmpp_DIR=${{env.INSTALL_DIR}}/lib/cmake/qxmpp \
335- -DBUILD_FREERDP=ON
364+ -DBUILD_FREERDP=ON \
365+ -Dqtermwidget6_DIR=${{env.INSTALL_DIR}}/lib/cmake/qtermwidget6
336366 cmake --build . --parallel $(nproc) --verbose --config ${{matrix.BUILD_TYPE}} --target all
337367 APK_FILE=`find . -name "android-*.apk"`
338368 cp $APK_FILE RabbitRemoteControl_${{env.RabbitRemoteControl_VERSION}}_${{matrix.qt_arch}}_qt${{matrix.qt_version}}_${{matrix.BUILD_TYPE}}.apk
0 commit comments