summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qsettings.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-08-19 06:50:47 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-08-19 06:50:47 (GMT)
commitffbce9839f8be5c2f21cc66b617dbeb0a47af269 (patch)
treed064e90961e003e15ed7f1221a6d8e74b180ebb2 /src/corelib/io/qsettings.h
parent2314401eda4468ead722cf02e594708c9a3829be (diff)
parentb7a463c5abb3e5b9a1476ca45d53f6f8c63038bd (diff)
downloadQt-ffbce9839f8be5c2f21cc66b617dbeb0a47af269.zip
Qt-ffbce9839f8be5c2f21cc66b617dbeb0a47af269.tar.gz
Qt-ffbce9839f8be5c2f21cc66b617dbeb0a47af269.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Disable translatedRotatedAndScaledPainter testcase as it is broken. Fixed partial update on QLineEdit disable the outlinefillconsistency test until the line algorithm has been updated. Fix nasty copy-paste bug in fetchTransformedBilinear() fix breakages in qpainter autotests. QMetaType: add "signed char" as builtin. Fix how subpixel positions are intepreted in an aliased grid.
Diffstat (limited to 'src/corelib/io/qsettings.h')
0 files changed, 0 insertions, 0 deletions