summaryrefslogtreecommitdiffstats
path: root/tools/configure/configure.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-12-14 03:32:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-12-14 03:32:37 (GMT)
commitd6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a (patch)
tree5b57c1bd03fe8b43ab2335dd40804bd269a4c2a5 /tools/configure/configure.pro
parented331fc0bb5e77109d67ca1de45bb978cf045cef (diff)
parent8ae82b0c16aa1bdd9b8c88ef5c3cd889b4cdac7a (diff)
downloadQt-d6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a.zip
Qt-d6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a.tar.gz
Qt-d6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a.tar.bz2
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (67 commits) Add expected failures for JS test suite on Symbian Ensure ListView contentHeight is set to a valid size. Revert "Add mirroring-positioners.qml example" that was accidentally pushed Fix dragging Flickable back over start point. Add mirroring-positioners.qml example A QAIM model resulted in items moving to incorrect locations Build on Symbian refuse to open empty translation files fix path separator matching fix -dont-process for mingw cross-build fix nonsense condition Fix qwidget test crash QmlViewer: Remove trailing whitespace QmlViewer: Remove trailing whitespace QmlViewer: Fix crash on exit Don't include <features.h> directly: non-standard header. Remove superfluous OpenGL linking for QtDeclarative Corrected case on Symbian library. Missing glyphs in GL when scaling QStaticText and QML text items PathView: removing the currentIndex could make it invalid. ...
Diffstat (limited to 'tools/configure/configure.pro')
0 files changed, 0 insertions, 0 deletions