summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qcssscanner.cpp
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-01-18 21:47:45 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-01-18 21:47:45 (GMT)
commit3cb3c9a7922cd96744ff0e15790103dbb68b3bf9 (patch)
treeb47b77416ca10d4574f88557cd218e731fe980d5 /src/gui/text/qcssscanner.cpp
parenta764519a658031ce2fb375b659ff889b5241357f (diff)
parent3214e477ccc3eae5c61b357696095f1f460fafbb (diff)
downloadQt-3cb3c9a7922cd96744ff0e15790103dbb68b3bf9.zip
Qt-3cb3c9a7922cd96744ff0e15790103dbb68b3bf9.tar.gz
Qt-3cb3c9a7922cd96744ff0e15790103dbb68b3bf9.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: Add proper license headers to new files. tst_qnetworkreply: There were 2 unneeded QSignalSpy Extend qfile_vs_qnetworkaccessmanager benchmark Enhance QFileNetworkReply Fix QSslCertificate issues Change the prefered content size of the anomaly browser Avoid painting while loading in the anomaly demo browser QFile::readData: Simplify code If the file is open, there must be an engine. QFile: Fix a pre-mature pessimization don't assert when calling QtScript-wrapped method of deleted QObject
Diffstat (limited to 'src/gui/text/qcssscanner.cpp')
0 files changed, 0 insertions, 0 deletions