summaryrefslogtreecommitdiffstats
path: root/src/gui/itemviews
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-31 12:51:36 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-31 12:51:36 (GMT)
commit9a2ad0cf5724e40f6e401f94904563d14a152f95 (patch)
treef436c27e8566b3f18a1a73baf6afdf2e2c23fa71 /src/gui/itemviews
parentb2d8bca28e1ea485c9ebbe02566cc099c33d8458 (diff)
parent670ef284a02e822fa244462e9e8126bc646dff5e (diff)
downloadQt-9a2ad0cf5724e40f6e401f94904563d14a152f95.zip
Qt-9a2ad0cf5724e40f6e401f94904563d14a152f95.tar.gz
Qt-9a2ad0cf5724e40f6e401f94904563d14a152f95.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetwork Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.
Diffstat (limited to 'src/gui/itemviews')
0 files changed, 0 insertions, 0 deletions