[oe-commits] org.oe.dev qmake: add gl definitions to linux-oe-g++ configuration

[pb commit]

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

Author: pb at openembedded.org
Branch: org.openembedded.dev
Revision: 4fbd658056e8d7494a7290edd7f4482da6fe51d6
ViewMTN: http://monotone.openembedded.org/revision.psp?id=4fbd658056e8d7494a7290edd7f4482da6fe51d6
Files:
1
packages/qmake/files/linux-oe-qmake.conf
packages/qmake/qmake-native_1.07a.bb
packages/qmake/qmake2-native_2.00a.bb
Diffs:

#
# mt diff -r90716dfbf983f714b5ae0e7f8c2cb8560a6f725c -r4fbd658056e8d7494a7290edd7f4482da6fe51d6
#
# 
# 
# patch "packages/qmake/files/linux-oe-qmake.conf"
#  from [7b3b141363804b5fa0db2328aa6d762d6feb8032]
#    to [f8b10d487357b317141120b97dcb45a5c9851492]
# 
# patch "packages/qmake/qmake-native_1.07a.bb"
#  from [ac58d83fee5168dbb62c6471c6a2ac2cd10cf34e]
#    to [bf35689f41c89cea882954d100eb8ba3c5a79faf]
# 
# patch "packages/qmake/qmake2-native_2.00a.bb"
#  from [161d477d5fc17f1f793c2ad30e5ec115e9b2da0e]
#    to [b8c2f1103fde9c112869d7c9725771d94052047d]
# 
============================================================
--- packages/qmake/files/linux-oe-qmake.conf	7b3b141363804b5fa0db2328aa6d762d6feb8032
+++ packages/qmake/files/linux-oe-qmake.conf	f8b10d487357b317141120b97dcb45a5c9851492
@@ -56,7 +56,8 @@ QMAKE_LIBS_QT_THREAD    = -l$(OE_QMAKE_L
 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)
============================================================
--- packages/qmake/qmake-native_1.07a.bb	ac58d83fee5168dbb62c6471c6a2ac2cd10cf34e
+++ packages/qmake/qmake-native_1.07a.bb	bf35689f41c89cea882954d100eb8ba3c5a79faf
@@ -1,9 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r3"
+PR = "r4"
 
 QTEVER = "qt-embedded-free-3.3.5"
 
============================================================
--- packages/qmake/qmake2-native_2.00a.bb	161d477d5fc17f1f793c2ad30e5ec115e9b2da0e
+++ packages/qmake/qmake2-native_2.00a.bb	b8c2f1103fde9c112869d7c9725771d94052047d
@@ -1,9 +1,9 @@ LICENSE = "GPL QPL"
 DESCRIPTION = "TrollTech Makefile Generator"
 PRIORITY = "optional"
 HOMEPAGE = "http://www.trolltech.com"
 SECTION = "devel"
 LICENSE = "GPL QPL"
-PR = "r1"
+PR = "r2"
 
 QTVER = "qt-x11-opensource-src-4.1.1"