diff options
| author | Fred Wright <fw@fwright.net> | 2017-11-02 13:55:50 -0700 |
|---|---|---|
| committer | Fred Wright <fw@fwright.net> | 2017-11-02 13:55:50 -0700 |
| commit | 2c01c135da36b464170830b7e062791d229baa2a (patch) | |
| tree | 580c1ed01266a8ab8180ad9d5ed036d2c03de419 /.travis | |
| parent | 74428c17803a757d568d128d00800a5848eea116 (diff) | |
| download | gpsd-2c01c135da36b464170830b7e062791d229baa2a.tar.gz | |
Fixes Travis Qt4 builds.
Qt didn't start using versioned naming until Qt5. Hence, the default
empty value for qt_versioned is correct for Qt4. Setting it to '4' in
the Qt4 case causes the build to look for the nonexistent Qt4Network
package, which fails and hence disables Qt support.
The result is that the intended builds with Qt4 on Travis have been
built without Qt since commit 2f6e5b67.
TESTED:
Will be once this change is pushed and picked up by Travis. It has no
effect outside Travis.
Diffstat (limited to '.travis')
| -rw-r--r-- | .travis/build.sh | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/.travis/build.sh b/.travis/build.sh index 8c765398..32663029 100644 --- a/.travis/build.sh +++ b/.travis/build.sh @@ -21,8 +21,6 @@ SCONSOPTS="${SCONSOPTS} qt=yes" if dpkg -s qtbase5-dev 1>/dev/null 2>&1; then SCONSOPTS="${SCONSOPTS} qt_versioned=5" -else - SCONSOPTS="${SCONSOPTS} qt_versioned=4" fi export SCONSOPTS |