summaryrefslogtreecommitdiffstats
path: root/src/declarative/util/qdeclarativeanimation_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-07-29 15:10:39 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-07-29 15:10:39 (GMT)
commit12e5d8897fbd60def1dd38608c1cd3f0d1d4317b (patch)
treee3193ee6947a112818e4a00adb54bc598ed142f5 /src/declarative/util/qdeclarativeanimation_p.h
parent65642dd343bf61510117cd7e13f69e7138247932 (diff)
parent5bdb85e3b21bcf624eb1830aa32d027e0c6870fe (diff)
downloadQt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.zip
Qt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.tar.gz
Qt-12e5d8897fbd60def1dd38608c1cd3f0d1d4317b.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fixed spelling mistakes in documented functions, classes, etc. Part of QTBUG-11938 and QTBUG-10801 Fix compilation with QT_NO_TEXTCODEC Fix compilation with QT_NO_XMLSTREAMREADER Fix compilation - disable TextInput when QT_NO_LINEEDIT is defined fixes for using freetds fix epic fail from 4ba6646 Added *_location variables to pkg-config files for rcc, lupdate and lrelease
Diffstat (limited to 'src/declarative/util/qdeclarativeanimation_p.h')
0 files changed, 0 insertions, 0 deletions