summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-06-13 07:05:54 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-06-13 07:05:54 (GMT)
commitea0963bde7fb9f1486dd157f43955a11024d3e7d (patch)
treec4fc653bd20b2e0bf73297ab1de0727a8883607b
parent7e6a9419fa2167941c601751a13a4451ef8d2708 (diff)
parent465abc8bd050b6b5338b35fc0429feef4ec6d524 (diff)
downloadQt-ea0963bde7fb9f1486dd157f43955a11024d3e7d.zip
Qt-ea0963bde7fb9f1486dd157f43955a11024d3e7d.tar.gz
Qt-ea0963bde7fb9f1486dd157f43955a11024d3e7d.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: 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