diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-05-25 06:44:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-05-25 06:44:42 (GMT) |
| commit | 10b28224afeabb388d21c32aac5f51f5ecea58ed (patch) | |
| tree | ef7b1a73aa938cdf479ccbf7bcbef456823350d3 | |
| parent | 79446ca4e047e68bea68aef902a5d48478bcc9cc (diff) | |
| download | Qt-10b28224afeabb388d21c32aac5f51f5ecea58ed.zip Qt-10b28224afeabb388d21c32aac5f51f5ecea58ed.tar.gz Qt-10b28224afeabb388d21c32aac5f51f5ecea58ed.tar.bz2 | |
Remove old symbian specific IAP initialization.
| -rw-r--r-- | tools/qml/qml.pri | 5 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 26 | ||||
| -rw-r--r-- | tools/qml/qmlruntime.h | 1 |
3 files changed, 0 insertions, 32 deletions
diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index 5e3e74b..cff65be 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -23,10 +23,5 @@ maemo5 { SOURCES += $$PWD/deviceorientation.cpp } -symbian { - INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ - LIBS += -lesock -lcommdb -lconnmon -linsock -} - FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 8df250f..d00d7d9 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -92,19 +92,6 @@ #include <qdeclarativetester.h> -#if defined (Q_OS_SYMBIAN) -#define SYMBIAN_NETWORK_INIT -#endif - -#if defined (SYMBIAN_NETWORK_INIT) -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> -#include <unistd.h> -#include <QTextCodec> -#include "sym_iap_util.h" -#endif - QT_BEGIN_NAMESPACE class Runtime : public QObject @@ -522,12 +509,6 @@ void QDeclarativeViewer::createMenu(QMenuBar *menu, QMenu *flatmenu) connect(reloadAction, SIGNAL(triggered()), this, SLOT(reload())); fileMenu->addAction(reloadAction); -#if defined(Q_OS_SYMBIAN) - QAction *networkAction = new QAction(tr("Start &Network"), parent); - connect(networkAction, SIGNAL(triggered()), this, SLOT(startNetwork())); - fileMenu->addAction(networkAction); -#endif - #if !defined(Q_OS_SYMBIAN) if (flatmenu) flatmenu->addSeparator(); @@ -930,13 +911,6 @@ bool QDeclarativeViewer::open(const QString& file_or_url) return true; } -void QDeclarativeViewer::startNetwork() -{ -#if defined(SYMBIAN_NETWORK_INIT) - qt_SetDefaultIap(); -#endif -} - void QDeclarativeViewer::setAutoRecord(int from, int to) { if (from==0) from=1; // ensure resized diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 0416b32..5086e02 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -142,7 +142,6 @@ private slots: void pickRecordingFile(); void setPortrait(); void setLandscape(); - void startNetwork(); void toggleFullScreen(); void orientationChanged(); |