aboutsummaryrefslogtreecommitdiffstats
path: root/packages/qmake
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2007-01-17 14:49:44 +0000
committerPhil Blundell <philb@gnu.org>2007-01-17 14:49:44 +0000
commit09bc29575b10dec0d98a051dd2dc22261329a258 (patch)
treeddadc7e8e4b3f502c61fd7796973e43be37fe1ae /packages/qmake
parente3509c0cf1288d32bc44b204cf994c945fc0f3d7 (diff)
downloadopenembedded-09bc29575b10dec0d98a051dd2dc22261329a258.tar.gz
qmake: add gl definitions to linux-oe-g++ configuration
Diffstat (limited to 'packages/qmake')
-rw-r--r--packages/qmake/files/linux-oe-qmake.conf3
-rw-r--r--packages/qmake/qmake-native_1.07a.bb2
-rw-r--r--packages/qmake/qmake2-native_2.00a.bb2
3 files changed, 4 insertions, 3 deletions
diff --git a/packages/qmake/files/linux-oe-qmake.conf b/packages/qmake/files/linux-oe-qmake.conf
index 287dbeba19..205b693fda 100644
--- 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 a5c164c08a..29f736dea1 100644
--- 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 2dcabe3261..306891e9af 100644
--- 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"