summaryrefslogtreecommitdiffstats
path: root/examples/network
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-10-25 19:22:37 (GMT)
commit2b78291003543d45d176424d6d9624d0c02c273c (patch)
treeab21561d2ca288b7b52f8e4d3ab757b50f2ede06 /examples/network
parent50e915e4fe8b6bcd579f5fae31bfa9d736f9b6f5 (diff)
parentc7afbc97d4cb60ed11996d0bcbbddaac2b18d18c (diff)
downloadQt-2b78291003543d45d176424d6d9624d0c02c273c.zip
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.gz
Qt-2b78291003543d45d176424d6d9624d0c02c273c.tar.bz2
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'examples/network')
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro4
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro
index 42100bc..4b2c35b 100644
--- a/examples/network/bearermonitor/bearermonitor.pro
+++ b/examples/network/bearermonitor/bearermonitor.pro
@@ -17,8 +17,8 @@ maemo5|maemo6 {
sessionwidget.ui
}
-win32:!wince*:LIBS += -lWs2_32
-wince*:LIBS += -lWs2
+win32:!wince*:LIBS += -lws2_32
+wince*:LIBS += -lws2
CONFIG += console