summaryrefslogtreecommitdiffstats
path: root/demos/declarative
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-09-01 09:12:40 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-09-01 09:12:40 (GMT)
commit408c2d9d6279b5c69c3e4ba0663ec36ddd3d5542 (patch)
tree6ec0e88211d283dbe265302b598528bf9d328d6b /demos/declarative
parent7b6028276cf5de1ffd5ab8d6dede7cca12e906fd (diff)
parent1f5d88dd327be635966ed9e3811c8803a163b2a4 (diff)
downloadQt-408c2d9d6279b5c69c3e4ba0663ec36ddd3d5542.zip
Qt-408c2d9d6279b5c69c3e4ba0663ec36ddd3d5542.tar.gz
Qt-408c2d9d6279b5c69c3e4ba0663ec36ddd3d5542.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix some missing proxy calles for CleanLooks Destroy QNetworkConfigurationManager global static from qApp dtor. Fix EasyWLAN handling.
Diffstat (limited to 'demos/declarative')
0 files changed, 0 insertions, 0 deletions