diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 15:45:35 +0200 |
commit | 4456984da780b14572e1ec0f079a4d349ab299bd (patch) | |
tree | f586a281a81c57c91c49e83a5d3ec6c7eece0578 /config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro | |
parent | e824abd987d77efaa085fe1f9fb514d270798d55 (diff) | |
parent | 281121697340084f7d385eab530f41916789b94d (diff) |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/io/qprocess/tst_qprocess.cpp
tests/auto/corelib/tools/qversionnumber/qversionnumber.pro
Change-Id: Ia93ce500349d96a2fbf0b4a37b73f088cc505c6e
Diffstat (limited to 'config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro')
-rw-r--r-- | config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro new file mode 100644 index 0000000000..85bcf6484a --- /dev/null +++ b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro @@ -0,0 +1,5 @@ +SOURCES = eglfs-mali-2.cpp + +CONFIG -= qt + +LIBS += -lEGL -lGLESv2 |