diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 22:23:32 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-28 22:23:32 (GMT) |
| commit | e391d5bb96e08db99ecb5e9efcda439450922dcc (patch) | |
| tree | 2bc37edc3790e2b3ffd36faeb5a052b6387d080c /qmake/qmake.pro | |
| parent | 54155c773c7a879d967e577e1d24ce828850c90a (diff) | |
| parent | 2b599833c61de7bb164b0dffb5e28194d311972b (diff) | |
| download | Qt-e391d5bb96e08db99ecb5e9efcda439450922dcc.zip Qt-e391d5bb96e08db99ecb5e9efcda439450922dcc.tar.gz Qt-e391d5bb96e08db99ecb5e9efcda439450922dcc.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:
Enable SSE2 for MSVC x64 builds, as it was incorrectly disabled
Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-28062010 ( 0fccd26d3624e80cf68873701ef70ad72ca66bec )
ignore *.vcxproj.user
doc: Added more DITA output to the XML generator
Don't load ciphers and system certificates for QSslSocket::supportsSsl()
Doc: Fixed whitespace issues and added missing files to lists.
Doc: Fixed links in the QML documentation.
Doc: Changed links to explicitly refer to QML objects.
qdoc: Added a workaround for QML/Qt class name clashes.
Diffstat (limited to 'qmake/qmake.pro')
0 files changed, 0 insertions, 0 deletions