diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-13 06:55:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-13 06:55:37 +0200 |
| commit | b94773c9c838a0b3db1bced0bc8daf5b04aefc29 (patch) | |
| tree | 4afe809fa3ac8a83f5eaf98d0b40d4bbf7b5fca4 /config.tests/qpa/egl | |
| parent | c327fb79e1a50c825a945e97f2c66d07a1c6d225 (diff) | |
| parent | 541c9d4d2acd045459c3e75eee80c63b36af9ed0 (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
config.tests/unix/compile.test
src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
src/testlib/qtestcase.cpp
src/testlib/qtestcase.qdoc
Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d
Diffstat (limited to 'config.tests/qpa/egl')
| -rw-r--r-- | config.tests/qpa/egl/egl.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro index f04d053543..b5396dab15 100644 --- a/config.tests/qpa/egl/egl.pro +++ b/config.tests/qpa/egl/egl.pro @@ -1,7 +1,7 @@ SOURCES = egl.cpp for(p, QMAKE_LIBDIR_EGL) { - exists($$p):LIBS += -L$$p + LIBS += -L$$p } !isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL |