Merge commit 'qt/4.6' into mmfphonon

9 files changed, 126 insertions, 15 deletions

diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
index 9aad8f7..d7466d2 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h
@@ -259,6 +259,8 @@ public:
 #endif
 
     QVNCScreen *q_ptr;
+
+    bool noDisablePainting;
 };
 
 class QRfbEncoder
diff --git a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
index e177f98..f28e160 100644
--- a/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
+++ b/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp
@@ -195,8 +195,11 @@ void QVNCClientCursor::write() const
 
 QVNCScreenPrivate::QVNCScreenPrivate(QVNCScreen *parent)
     : dpiX(72), dpiY(72), doOnScreenSurface(false), refreshRate(25),
-      vncServer(0), q_ptr(parent)
+      vncServer(0), q_ptr(parent), noDisablePainting(false)
 {
+#ifdef QT_BUILD_INTERNAL
+    noDisablePainting = (qgetenv("QT_VNC_NO_DISABLEPAINTING").toInt() <=0);
+#endif
 #ifndef QT_NO_QWS_SIGNALHANDLER
     QWSSignalHandler::instance()->addObject(this);
 #endif
@@ -615,7 +618,7 @@ void QVNCServer::newConnection()
     client->write(proto, 12);
     state = Protocol;
 
-    if (!qvnc_screen->screen())
+    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting)
         QWSServer::instance()->enablePainting(true);
 }
 
@@ -2001,7 +2004,7 @@ void QVNCServer::discardClient()
     delete qvnc_cursor;
     qvnc_cursor = 0;
 #endif
-    if (!qvnc_screen->screen())
+    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting)
         QWSServer::instance()->enablePainting(false);
 }
 
@@ -2184,6 +2187,9 @@ bool QVNCScreen::connect(const QString &displaySpec)
             d_ptr->dpiY = (dpiY > 0 ? dpiY : dpiX);
         }
 
+        if (args.contains(QLatin1String("noDisablePainting")))
+            d_ptr->noDisablePainting = true;
+
         QWSServer::setDefaultMouse("None");
         QWSServer::setDefaultKeyboard("None");
 
@@ -2273,11 +2279,9 @@ bool QVNCScreen::initDevice()
     if (QProxyScreen::screen())
         return ok;
 
-#ifdef QT_BUILD_INTERNAL
-    if (qgetenv("QT_VNC_NO_DISABLEPAINTING").toInt() <= 0)
-#endif
-    // No need to do painting while there's no clients attached
-    QWSServer::instance()->enablePainting(false);
+    // Disable painting if there is only 1 display and nothing is attached to the VNC server
+    if (!d_ptr->noDisablePainting)
+        QWSServer::instance()->enablePainting(false);
 
     return true;
 }
diff --git a/src/plugins/s60/3_1/3_1.pro b/src/plugins/s60/3_1/3_1.pro
index 568a33c..58ff5ce 100644
--- a/src/plugins/s60/3_1/3_1.pro
+++ b/src/plugins/s60/3_1/3_1.pro
@@ -3,6 +3,7 @@ include(../s60pluginbase.pri)
 TARGET  = qts60plugin_3_1
 
 SOURCES += ../src/qlocale_3_1.cpp \
-    ../src/qdesktopservices_3_1.cpp
+    ../src/qdesktopservices_3_1.cpp \
+    ../src/qcoreapplication_3_1.cpp
 
 TARGET.UID3=0x2001E620
diff --git a/src/plugins/s60/3_2/3_2.pro b/src/plugins/s60/3_2/3_2.pro
index 97409d3..4b28eb9 100644
--- a/src/plugins/s60/3_2/3_2.pro
+++ b/src/plugins/s60/3_2/3_2.pro
@@ -4,11 +4,13 @@ TARGET  = qts60plugin_3_2
 
 contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_1.cpp \
