summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-11-04 13:00:29 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-11-04 13:00:29 (GMT)
commit66ae0e9a4a94f006a554d4fec9b6b18a02c802dd (patch)
tree99f5ed08b3a2e596684d495cfb706e70311c65c2 /src/gui
parentdfceed4535110d345b89658729b66bbdb2c3d7ca (diff)
parent5b6815ba1d6d82687b8244172482bb089210c8d2 (diff)
downloadQt-66ae0e9a4a94f006a554d4fec9b6b18a02c802dd.zip
Qt-66ae0e9a4a94f006a554d4fec9b6b18a02c802dd.tar.gz
Qt-66ae0e9a4a94f006a554d4fec9b6b18a02c802dd.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-graphics-team into 4.6
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/egl/egl.pri10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri
index 627d511..669d311 100644
--- a/src/gui/egl/egl.pri
+++ b/src/gui/egl/egl.pri
@@ -1,3 +1,5 @@
+CONFIG += egl
+
HEADERS += \
egl/qegl_p.h \
egl/qeglproperties_p.h
@@ -19,11 +21,3 @@ unix {
}
}
}
-
-for(p, QMAKE_LIBDIR_EGL) {
- exists($$p):LIBS_PRIVATE += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS_PRIVATE += $$QMAKE_LIBS_EGL
-!isEmpty(QMAKE_LFLAGS_EGL): LIBS += $$QMAKE_LFLAGS_EGL