Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb37662' into 'master'
[qtmozembed] Avoid X11 header collision. Contributes to JB#37662

See merge request mer-core/qtmozembed!47
  • Loading branch information
pvuorela committed May 3, 2019
2 parents 8c7688d + 456cfeb commit 4e7cc05
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions src/src.pro
Expand Up @@ -3,6 +3,9 @@ QT += openglextensions
TARGET = qt5embedwidget
TEMPLATE = lib

# Avoid X11 header collision
DEFINES += MESA_EGL_NO_X11_HEADERS

isEmpty(VERSION) {
GIT_TAG = $$system(git describe --tags --abbrev=0)
GIT_VERSION = $$system(echo $$GIT_TAG | sed 's/nemo[/]//')
Expand Down

0 comments on commit 4e7cc05

Please sign in to comment.