diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2018-05-17 17:16:49 +0300 |
|---|---|---|
| committer | Tobrun <tobrun@mapbox.com> | 2018-05-18 18:00:21 +0200 |
| commit | 32ef5170ec117356953beebce3a968b4c56b4de3 (patch) | |
| tree | 62bf78c4841d100f1643cae409ca6f976cd455f4 | |
| parent | c8add9788e84068e5bd04182ca5cce19ea34e9f4 (diff) | |
| download | qtlocation-mapboxgl-32ef5170ec117356953beebce3a968b4c56b4de3.tar.gz | |
[build] Use Qt 5.6.3 instead of 5.7 in AppVeyor
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | platform/qt/qt.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/appveyor.yml b/appveyor.yml index d31160261f..eb53ad58bc 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -36,7 +36,7 @@ before_build: build_script: - call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" amd64 - - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.7\msvc2015_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" .. + - cmake -G "Ninja" -DMBGL_PLATFORM=qt -DWITH_QT_DECODERS=ON -DWITH_QT_I18N=ON -DWITH_NODEJS=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH=C:\Qt\5.6.3\msvc2015_64\lib\cmake -DCMAKE_MAKE_PROGRAM="%APPVEYOR_BUILD_FOLDER%\platform\qt\ninja.exe" .. - cmake --build . -- -j %NUMBER_OF_PROCESSORS% after_build: diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index d1d597bda6..989618a59a 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -145,6 +145,7 @@ elseif (CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") add_definitions("-Wno-unused-command-line-argument") add_definitions("-Wno-unused-local-typedef") add_definitions("-Wno-unused-private-field") + add_definitions("-Wno-inconsistent-missing-override") list(APPEND MBGL_QT_CORE_FILES PRIVATE platform/qt/src/thread.cpp |