summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-03-08 15:41:07 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-03-08 15:41:07 (GMT)
commitd62f8e1e593acbb69b22ed4f941f2bebbb82dd14 (patch)
tree5f43aeecd1af1e3f176d8e33dcc4a20907c06823
parentd726a7a138f6755b0f3b12fb3e9808f9ffaeb87b (diff)
parent298e91f240a3bc9db9450bf9b1ce7606531853ff (diff)
downloadQt-d62f8e1e593acbb69b22ed4f941f2bebbb82dd14.zip
Qt-d62f8e1e593acbb69b22ed4f941f2bebbb82dd14.tar.gz
Qt-d62f8e1e593acbb69b22ed4f941f2bebbb82dd14.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QHostInfo: Compile fix
-rw-r--r--src/network/kernel/qhostinfo.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/network/kernel/qhostinfo.cpp b/src/network/kernel/qhostinfo.cpp
index 9092ad6..7150fb7 100644
--- a/src/network/kernel/qhostinfo.cpp
+++ b/src/network/kernel/qhostinfo.cpp
@@ -639,7 +639,7 @@ void qt_qhostinfo_clear_cache()
}
}
-void Q_NETWORK_EXPORT qt_qhostinfo_enable_cache(bool e)
+void Q_AUTOTEST_EXPORT qt_qhostinfo_enable_cache(bool e)
{
QHostInfoLookupManager* manager = theHostInfoLookupManager();
if (manager) {