summaryrefslogtreecommitdiffstats
path: root/src/imports
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-08 16:09:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-08 16:09:48 (GMT)
commitbaf60d049cc11a54f156b69960706d7304fc4640 (patch)
tree617f63b98d841fea6126c30a026fcfb3d8ee4b02 /src/imports
parent2ae808a23ce05bf9768ad9df107c16bb0c555ee7 (diff)
parentdcb9b85376718d768f538e19ae231f5e061b7b31 (diff)
downloadQt-baf60d049cc11a54f156b69960706d7304fc4640.zip
Qt-baf60d049cc11a54f156b69960706d7304fc4640.tar.gz
Qt-baf60d049cc11a54f156b69960706d7304fc4640.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: (29 commits) I10n: Update German translations for 4.7.0 Fix a freetype link failure. Fix configure test for DirectFB Split Symbian bearer plugin into three platform specfic plugins Doc: Fixed whitespace in the other configuration file for zh_CN. Doc: Fixed whitespace in the Simplified Chinese doc configuration. Unbreak Linux build when qendian.h is included before qglobal.h Revert accidental commit of irrelevant stuff. Silly mondays.. Unbreak Linux build when qendian.h is included before qglobal.h Fix QApplication/QWidget to really take ownership of input contexts Added setting a hotspot on standard gestures Fixed GestureOverride event delivery in GraphicsView. add check-ts target to auto-asses translation completeness qt_ja_JP.ts => qt_ja.ts Fix incorrect \since tag XQuery test suite (and others): remove p4 dependency add docu about pixmaps being invalidated on qapp destruction remove somewhat misleading warning about x11 pixmap leak Disabled item view items use incorrect background color Update the mkspec for linux-icc: don't use jump tables in shlibs ...
Diffstat (limited to 'src/imports')
0 files changed, 0 insertions, 0 deletions