diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:44:50 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-23 08:47:15 +0300 |
| commit | 0d3434fd0491d8d37dc0286b9d8ec8a454ba726b (patch) | |
| tree | 329557ed14a161827817765b0ccc6298fcf146b4 /qtmultimedia.pro | |
| parent | 01c9322bfe918b886468eb520d77b21b6d8c0c11 (diff) | |
| parent | 62eeaba645d0f7c42246a0b026c532919a5b0454 (diff) | |
| download | qtmultimedia-0d3434fd0491d8d37dc0286b9d8ec8a454ba726b.tar.gz | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I96aca24df935d51b40380c727b6c5002432a6be6
Diffstat (limited to 'qtmultimedia.pro')
| -rw-r--r-- | qtmultimedia.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qtmultimedia.pro b/qtmultimedia.pro index 8101d63eb..e7de1e703 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -34,7 +34,7 @@ win32 { } qtCompileTest(resourcepolicy) - qtCompileTest(gpu_vivante) + contains(QT_CONFIG, opengles2):qtCompileTest(gpu_vivante) } load(qt_parts) |