diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 15:50:45 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-06 15:50:45 (GMT) |
| commit | 6729e107c95ab108954d2acbf0a77a75fa087d1a (patch) | |
| tree | cf3fba9a583c03dd54632f0b3baf0afec3e03b25 /qmake/meta.h | |
| parent | d1cbe465f3b00561738e3b7dc25b20cba0e4cac8 (diff) | |
| parent | 98b7536850241a85d20e541db80e354b8bc72d37 (diff) | |
| download | Qt-6729e107c95ab108954d2acbf0a77a75fa087d1a.zip Qt-6729e107c95ab108954d2acbf0a77a75fa087d1a.tar.gz Qt-6729e107c95ab108954d2acbf0a77a75fa087d1a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM: Compile fix for Symbian.. hopefully.
Issue a warning and disable webkit build when xrender is disabled on X11
QNAM: Move out function calls to new variable
QNAM: Remove QNetworkAccessDataBackend
QNAM: Fix usage of toString of QUrl
QNAM: New specialized QNetworkReply for data: URLs
Diffstat (limited to 'qmake/meta.h')
0 files changed, 0 insertions, 0 deletions