summaryrefslogtreecommitdiffstats
path: root/translations
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-13 07:05:22 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-13 07:05:22 (GMT)
commit6944a72cd26a5e3611ebd305ec665bc4c0fcee12 (patch)
tree3b19b6ec15e884617f8e27a067d87de97d5cf54c /translations
parent40e277aa622e74c18fb1b16214a2c1fe40870315 (diff)
parent0ff252da26185709cbeeabddd07e6d9ab83de4a4 (diff)
downloadQt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.zip
Qt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.tar.gz
Qt-6944a72cd26a5e3611ebd305ec665bc4c0fcee12.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Refactor font and zoom handling, reduces clutter in central widget. Some more refactoring. Move the QWebView based help viewer into it's own source files. add QMAKE_DEL_TREE (aka. rm -rf) to avoid more hard-coded platform ifdefs use variables from the spec instead of hard-coding platform ifdefs move $(DEL_FILE) 2> NUL redirection into .conf file fix host platform conditional purge msvc.net and msvc2002 makespecs. unsupported for a while now. purge msvc6 suppport from qmake. qt doesn't support it for quite a while now. remove weird -tp ce matching line nobody can say anything about remove remainder of mac9 mode remove the most blatant tmake compat paths simplify add qt5 todo
Diffstat (limited to 'translations')
0 files changed, 0 insertions, 0 deletions