diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 12:37:18 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-04 12:37:18 (GMT) |
| commit | 8f83747d12efc612b730a7dd911f916127387c0c (patch) | |
| tree | d61b4c877cd14247ae0de260034cb99494434c5d /examples/webkit | |
| parent | 53038b678ccba374da5ce9ad216044f075a3ffd8 (diff) | |
| parent | 8e98033a67263f6a2d9155f228dc28e2faee4f5e (diff) | |
| download | Qt-8f83747d12efc612b730a7dd911f916127387c0c.zip Qt-8f83747d12efc612b730a7dd911f916127387c0c.tar.gz Qt-8f83747d12efc612b730a7dd911f916127387c0c.tar.bz2 | |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/lib/qhelpgenerator.cpp
tools/assistant/lib/qhelpsearchquerywidget.cpp
translations/translations.pri
Diffstat (limited to 'examples/webkit')
| -rw-r--r-- | examples/webkit/framecapture/framecapture.pro | 2 | ||||
| -rw-r--r-- | examples/webkit/simpleselector/simpleselector.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/webkit/framecapture/framecapture.pro b/examples/webkit/framecapture/framecapture.pro index 6f2f093..11960b9 100644 --- a/examples/webkit/framecapture/framecapture.pro +++ b/examples/webkit/framecapture/framecapture.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network HEADERS = framecapture.h SOURCES = main.cpp \ diff --git a/examples/webkit/simpleselector/simpleselector.pro b/examples/webkit/simpleselector/simpleselector.pro index acd0ae7..3ddd6db 100644 --- a/examples/webkit/simpleselector/simpleselector.pro +++ b/examples/webkit/simpleselector/simpleselector.pro @@ -1,4 +1,4 @@ -QT += webkit +QT += webkit network FORMS = window.ui HEADERS = window.h SOURCES = main.cpp \ |