diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-19 18:11:57 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-05-19 20:27:29 +0000 |
| commit | d6248ed80ed6c2d3c454183cf31e2028f3e78424 (patch) | |
| tree | aef3b1128b3a624cd57a745182f60bb11eb47e10 /src/angle/src/src.pro | |
| parent | 53335315ff11752dc0f731adb1c2d5a0f6281b25 (diff) | |
| parent | 550e16b8141caf8d6c0614a423a295b0aea9cab1 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.9.0' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/angle/src/src.pro')
| -rw-r--r-- | src/angle/src/src.pro | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/angle/src/src.pro b/src/angle/src/src.pro index 77c3ee7198..b1f9572edc 100644 --- a/src/angle/src/src.pro +++ b/src/angle/src/src.pro @@ -1,3 +1,11 @@ TEMPLATE = subdirs -SUBDIRS += compiler QtANGLE +SUBDIRS += compiler + +QT_FOR_CONFIG += gui + +# needed as angle is built before gui +include($$OUT_PWD/../../gui/qtgui-config.pri) + +qtConfig(combined-angle-lib): SUBDIRS += QtANGLE +else: SUBDIRS += libGLESv2 libEGL CONFIG += ordered |