Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
authorLars Knoll <lars.knoll@nokia.com>
Tue, 17 Apr 2012 11:01:20 +0000 (13:01 +0200)
committerQt by Nokia <qt-info@nokia.com>
Tue, 17 Apr 2012 11:09:29 +0000 (13:09 +0200)
commit576a8e152ec36e7465bfdc8ad63998cffbab4091
tree07472de61c7542a90f675869e480b99076c5b439
parentfb7f30d2bad0c84ffea4db862a71ba2e03d855d0
parent64255ef6502b1144f7b0aa4b2bf62803e0d4788b
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
tests/auto/gui/kernel/kernel.pro