summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextobject.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-10 11:43:59 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-10 11:43:59 (GMT)
commite3696e62e54959f1a2ea71d38c4c5c04750ec743 (patch)
tree5635d4876571b5f84905cc9ff3e97138061f0c06 /src/gui/text/qtextobject.cpp
parentac27c8ad39a9646a9e509ba7a58f75eeae10bb6e (diff)
parent7084f021bcd3ecc4d4cc4609b4185bcc6dc3a037 (diff)
downloadQt-e3696e62e54959f1a2ea71d38c4c5c04750ec743.zip
Qt-e3696e62e54959f1a2ea71d38c4c5c04750ec743.tar.gz
Qt-e3696e62e54959f1a2ea71d38c4c5c04750ec743.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fix build error in QtGui armv5 udeb Updated qtbench to build against modified QStaticText API Make compiling / linking a non-qt app work too on symbian/gcce When on Symbian use smaller files. Fixing the missing "\\" The cmd line arguments have not been delegated properly. Clear QFontCache TLS content before nullifying TLS pointer. Add --download option to runonphone Implement download support to TRK Launcher Fix library creation on symbian/gcce Update Symbian def files for 4.7 Various fixes for symbian/gcce building. Make encoding clear Fix 'make sis' working on symbian makefile based system again. Make shipped symbian scripts available from the build-dir bin dir.
Diffstat (limited to 'src/gui/text/qtextobject.cpp')
0 files changed, 0 insertions, 0 deletions