qmake: add gl definitions to linux-oe-g++ configuration

diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf
index 287dbeb..205b693 100644 (file)
--- a/packages/qmake/files/linux-oe-qmake.conf
+++ b/packages/qmake/files/linux-oe-qmake.conf
@@ -56,7 +56,8 @@ QMAKE_LIBS_X11                = $(OE_QMAKE_LIBS_X11)
 QMAKE_LIBS_X11SM       = 
 QMAKE_LIBS_QT          = -l$(OE_QMAKE_LIBS_QT)
 QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_LIBS_QT)-mt
-QMAKE_LIBS_QT_OPENGL   = -lqgl
+QMAKE_LIBS_OPENGL      = $(OE_QMAKE_LIBS_OPENGL)
+QMAKE_LIBS_OPENGL_QT   = $(OE_QMAKE_LIBS_OPENGL_QT)
 QMAKE_LIBS_THREAD       = -lpthread
 
 QMAKE_MOC              = $(OE_QMAKE_MOC)

diff --git a/packages/qmake/qmake-native_1.07a.bb b/packages/qmake/qmake-native_1.07a.bb
index a5c164c..29f736d 100644 (file)
--- a/packages/qmake/qmake-native_1.07a.bb
+++ b/packages/qmake/qmake-native_1.07a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
 
 QTEVER = "qt-embedded-free-3.3.5"
 

diff --git a/packages/qmake/qmake2-native_2.00a.bb b/packages/qmake/qmake2-native_2.00a.bb
index 2dcabe3..306891e 100644 (file)
--- a/packages/qmake/qmake2-native_2.00a.bb
+++ b/packages/qmake/qmake2-native_2.00a.bb
@@ -3,7 +3,7 @@ PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.1.1"