diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 18:15:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-01 18:15:49 (GMT) |
commit | 626322907dcb8d3b3ec9a5bb703e2a9ee3926daa (patch) | |
tree | def2221abb2294f4385f695e7cc204dc11540180 /config.tests/mac/crc | |
parent | e95d8b9bc027dee5cfd8a13afa0c9204607ad7f1 (diff) | |
parent | a69176304478ee070f8f5cfdf10b897ea4442759 (diff) | |
download | Qt-626322907dcb8d3b3ec9a5bb703e2a9ee3926daa.zip Qt-626322907dcb8d3b3ec9a5bb703e2a9ee3926daa.tar.gz Qt-626322907dcb8d3b3ec9a5bb703e2a9ee3926daa.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslSocket::systemCaCertificates(): have one common case for all Unices
Fixed QX11EmbedContainer.
Improved a bit detection of a touch screen on Windows.
qdoc: Fixed invalid format in the html header.
link glu32 before opengl32
Stopped trying to output QML property list in 2 columns
Diffstat (limited to 'config.tests/mac/crc')
0 files changed, 0 insertions, 0 deletions