summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qmath_p.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-23 11:41:20 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-23 11:41:20 (GMT)
commitae2ae7dfe55478f7036dfb9f301cac9f67d89f5c (patch)
treee5769499ad031ddf3583a5c4a85701f6859800be /src/gui/painting/qmath_p.h
parent2f5855e8d891a7e93bdb721243f1c0b10fcb5ad9 (diff)
parent4be6241d267e6789894f788034dc445b463f9ad0 (diff)
downloadQt-ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c.zip
Qt-ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c.tar.gz
Qt-ae2ae7dfe55478f7036dfb9f301cac9f67d89f5c.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging: Make the DBus timeout configurable in QDBusAbstractInterface. Add a QApplication::queryKeyboardModifiers() method.
Diffstat (limited to 'src/gui/painting/qmath_p.h')
0 files changed, 0 insertions, 0 deletions