diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:00 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-10-26 12:22:38 +0200 |
| commit | d340bf2be1738f3d47bc455ea122aef9a9e1c11d (patch) | |
| tree | 34d060b00cf14924d50c6419e9678804d9f62e58 /src/location/configure.json | |
| parent | 66a6e238876cc1201c5fe331c165ceba458dc56a (diff) | |
| parent | 592c381564e3f12b79a3d5e9fec5aec2b8045742 (diff) | |
| download | qtlocation-d340bf2be1738f3d47bc455ea122aef9a9e1c11d.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3
Conflicts:
.qmake.conf
Change-Id: I9a3d7ec0bb203ac8b5bd483af3973510ca33c4a9
Diffstat (limited to 'src/location/configure.json')
| -rw-r--r-- | src/location/configure.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/location/configure.json b/src/location/configure.json index 4de6e865..3337b074 100644 --- a/src/location/configure.json +++ b/src/location/configure.json @@ -37,7 +37,7 @@ "condition": [ "features.opengl", "features.c++14", - "!config.qnx && (!config.win32 || config.mingw)" + "!config.qnx && (!config.win32 || (config.mingw && features.angle))" ], "output": [ "privateFeature" ] }, |