diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:45:38 +0200 |
|---|---|---|
| committer | Samuel Rødal <samuel.rodal@nokia.com> | 2011-05-20 19:46:19 +0200 |
| commit | d671acd5b296b83440db9836a92189c501c87ff3 (patch) | |
| tree | bd9c1a000e17c70124c207666cfb3276b5518ffd /tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp | |
| parent | 42f5786104f9eef9542df2c7469a03324978281d (diff) | |
| parent | 4f2138ecfbdc58e5cb5b0c7d762197ef69752957 (diff) | |
Merge remote branch 'staging/master' into refactor
Conflicts:
src/opengl/qgl_qpa.cpp
src/plugins/platforms/glxconvenience/qglxconvenience.cpp
src/plugins/platforms/platforms.pro
src/plugins/platforms/wayland/qwaylandwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/plugins/platforms/xcb/qxcbwindow.h
src/plugins/platforms/xcb/qxcbwindowsurface.cpp
src/widgets/kernel/qwidget_qpa.cpp
tests/auto/qvariant/tst_qvariant.cpp
Diffstat (limited to 'tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp')
| -rw-r--r-- | tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp index f7c5ca151d..04bc410097 100644 --- a/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp +++ b/tests/auto/qnetworkaccessmanager_and_qprogressdialog/tst_qnetworkaccessmanager_and_qprogressdialog.cpp @@ -65,9 +65,9 @@ class DownloadCheckWidget : public QWidget { Q_OBJECT public: - DownloadCheckWidget(QWidget *parent = 0) : QWidget(parent) - , progressDlg(this), netmanager(this) - , lateReadyRead(true) + DownloadCheckWidget(QWidget *parent = 0) : + QWidget(parent), lateReadyRead(true), zeroCopy(false), + progressDlg(this), netmanager(this) { progressDlg.setRange(1, 100); QMetaObject::invokeMethod(this, "go", Qt::QueuedConnection); @@ -96,12 +96,14 @@ public slots: void dataReadProgress(qint64 done, qint64 total) { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); + Q_UNUSED(reply); progressDlg.setMaximum(total); progressDlg.setValue(done); } void dataReadyRead() { QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender()); + Q_UNUSED(reply); lateReadyRead = true; } void finishedFromReply() |