summaryrefslogtreecommitdiffstats
path: root/tests/auto/qnativesocketengine/qsocketengine.pri
diff options
context:
space:
mode:
authorMartin Jones <martin.jones@nokia.com>2010-06-01 03:09:17 (GMT)
committerMartin Jones <martin.jones@nokia.com>2010-06-01 03:09:17 (GMT)
commit33a65a1def8e6d40819ead6e7548cb7345f3b922 (patch)
treef00cf93cb202d8d54ebacd3dedc01ff31d23a9a4 /tests/auto/qnativesocketengine/qsocketengine.pri
parent91cb226780d05f0f7d8fd1875121427ade52c1a8 (diff)
parent5f6b50f99a6457c208c7f186db45a2dba690bace (diff)
downloadQt-33a65a1def8e6d40819ead6e7548cb7345f3b922.zip
Qt-33a65a1def8e6d40819ead6e7548cb7345f3b922.tar.gz
Qt-33a65a1def8e6d40819ead6e7548cb7345f3b922.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/qnativesocketengine/qsocketengine.pri')
0 files changed, 0 insertions, 0 deletions