From 1020303fecc7c011e0eb38e73e97d5cfedfa6fcb Mon Sep 17 00:00:00 2001 From: Florent Rougon Date: Sat, 12 May 2018 18:04:09 +0200 Subject: [PATCH] download_and_compile.sh: clarify what Qt build-dependencies are needed for Since James' recent FG work, the Qt private headers are not needed anymore for the Qt launcher; clarify this in the comments (they are still needed for FGQCANVAS, but it is disabled by default). --- download_and_compile.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/download_and_compile.sh b/download_and_compile.sh index 2a32069..93a6bab 100755 --- a/download_and_compile.sh +++ b/download_and_compile.sh @@ -340,11 +340,13 @@ _mandatory_pkg_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \ PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libplib-dev" _mandatory_pkg_alternative libpng-dev libpng12-dev libpng16-dev # The following packages are needed for the built-in launcher -_optional_pkg_alternative qtbase5-private-dev -_optional_pkg_alternative qtdeclarative5-private-dev _optional_pkg_alternative qml-module-qtquick2 _optional_pkg_alternative qml-module-qtquick-window2 _optional_pkg_alternative qml-module-qtquick-dialogs +# The following packages are only needed for the Qt-based remote Canvas +# (comment written at the time of FG 2018.2). +_optional_pkg_alternative qtbase5-private-dev +_optional_pkg_alternative qtdeclarative5-private-dev # FGPanel PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev" # FGAdmin