diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 03:36:52 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-18 03:36:52 (GMT) |
commit | eb1f35fa3e1c146369db3814b06a1f5b3013bfa9 (patch) | |
tree | 4510cd28bc6582559f6a77f7d73610ae39fc8d6e /tests | |
parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
parent | 21eb38ccf07953f62e2b0a1d3440e9d9bb5cfc86 (diff) | |
download | Qt-eb1f35fa3e1c146369db3814b06a1f5b3013bfa9.zip Qt-eb1f35fa3e1c146369db3814b06a1f5b3013bfa9.tar.gz Qt-eb1f35fa3e1c146369db3814b06a1f5b3013bfa9.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Designer: Fix compilation with -static on Mac OS X
Configure support for multiple include levels in qmake.conf hierarchy.
Stop the configuration if the test compiler cannot be found.
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions