diff options
author | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:41 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-11-15 09:09:41 +0100 |
commit | afc51951769ac7320a98a973bcb95a12bc970019 (patch) | |
tree | f248c33d4a98b2baa047cf8453dd91d6e6545cc8 /src/location/configure.json | |
parent | 5804d34e3b311dc814c7897894ef7a6b960f0f40 (diff) | |
parent | 8c42dba3910c0bec3134f57bd5fa466df72d7ba7 (diff) | |
download | qtlocation-afc51951769ac7320a98a973bcb95a12bc970019.tar.gz |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Id7d47d95c8dc6a696b79812573e50c572593123e
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 3337b074..4de6e865 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 && features.angle))" + "!config.qnx && (!config.win32 || config.mingw)" ], "output": [ "privateFeature" ] }, |