summaryrefslogtreecommitdiffstats
path: root/mkspecs/common/gcc-base-macx.conf
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-01-19 15:59:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-01-19 15:59:37 (GMT)
commit78a927cd7b93ae3fadd272cab9ee594a1369cea4 (patch)
tree9545a4738c6df6a7cc77c85f13752616ac6d2de6 /mkspecs/common/gcc-base-macx.conf
parent85e321843a5729d19709273d625f1528156400a2 (diff)
parentc848769c06515675caa2dfaf32c6e20be87e869f (diff)
downloadQt-78a927cd7b93ae3fadd272cab9ee594a1369cea4.zip
Qt-78a927cd7b93ae3fadd272cab9ee594a1369cea4.tar.gz
Qt-78a927cd7b93ae3fadd272cab9ee594a1369cea4.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: QtScript: add more tests to QObject binding QScriptValueIterator: fix iterateArray and iterateString tests
Diffstat (limited to 'mkspecs/common/gcc-base-macx.conf')
0 files changed, 0 insertions, 0 deletions