diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/network/http | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/network/http')
-rw-r--r-- | examples/network/http/http.pro | 6 | ||||
-rw-r--r-- | examples/network/http/httpwindow.cpp | 19 | ||||
-rw-r--r-- | examples/network/http/httpwindow.h | 10 | ||||
-rw-r--r-- | examples/network/http/main.cpp | 11 |
4 files changed, 0 insertions, 46 deletions
diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro index 6f4b7be076..8349de4622 100644 --- a/examples/network/http/http.pro +++ b/examples/network/http/http.pro @@ -11,9 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/http INSTALLS += target sources - -symbian: { - CONFIG += qt_example - TARGET.CAPABILITY = NetworkServices -} -maemo5: CONFIG += qt_example diff --git a/examples/network/http/httpwindow.cpp b/examples/network/http/httpwindow.cpp index 77c1e314c7..082dc910ca 100644 --- a/examples/network/http/httpwindow.cpp +++ b/examples/network/http/httpwindow.cpp @@ -45,11 +45,7 @@ #include "ui_authenticationdialog.h" HttpWindow::HttpWindow(QWidget *parent) -#ifdef Q_WS_MAEMO_5 - : QWidget(parent) -#else : QDialog(parent) -#endif { #ifndef QT_NO_OPENSSL urlLineEdit = new QLineEdit("https://qt.nokia.com/"); @@ -72,9 +68,7 @@ HttpWindow::HttpWindow(QWidget *parent) buttonBox->addButton(downloadButton, QDialogButtonBox::ActionRole); buttonBox->addButton(quitButton, QDialogButtonBox::RejectRole); -#ifndef Q_WS_MAEMO_5 progressDialog = new QProgressDialog(this); -#endif connect(urlLineEdit, SIGNAL(textChanged(QString)), this, SLOT(enableDownloadButton())); @@ -85,9 +79,7 @@ HttpWindow::HttpWindow(QWidget *parent) connect(&qnam, SIGNAL(sslErrors(QNetworkReply*,QList<QSslError>)), this, SLOT(sslErrors(QNetworkReply*,QList<QSslError>))); #endif -#ifndef Q_WS_MAEMO_5 connect(progressDialog, SIGNAL(canceled()), this, SLOT(cancelDownload())); -#endif connect(downloadButton, SIGNAL(clicked()), this, SLOT(downloadFile())); connect(quitButton, SIGNAL(clicked()), this, SLOT(close())); @@ -145,10 +137,8 @@ void HttpWindow::downloadFile() return; } -#ifndef Q_WS_MAEMO_5 progressDialog->setWindowTitle(tr("HTTP")); progressDialog->setLabelText(tr("Downloading %1.").arg(fileName)); -#endif downloadButton->setEnabled(false); // schedule the request @@ -174,15 +164,11 @@ void HttpWindow::httpFinished() file = 0; } reply->deleteLater(); -#ifndef Q_WS_MAEMO_5 progressDialog->hide(); -#endif return; } -#ifndef Q_WS_MAEMO_5 progressDialog->hide(); -#endif file->flush(); file->close(); @@ -233,13 +219,8 @@ void HttpWindow::updateDataReadProgress(qint64 bytesRead, qint64 totalBytes) if (httpRequestAborted) return; -#ifndef Q_WS_MAEMO_5 progressDialog->setMaximum(totalBytes); progressDialog->setValue(bytesRead); -#else - Q_UNUSED(bytesRead); - Q_UNUSED(totalBytes); -#endif } void HttpWindow::enableDownloadButton() diff --git a/examples/network/http/httpwindow.h b/examples/network/http/httpwindow.h index 8bbe1a261a..0ec87af48a 100644 --- a/examples/network/http/httpwindow.h +++ b/examples/network/http/httpwindow.h @@ -41,11 +41,7 @@ #ifndef HTTPWINDOW_H #define HTTPWINDOW_H -#ifdef Q_WS_MAEMO_5 -#include <QWidget> -#else #include <QDialog> -#endif #include <QNetworkAccessManager> #include <QUrl> @@ -63,11 +59,7 @@ class QNetworkReply; QT_END_NAMESPACE -#ifdef Q_WS_MAEMO_5 -class HttpWindow : public QWidget -#else class HttpWindow : public QDialog -#endif { Q_OBJECT @@ -92,9 +84,7 @@ private: QLabel *statusLabel; QLabel *urlLabel; QLineEdit *urlLineEdit; -#ifndef Q_WS_MAEMO_5 QProgressDialog *progressDialog; -#endif QPushButton *downloadButton; QPushButton *quitButton; QDialogButtonBox *buttonBox; diff --git a/examples/network/http/main.cpp b/examples/network/http/main.cpp index e4f157476c..ae20f6f41c 100644 --- a/examples/network/http/main.cpp +++ b/examples/network/http/main.cpp @@ -47,20 +47,9 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); -#if defined(Q_OS_SYMBIAN) - // Change current directory from default private to c:\data - // in order that user can access the downloaded content - QDir::setCurrent("c:\\data"); -#elif defined(Q_WS_MAEMO_5) - QDir::setCurrent("/home/user"); -#endif HttpWindow httpWin; -#if defined(Q_OS_SYMBIAN) - httpWin.showMaximized(); -#else httpWin.show(); -#endif return app.exec(); } |