summaryrefslogtreecommitdiffstats
path: root/src/opengl
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2011-05-04 10:08:23 +0200
committerGunnar Sletta <gunnar.sletta@nokia.com>2011-05-04 10:08:23 +0200
commit9c6347f24509bff1dc6b87493adf487c22092990 (patch)
tree4306abcc0a1b3c1266ed84fe4ec297f4d7c706ba /src/opengl
parent72395bc540c60d9966788817c08cd3e126a40f97 (diff)
parent99454287bffcfcf7b0c2c658bea95d8543d2b118 (diff)
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Diffstat (limited to 'src/opengl')
-rw-r--r--src/opengl/opengl.pro6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro
index e7c1c446de..849bd9ebc7 100644
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@@ -1,6 +1,10 @@
TARGET = QtOpenGL
QPRO_PWD = $$PWD
-QT = core gui
+QT = core-private gui-private
+
+CONFIG += module
+MODULE_PRI = ../modules/qt_opengl.pri
+
DEFINES += QT_BUILD_OPENGL_LIB
DEFINES += QT_NO_USING_NAMESPACE
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x63000000