diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 15:59:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-17 15:59:49 (GMT) |
commit | 803c7c3ff783ca74bc75fe574a98db51e2de9f22 (patch) | |
tree | 4d637736ab7adb9df04057cdc930479092d745b3 /src/gui/egl/qegl.cpp | |
parent | 509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528 (diff) | |
parent | 8aff2b3e6f09b446f124b7023485e947ab1bf24b (diff) | |
download | Qt-803c7c3ff783ca74bc75fe574a98db51e2de9f22.zip Qt-803c7c3ff783ca74bc75fe574a98db51e2de9f22.tar.gz Qt-803c7c3ff783ca74bc75fe574a98db51e2de9f22.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc: fix typo
QCompleter: fix misuse of QMap that can lead to crashes
qmake: added possibility to specify the type of an install target
Diffstat (limited to 'src/gui/egl/qegl.cpp')
0 files changed, 0 insertions, 0 deletions