summaryrefslogtreecommitdiffstats
path: root/src/declarative/widgets/widgets.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-02-25 11:46:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-02-25 11:46:41 (GMT)
commit8928e37c8b1b375e74c5981915c034123de11b3d (patch)
tree0dfa96087ca129f25d2e59265f73a046d75d274f /src/declarative/widgets/widgets.pri
parentef30a6f336d55c813423bf139d8363f50181179f (diff)
parent9e20aac8d44a0e3e3ac4c5d67376f50071987b91 (diff)
downloadQt-8928e37c8b1b375e74c5981915c034123de11b3d.zip
Qt-8928e37c8b1b375e74c5981915c034123de11b3d.tar.gz
Qt-8928e37c8b1b375e74c5981915c034123de11b3d.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: (54 commits) Better check in QStaticText testcase if xformed text is supported Fix point drawing in QPainter. Expand indicator would not be displayed after removal of a collapsed item's child Avoid always detaching QStaticText Doc: fix formatting Make the qpainter test compile under Windows. make QtScript compatible with mingw 64 Fix QStaticText test on QWS Add licence header Fixed a warning. WinCE compilation fix Fixed hypersensitive drag on QHeaderViews Fix seg-fault when no X11 desktop environment is present Remove comment in drawStaticTextItem() in GL engine Separate Phonon and gstreamer defines in qtconfig Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 5381ceeb37d97365cfb2f037650dbb4e495bca4e )" Revert "Updated WebKit from /home/jturcott/dev/webkit to qtwebkit-4.7-merged ( 9303f6d67fb964b71ed3e7361367c3ccfaba5e0a )" Fix compilation on Windows Compile with QT_USE_FAST_OPERATOR_PLUS Fix compilation error in openVG ...
Diffstat (limited to 'src/declarative/widgets/widgets.pri')
0 files changed, 0 insertions, 0 deletions