summaryrefslogtreecommitdiffstats
path: root/src/gui/gui.pro
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
committerGunnar Sletta <gunnar@trolltech.com>2009-09-04 11:35:17 (GMT)
commitb576bca55f88ed749a0a2b409be986dbf6b96b0a (patch)
tree69789d636ff2328cfc4101851f9a28de4a2a825e /src/gui/gui.pro
parent0b8062f5fbd7622a528ce61b767d00fbcdfc74a0 (diff)
parent9d85dcf10d580a45c261e3e1a8d8df7d41cb9437 (diff)
downloadQt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.zip
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.gz
Qt-b576bca55f88ed749a0a2b409be986dbf6b96b0a.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/gui.pro')
-rw-r--r--src/gui/gui.pro5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro
index eb3a33f..7c24002 100644
--- a/src/gui/gui.pro
+++ b/src/gui/gui.pro
@@ -17,7 +17,10 @@ x11:include(kernel/x11.pri)
mac:include(kernel/mac.pri)
win32:include(kernel/win.pri)
embedded:include(embedded/embedded.pri)
-symbian:include(kernel/symbian.pri)
+symbian {
+ include(kernel/symbian.pri)
+ include(s60framework/s60framework.pri)
+}
#modules
include(animation/animation.pri)