fly/flightgear
1
0
Fork 0
Code Activity

Bump the minimum Qt version for Remote-canvas.

Browse source 
QByteArrayList needs 5.4, not 5.3

Also flip the default to off of building the remote-canvas, to avoid
people getting caught out.
This commit is contained in:
James Turner 2017-01-24 10:34:56 +00:00
parent 07a9ee5b42
commit 15dbe1069d
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -186,7 +186,7 @@ option(ENABLE_FGCOM "Set to ON to build the FGCom application (default)" ON
option(ENABLE_FLITE "Set to ON to build the Flite text-to-speech module" ON)
option(ENABLE_QT "Set to ON to build the internal Qt launcher" ON)
option(ENABLE_TRAFFIC "Set to ON to build the external traffic generator modules" ON)
option(ENABLE_FGQCANVAS "Set to ON to build the Qt-based remote canvas application" ON)
option(ENABLE_FGQCANVAS "Set to ON to build the Qt-based remote canvas application" OFF)
include (DetectArch)

2
utils/fgqcanvas/CMakeLists.txt
View file

@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED YES)
project(FGQCanvas)
find_package(Qt5 5.3 COMPONENTS Widgets WebSockets)
find_package(Qt5 5.4 COMPONENTS Widgets WebSockets)
if (NOT Qt5WebSockets_FOUND)
message(WARNING "FGQCanvas utility requested, but QtWebSockets not found")