summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui.pro
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-28 13:26:41 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-28 13:26:41 (GMT)
commit54869c8727e5403cea866c99a5f83ae9c8533f82 (patch)
tree631041adad66a2298177298b56c20028afe19f15 /tests/auto/gui.pro
parenteedc18d1fdcf7c359916304cbf0b4629bbf70c84 (diff)
parent86b42367d2ded7d3db06b1e087d8112a3171081a (diff)
downloadQt-54869c8727e5403cea866c99a5f83ae9c8533f82.zip
Qt-54869c8727e5403cea866c99a5f83ae9c8533f82.tar.gz
Qt-54869c8727e5403cea866c99a5f83ae9c8533f82.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: (26 commits) fix autotest on windows (again) fix autotest on windows Ammend last INTEGRITY fix Fix qmake build on Windows fix test for QtLighthouse add test for suppressing warnings in moc Ammend INTEGRITY fixes Store property editor's column positions in settings add gsm to connectable bearer for networkmanager. Fix license headers add missing include Silence GHS compiler Run on INTEGRITY Fix compilation on INTEGRITY Do not link with libm on INTEGRITY Add a "-nn" option to moc Add Documentation about INTEGRITY RTOS List the INTEGRITY drivers as well Use TCP_LOCALSOCKET on INTEGRITY Compile for systems without mmap ...
Diffstat (limited to 'tests/auto/gui.pro')
0 files changed, 0 insertions, 0 deletions