diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-09-26 21:43:25 +0200 |
| commit | 06bd93c4acf49fc24408a60ebdf7a46caf02f9b3 (patch) | |
| tree | eedbdaa40fbf20bb99187084dd9edf14f73f05bd /src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro | |
| parent | bafad505a0adb21b819f7617e5e802bf2d52fd54 (diff) | |
| parent | 41a7d74385eece725435159ca021151e871bf116 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/plugins/platforms/ios/qiosmessagedialog.mm
Change-Id: Icfbf55c3215ec088e552d0b42a5c94d04b17c65f
Diffstat (limited to 'src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro')
| -rw-r--r-- | src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro index 6e32ca26d0..e72f5bdd14 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/eglfs_mali.pro @@ -5,7 +5,7 @@ QT += core-private gui-private platformsupport-private eglfsdeviceintegration-pr # Avoid X11 header collision, use generic EGL native types DEFINES += QT_EGL_NO_X11 -INCLUDEPATH += $$PWD/../.. +INCLUDEPATH += $$PWD/../../api CONFIG += egl QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF |