summaryrefslogtreecommitdiffstats
path: root/src/qbase.pri
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-08 23:13:48 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-08 23:13:48 (GMT)
commitb241722db7104b918715c3e1d1bcad67ce4ef3f4 (patch)
tree1fa411dd8f4281bfa4ca9106b3f48ef4e777e002 /src/qbase.pri
parenta583a8132e57bfe2cb22390aebbae8e9be353ce9 (diff)
parent222fa517b877e38c918dc8011b13f9269629c427 (diff)
downloadQt-b241722db7104b918715c3e1d1bcad67ce4ef3f4.zip
Qt-b241722db7104b918715c3e1d1bcad67ce4ef3f4.tar.gz
Qt-b241722db7104b918715c3e1d1bcad67ce4ef3f4.tar.bz2
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: uikit: update SDK setting for the simulator Add option to compare to different platform in lancelot autotest uikit: Use release Qt for simulator, update README Automatic closing of input panel on uikit when QML item looses focus.
Diffstat (limited to 'src/qbase.pri')
0 files changed, 0 insertions, 0 deletions