diff options
author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:56:47 (GMT) |
---|---|---|
committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-07-08 11:56:47 (GMT) |
commit | 93ae002230888e98b4e95834f5e5eb9600f05f18 (patch) | |
tree | 9449cc65b856b4743e933cf2b8ae1cb2f85ba9fd /examples | |
parent | 8b89d0aa973c52b44112f10c9fbd9701b17bb333 (diff) | |
parent | 1dd26ea2486db87b61e8e9f70a1e04f7386405ef (diff) | |
download | Qt-93ae002230888e98b4e95834f5e5eb9600f05f18.zip Qt-93ae002230888e98b4e95834f5e5eb9600f05f18.tar.gz Qt-93ae002230888e98b4e95834f5e5eb9600f05f18.tar.bz2 |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Conflicts:
doc/src/external-resources.qdoc
Diffstat (limited to 'examples')
-rw-r--r-- | examples/webkit/fancybrowser/mainwindow.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/examples/webkit/fancybrowser/mainwindow.cpp b/examples/webkit/fancybrowser/mainwindow.cpp index 2a9aa54..b30b2c4 100644 --- a/examples/webkit/fancybrowser/mainwindow.cpp +++ b/examples/webkit/fancybrowser/mainwindow.cpp @@ -39,6 +39,7 @@ ****************************************************************************/ #include <QtGui> +#include <QtNetwork> #include <QtWebKit> #include "mainwindow.h" |