summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-10 07:45:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-10 07:45:02 (GMT)
commit465abc8bd050b6b5338b35fc0429feef4ec6d524 (patch)
tree3113298ed9e9a978f201c6b439fce81de5af0eaf
parentdadb47e632d65ce886295e7848856d4030d6e7de (diff)
parent78a1f738c21b1dfe799c9deea0ab01360bbde25d (diff)
downloadQt-465abc8bd050b6b5338b35fc0429feef4ec6d524.zip
Qt-465abc8bd050b6b5338b35fc0429feef4ec6d524.tar.gz
Qt-465abc8bd050b6b5338b35fc0429feef4ec6d524.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-symbian-team: Disabling DEF files to get around building problems.
-rw-r--r--config.profiles/symbian/bld.inf2
1 files changed, 1 insertions, 1 deletions
diff --git a/config.profiles/symbian/bld.inf b/config.profiles/symbian/bld.inf
index 6ccb11c..91b90c2 100644
--- a/config.profiles/symbian/bld.inf
+++ b/config.profiles/symbian/bld.inf
@@ -80,5 +80,5 @@ translations/qt_zh_tw_symbian.ts /epoc32/include/platform/qt/translations/qt_zh_
PRJ_EXTENSIONS
START EXTENSION qt/qtconfig
OPTION QT_ROOT ..
-OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
+OPTION OPTIONS -opensource -confirm-license -openvg -opengl-es-2 -script -no-scripttools -no-webkit -make make -graphicssystem openvg -phonon -phonon-backend -no-usedeffiles -dont-process -nomake examples -nomake demos -nomake tools -audio-backend -fpu softvfp+vfpv2
END \ No newline at end of file