From 87274e272d2a854563066489e20d019b4e6320de Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 18 Oct 2011 09:54:31 +0200
Subject: 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>
---
 examples/network/qftp/ftpwindow.cpp | 15 ---------------
 examples/network/qftp/main.cpp      | 14 --------------
 examples/network/qftp/qftp.pro      | 11 -----------
 3 files changed, 40 deletions(-)

(limited to 'examples/network/qftp')

diff --git a/examples/network/qftp/ftpwindow.cpp b/examples/network/qftp/ftpwindow.cpp
index 1c0d057c66..b0d2e5d9d8 100644
--- a/examples/network/qftp/ftpwindow.cpp
+++ b/examples/network/qftp/ftpwindow.cpp
@@ -51,10 +51,6 @@ FtpWindow::FtpWindow(QWidget *parent)
     ftpServerLabel->setBuddy(ftpServerLineEdit);
 
     statusLabel = new QLabel(tr("Please enter the name of an FTP server."));
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-    // Use word wrapping to fit the text on screen
-    statusLabel->setWordWrap( true );
-#endif
 
     fileList = new QTreeWidget;
     fileList->setEnabled(false);
@@ -93,22 +89,11 @@ FtpWindow::FtpWindow(QWidget *parent)
     QHBoxLayout *topLayout = new QHBoxLayout;
     topLayout->addWidget(ftpServerLabel);
     topLayout->addWidget(ftpServerLineEdit);
-#ifndef Q_OS_SYMBIAN
     topLayout->addWidget(cdToParentButton);
     topLayout->addWidget(connectButton);
-#else
-    // Make app better lookin on small screen
-    QHBoxLayout *topLayout2 = new QHBoxLayout;
-    topLayout2->addWidget(cdToParentButton);
-    topLayout2->addWidget(connectButton);
-#endif
 
     QVBoxLayout *mainLayout = new QVBoxLayout;
     mainLayout->addLayout(topLayout);
-#ifdef Q_OS_SYMBIAN
-    // Make app better lookin on small screen
-    mainLayout->addLayout(topLayout2);
-#endif
     mainLayout->addWidget(fileList);
     mainLayout->addWidget(statusLabel);
     mainLayout->addWidget(buttonBox);
diff --git a/examples/network/qftp/main.cpp b/examples/network/qftp/main.cpp
index f6eb2d4db2..15689b5a55 100644
--- a/examples/network/qftp/main.cpp
+++ b/examples/network/qftp/main.cpp
@@ -41,26 +41,12 @@
 #include <QApplication>
 #include "ftpwindow.h"
 
-#ifdef Q_OS_SYMBIAN
-#include <QDir>
-#include <QDesktopWidget>
-#endif
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(ftp);
-#ifdef 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" );
-#endif
     QApplication app(argc, argv);
     FtpWindow ftpWin;
-#ifdef Q_OS_SYMBIAN
-    // Make application better looking and more usable on small screen
-    ftpWin.showMaximized();
-#else
     ftpWin.show();
-#endif
     return ftpWin.exec();
 }
diff --git a/examples/network/qftp/qftp.pro b/examples/network/qftp/qftp.pro
index f0efe630b9..c554b37a03 100644
--- a/examples/network/qftp/qftp.pro
+++ b/examples/network/qftp/qftp.pro
@@ -11,14 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/network/qftp
 INSTALLS += target sources
-
-symbian {
-    TARGET.UID3 = 0xA000A648
-    CONFIG += qt_example
-    INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
-    TARGET.CAPABILITY="NetworkServices ReadUserData WriteUserData"
-}
-maemo5: CONFIG += qt_example
-
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
-- 
cgit v1.2.3