diff options
| author | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
|---|---|---|
| committer | Jani Hautakangas <ext-jani.hautakangas@nokia.com> | 2009-09-30 12:27:36 (GMT) |
| commit | 79aee2c16479a1dff1af886a6ccc6b2776ad6537 (patch) | |
| tree | 3a303a9f7a125f9f2f04f04711d3f9a69168a481 /examples | |
| parent | 3868e92de3b27f3e030b77cfa746888a0dbb39e7 (diff) | |
| parent | 21cfe5bf6550ae359d6bfa937b1308891954e9bb (diff) | |
| download | Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.zip Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.gz Qt-79aee2c16479a1dff1af886a6ccc6b2776ad6537.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/webkit/googlechat/googlechat.cpp | 6 | ||||
| -rw-r--r-- | examples/webkit/webkit.pro | 5 |
2 files changed, 9 insertions, 2 deletions
diff --git a/examples/webkit/googlechat/googlechat.cpp b/examples/webkit/googlechat/googlechat.cpp index a4a19a4..af567d1 100644 --- a/examples/webkit/googlechat/googlechat.cpp +++ b/examples/webkit/googlechat/googlechat.cpp @@ -41,6 +41,7 @@ #include <QtGui> #include <QtWebKit> +#include <QSslSocket> #include "googlechat.h" @@ -118,6 +119,11 @@ void GoogleChat::doLogin() { void GoogleChat::initialPage(bool ok) { if (ok) { + if (!QSslSocket::supportsSsl()) { + showError("This example requires SSL support."); + return; + } + QString s1 = evalJS("document.getElementById('Email').name"); QString s2 = evalJS("document.getElementById('Passwd').name"); QString s3 = evalJS("document.getElementById('gaia_loginform').id"); diff --git a/examples/webkit/webkit.pro b/examples/webkit/webkit.pro index 9ad6789..0a1d6bd 100644 --- a/examples/webkit/webkit.pro +++ b/examples/webkit/webkit.pro @@ -1,8 +1,9 @@ TEMPLATE = subdirs SUBDIRS += formextractor \ previewer \ - fancybrowser \ - googlechat + fancybrowser + +contains(QT_CONFIG, openssl):SUBDIRS += googlechat # install target.path = $$[QT_INSTALL_EXAMPLES]/webkit |