diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-30 12:23:16 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-09-30 12:56:23 +0200 |
| commit | bbdb460ef1778298908ae677684e5855c25d0ce5 (patch) | |
| tree | 9981a70da7e558af07bdfa0dceafecadbed66985 /examples/webkit | |
| parent | 5170432e7cb2d0d1adf7ac2ec1ece627c75470f3 (diff) | |
Fix googlechat example when Qt is lacking SSL support.
Don't build the googlechat example if QSslSocket isn't available.
And even then also perform a run-time check and display an error page
if SSL is not available.
This is because the login into Google Chat works through an https website.
Reviewed-by: Jesper
Diffstat (limited to 'examples/webkit')
| -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 a4a19a43da..af567d1f23 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 9ad6789b98..0a1d6bd82f 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 |