diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-29 10:54:41 +0200 |
| commit | 6a772fd201ac738dc86e71bd82e98f65158e6335 (patch) | |
| tree | 674007720f41d27b251bbcffd7a368a93f88eb96 /src/angle/src/src.pro | |
| parent | 40206a9f6d7635bb19305d1c8d74908808e3529e (diff) | |
| parent | 4c346b6e2bfab976bc9b16275b8382aee38aefa4 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
mkspecs/common/msvc-desktop.conf
mkspecs/win32-g++/qmake.conf
mkspecs/win32-icc/qmake.conf
src/platformsupport/fontdatabases/mac/coretext.pri
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
Change-Id: I74a6f7705c9547ed8bbac7260eb4645543e32655
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 |