Merge branch '4.7' of scm.dev.troll.no:qt/qt into 4.7

Conflicts:
	src/gui/kernel/qapplication_s60.cpp

3 files changed, 3 insertions, 33 deletions

diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri
index 5e3e74bf1d..cff65be9b9 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 5136872530..fe323c147c 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
diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h
index 0416b32a4d..5086e02e24 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();