Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion sets/exports.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{
"build_qtproj": ["QT_SELECT"],
"compilers": ["USECLANG"],
"default": [
"PKGNAME",
Expand Down
26 changes: 12 additions & 14 deletions templates/20-qtproj.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,24 +12,22 @@ build_qtproj_probe() {
}

build_qtproj_configure() {
export QT_SELECT
[ "$QT_SELECT" ] ||
if bool "$USEQT5"; then
abwarn "\$USEQT5 is now deprecated. Use QT_SELECT=5."
QT_SELECT=5
elif bool "$USEQT4"; then
abwarn "\$USEQT4 is now deprecated. Use QT_SELECT=4."
QT_SELECT=4
BUILD_START
[[ -v "QMAKEVER" ]] || abdie "qmake version unspecified. Set QMAKEVER=<version> to the corresponding Qt version."
export QMAKE
if [ "$QMAKEVER" -eq 6 ]; then
QMAKE="qmake-qt6"
elif [ "$QMAKEVER" -eq 5 ]; then
QMAKE="qmake-qt5"
elif [ "$QMAKEVER" -eq 4 ]; then
QMAKE="qmake-qt4"
else
abicu "Qt version unspecified => default."
QT_SELECT=default
abdie "Unknown qmake version: ${QMAKEVER}."
fi

BUILD_START
ab_tostringarray QTPROJ_AFTER
ab_typecheck -a QTPROJ_DEF
abinfo "Running qmake to generate Makefile ..."
"$QTPREFIX/bin/qmake" "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \
abinfo "Running ${QMAKE} to generate Makefile ..."
"/usr/bin/${QMAKE}" "${QTPROJ_DEF[@]}" "${QTPROJ_AFTER[@]}" \
|| abdie "Failed while running qmake to generate Makefile: $?."
}

Expand Down
Loading