diff options
| author | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-22 08:45:35 +0300 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-09-22 08:45:35 +0300 |
| commit | 7de936f6b3c428095d71db940ef08e532133b084 (patch) | |
| tree | 73c2368b9d62d84812d6c65426b9100f14e704e7 /qtmultimedia.pro | |
| parent | 256ee311b936d69561e97f7f8ee832cff93cb509 (diff) | |
| parent | 7d00a457e455e159a3dde30ad798be744cf38bb1 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I5bce2843ac62bb97efc1ccaaa9c671c4adf10640
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 98bb3152f..a49700d16 100644 --- a/qtmultimedia.pro +++ b/qtmultimedia.pro @@ -33,7 +33,7 @@ win32 { } qtCompileTest(resourcepolicy) - qtCompileTest(gpu_vivante) + contains(QT_CONFIG, opengles2):qtCompileTest(gpu_vivante) } load(qt_parts) |