Changeset 846 for trunk/src/plugins/gfxdrivers/vnc

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/plugins/gfxdrivers/vnc/main.cpp (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/qscreenvnc_p.h (modified) (1 diff)
• src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp (modified) (4 diffs)
• src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h (modified) (1 diff)

trunk/src/plugins/gfxdrivers/vnc/main.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -1054 +1054 @@
     QRfbClientCutText ev;
 
-    if (ev.read(client)) {
+    if (cutTextPending == 0 && ev.read(client)) {
         cutTextPending = ev.length;
         if (!cutTextPending)
@@ -1482 +1482 @@
             if (count & 0x1) {
                 const quint16 *src16 = reinterpret_cast<const quint16*>(src);
-                dst32[count - 1] = qt_conv16ToRgb(src16[count - 1]);
+                *dst32 = qt_conv16ToRgb(src16[count - 1]);
             }
             return;
@@ -2039 +2039 @@
     qvnc_cursor = 0;
 #endif
-    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting)
+    if (!qvnc_screen->screen() && !qvnc_screen->d_ptr->noDisablePainting && QWSServer::instance())
         QWSServer::instance()->enablePainting(false);
 }

trunk/src/plugins/gfxdrivers/vnc/qscreenvnc_qws.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)