summaryrefslogtreecommitdiffstats
path: root/src/gui/image/qicon.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-29 15:25:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-29 15:25:19 (GMT)
commit75ec5d485dfa8f43306bfea5993d6a8aae7abb45 (patch)
tree8ed957f6823b908fcd2700629683005a2e16288d /src/gui/image/qicon.cpp
parent26af4d54ea4f3a48d053038f34a00aa1119a585b (diff)
parent4f584d5d4c53d8510a34a698fac0f78c17f6cb93 (diff)
downloadQt-75ec5d485dfa8f43306bfea5993d6a8aae7abb45.zip
Qt-75ec5d485dfa8f43306bfea5993d6a8aae7abb45.tar.gz
Qt-75ec5d485dfa8f43306bfea5993d6a8aae7abb45.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove left over forward declarations Avoided the loss of preedit text when losing focus on Symbian. Added support for ifdeffing for manufacturer in generated pkg files Shortening and fixing previous fix for QTBUG-6371 Update default FPU flags on Symbian to be softvfp+vfpv2 Using RunFast mode for RVCT
Diffstat (limited to 'src/gui/image/qicon.cpp')
0 files changed, 0 insertions, 0 deletions