]> git.openpandora.org Git - openembedded.git/commitdiff
qmake: add gl definitions to linux-oe-g++ configuration
authorPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 14:49:44 +0000 (14:49 +0000)
committerPhil Blundell <philb@gnu.org>
Wed, 17 Jan 2007 14:49:44 +0000 (14:49 +0000)
packages/qmake/files/linux-oe-qmake.conf
packages/qmake/qmake-native_1.07a.bb
packages/qmake/qmake2-native_2.00a.bb

index 287dbeba19e37ba40f89a37602114908bf2a5392..205b693fdaac52d5b5c067550835ce3ba25c8e3a 100644 (file)
@@ -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)
index a5c164c08a6e87f3851bbae95393007db9df22aa..29f736dea16a94789571c42d1ee26868c06bdb31 100644 (file)
@@ -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"
 
index 2dcabe32616eee5c34ab9d17e98f65123ddf4980..306891e9af9e3af93649fe858f2b630ae6082e0a 100644 (file)
@@ -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"