summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-03 11:12:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-03 11:12:07 (GMT)
commit49c4c8372cd6bf194c1a36029844eefe94393da0 (patch)
tree77975968f0b89983ec1fd60910df5147fc27b485 /qmake
parenta8829a52d65a9759d5dffe98fb07b384c54db1c8 (diff)
parent1d87017c4681c9d5da14d613b5b84d25620642fe (diff)
downloadQt-49c4c8372cd6bf194c1a36029844eefe94393da0.zip
Qt-49c4c8372cd6bf194c1a36029844eefe94393da0.tar.gz
Qt-49c4c8372cd6bf194c1a36029844eefe94393da0.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation: disable -no-feature-* for bootstrapped QString: Fix severals bugs when comparing with QStringRef QProgressBar: make accessors const. Changes: add patch for artificial emboldening Added static version of QGLFramebufferObject::release(). Fix compilation on WinXP MinGW32; Add a new qconfig feature GESTURES
Diffstat (limited to 'qmake')
0 files changed, 0 insertions, 0 deletions