diff options
author | Shane Kearns <shane.kearns@accenture.com> | 2011-10-19 14:00:28 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-20 23:56:52 +0200 |
commit | 296bc328412f0cfec2318d04abd4717a4c70461c (patch) | |
tree | 0841342d9659c095dc38f379f54d14a94c90226b /examples/network/qftp/ftpwindow.h | |
parent | 4aa41982401213c67f8e4dbd6712b732fd5aa663 (diff) |
Fix FTP example to handle failure to open network session
The example code only dealt with successful opening of the session.
If the session open failed, the application is stuck because the
connect button is disabled.
Moved the session open to be part of connection.
Handled session open failure by puttin the UI back in the default
state where connection button is enabled.
Task-Number: QTBUG-9909
Reviewed-By: Miikka Heikkinen
(cherry picked from commit 104c22a68c422152ff3cf03eb3615e7826fefbd0)
Change-Id: Ifa40fcd8b83c43cda364b3ec5e58f80b539aa244
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Diffstat (limited to 'examples/network/qftp/ftpwindow.h')
-rw-r--r-- | examples/network/qftp/ftpwindow.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/network/qftp/ftpwindow.h b/examples/network/qftp/ftpwindow.h index a9df99d2b3..f060bfc0ce 100644 --- a/examples/network/qftp/ftpwindow.h +++ b/examples/network/qftp/ftpwindow.h @@ -43,6 +43,7 @@ #include <QDialog> #include <QHash> +#include <QNetworkConfigurationManager> QT_BEGIN_NAMESPACE class QDialogButtonBox; @@ -71,6 +72,7 @@ private slots: void connectOrDisconnect(); void downloadFile(); void cancelDownload(); + void connectToFtp(); void ftpCommandFinished(int commandId, bool error); void addToList(const QUrlInfo &urlInfo); @@ -101,6 +103,7 @@ private: QFile *file; QNetworkSession *networkSession; + QNetworkConfigurationManager manager; //![1] }; |