diff options
| author | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
|---|---|---|
| committer | Shane Kearns <shane.kearns@accenture.com> | 2010-05-26 11:28:42 (GMT) |
| commit | f2d6af86383cfd9d5344673f4c755f06b900fa46 (patch) | |
| tree | a00711f73c644f59523899627d309fd8665ca07c /tools/qml/qmlruntime.cpp | |
| parent | 70ae881499ec329e6fdf96d56a6189f77641b3b0 (diff) | |
| parent | 39b861b75566c4db0db3b5aba2aa191a59f10bdb (diff) | |
| download | Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.zip Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.gz Qt-f2d6af86383cfd9d5344673f4c755f06b900fa46.tar.bz2 | |
Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7
Conflicts:
src/gui/kernel/qapplication_s60.cpp
Diffstat (limited to 'tools/qml/qmlruntime.cpp')
| -rw-r--r-- | tools/qml/qmlruntime.cpp | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index 5136872..fe323c1 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(); @@ -827,7 +808,9 @@ void QDeclarativeViewer::statusChanged() initialSize = canvas->sizeHint(); if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) { updateSizeHints(); - resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight())); + if (!isFullScreen() && !isMaximized()) { + resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight())); + } } } } @@ -930,13 +913,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 |