-        ../src/qdesktopservices_3_1.cpp
+        ../src/qdesktopservices_3_1.cpp \
+        ../src/qcoreapplication_3_1.cpp
 } else {
     SOURCES += ../src/qlocale_3_2.cpp \
-        ../src/qdesktopservices_3_2.cpp
-    LIBS += -ldirectorylocalizer
+        ../src/qdesktopservices_3_2.cpp \
+        ../src/qcoreapplication_3_2.cpp
+    LIBS += -ldirectorylocalizer -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/5_0/5_0.pro b/src/plugins/s60/5_0/5_0.pro
index d7c3cb2..4cdce12 100644
--- a/src/plugins/s60/5_0/5_0.pro
+++ b/src/plugins/s60/5_0/5_0.pro
@@ -4,11 +4,13 @@ TARGET  = qts60plugin_5_0
 
 contains(S60_VERSION, 3.1) {
     SOURCES += ../src/qlocale_3_1.cpp \
-        ../src/qdesktopservices_3_1.cpp
+        ../src/qdesktopservices_3_1.cpp \
+        ../src/qcoreapplication_3_1.cpp
 } else {
     SOURCES += ../src/qlocale_3_2.cpp \
-        ../src/qdesktopservices_3_2.cpp
-    LIBS += -ldirectorylocalizer
+        ../src/qdesktopservices_3_2.cpp \
+        ../src/qcoreapplication_3_2.cpp
+    LIBS += -ldirectorylocalizer -lefsrv
     INCLUDEPATH += $$APP_LAYER_SYSTEMINCLUDE
 }
 
diff --git a/src/plugins/s60/bwins/qts60pluginu.def b/src/plugins/s60/bwins/qts60pluginu.def
index a082262..b4110a9 100644
--- a/src/plugins/s60/bwins/qts60pluginu.def
+++ b/src/plugins/s60/bwins/qts60pluginu.def
@@ -4,3 +4,5 @@ EXPORTS
 	?defaultGetLongDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 3 NONAME ; class TPtrC16 defaultGetLongDateFormatSpec(class TExtendedLocale &)
 	?defaultGetShortDateFormatSpec@@YA?AVTPtrC16@@AAVTExtendedLocale@@@Z @ 4 NONAME ; class TPtrC16 defaultGetShortDateFormatSpec(class TExtendedLocale &)
 	?localizedDirectoryName@@YA?AVQString@@AAV1@@Z @ 5 NONAME ; class QString localizedDirectoryName(class QString &)
+	?systemDrive@@YA?AW4TDriveNumber@@AAVRFs@@@Z @ 6 NONAME ; enum TDriveNumber systemDrive(class RFs &)
+
diff --git a/src/plugins/s60/eabi/qts60pluginu.def b/src/plugins/s60/eabi/qts60pluginu.def
index d768436..df7895c 100644
--- a/src/plugins/s60/eabi/qts60pluginu.def
+++ b/src/plugins/s60/eabi/qts60pluginu.def
@@ -4,3 +4,5 @@ EXPORTS
 	_Z28defaultGetLongDateFormatSpecR15TExtendedLocale @ 3 NONAME
 	_Z29defaultGetShortDateFormatSpecR15TExtendedLocale @ 4 NONAME
 	_Z22localizedDirectoryNameR7QString @ 5 NONAME
+	_Z11systemDriveR3RFs @ 6 NONAME
+
diff --git a/src/plugins/s60/src/qcoreapplication_3_1.cpp b/src/plugins/s60/src/qcoreapplication_3_1.cpp
new file mode 100644
index 0000000..c7627ce
--- /dev/null
+++ b/src/plugins/s60/src/qcoreapplication_3_1.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qglobal.h>
+#include <f32file.h>
+
+EXPORT_C TDriveNumber systemDrive(RFs&)
+{
+    return EDriveC;
+}
diff --git a/src/plugins/s60/src/qcoreapplication_3_2.cpp b/src/plugins/s60/src/qcoreapplication_3_2.cpp
new file mode 100644
index 0000000..8d2794e
--- /dev/null
+++ b/src/plugins/s60/src/qcoreapplication_3_2.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <qglobal.h>
+#include <f32file.h>
+
+EXPORT_C TDriveNumber systemDrive(RFs& fs)
+{
+    return fs.GetSystemDrive();
+}