Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (182 commits)
Enable the widthForHeight() test case.
Fix some wrong tests in heightForWidth()
Fix and enable the tests that were disabled.
Allow hard-coding the Unix temp path
QtScript: add more tests to QObject binding
QScriptValueIterator: fix iterateArray and iterateString tests
Fixes color property of QComboBox stylesheet
Fix qmake project in QtScript benchmarks
Use file names in header include guards instead of namespace names
Fixes color property of QComboBox stylesheet
Updated QtCore DEF file for WINSCW and ARMV5
qRound: do not do operation with double when qreal is float
Fix the warnings when QBasicTimer are member of the ObjectPrivate
Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
Fix double click event on Mac OS X.
fixed CI gate flagged spelling error: occured -> occurred
file rename
various fixes to deal with CI gate failures
Avoid runId clashes
Autotest for QVariant value types
...