From 6b91affb9a355e668bc9d06dee580d95230ac63a Mon Sep 17 00:00:00 2001
From: Ritt Konstantin <ritt.ks@gmail.com>
Date: Fri, 10 Jun 2011 11:10:49 +0200
Subject: fix an incorrect OpenMode flags handling in QBuffer::open()

which leads to absurd statement (QBuffer::open() == !QBuffer::isOpen()) to be true.
also treat Truncate as (Truncate | WriteOnly) to satisfy lazy ones

Reviewed-by: Joao
Merge-request: 2612
---
 src/corelib/io/qbuffer.cpp         | 17 +++++--------
 tests/auto/qbuffer/tst_qbuffer.cpp | 50 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp
index 38e406b..35e7b68 100644
--- a/src/corelib/io/qbuffer.cpp
+++ b/src/corelib/io/qbuffer.cpp
@@ -333,23 +333,18 @@ bool QBuffer::open(OpenMode flags)
 {
     Q_D(QBuffer);
 
-    if ((flags & Append) == Append)
+    if ((flags & (Append | Truncate)) != 0)
         flags |= WriteOnly;
-    setOpenMode(flags);
-    if (!(isReadable() || isWritable())) {
-        qWarning("QFile::open: File access not specified");
+    if ((flags & (ReadOnly | WriteOnly)) == 0) {
+        qWarning("QBuffer::open: Buffer access not specified");
         return false;
     }
 
-    if ((flags & QIODevice::Truncate) == QIODevice::Truncate) {
+    if ((flags & Truncate) == Truncate)
         d->buf->resize(0);
-    }
-    if ((flags & QIODevice::Append) == QIODevice::Append) // append to end of buffer
-        seek(d->buf->size());
-    else
-        seek(0);
+    d->ioIndex = (flags & Append) == Append ? d->buf->size() : 0;
 
-    return true;
+    return QIODevice::open(flags);
 }
 
 /*!
diff --git a/tests/auto/qbuffer/tst_qbuffer.cpp b/tests/auto/qbuffer/tst_qbuffer.cpp
index 776935d..bf4842f 100644
--- a/tests/auto/qbuffer/tst_qbuffer.cpp
+++ b/tests/auto/qbuffer/tst_qbuffer.cpp
@@ -56,6 +56,7 @@ public:
     tst_QBuffer();
 
 private slots:
+    void open();
     void getSetCheck();
     void readBlock();
     void readBlockPastEnd();
@@ -104,6 +105,55 @@ tst_QBuffer::tst_QBuffer()
 {
 }
 
+void tst_QBuffer::open()
+{
+    QByteArray data(10, 'f');
+
+    QBuffer b;
+
+    QTest::ignoreMessage(QtWarningMsg, "QBuffer::open: Buffer access not specified");
+    QVERIFY(!b.open(QIODevice::NotOpen));
+    QVERIFY(!b.isOpen());
+    b.close();
+
+    QTest::ignoreMessage(QtWarningMsg, "QBuffer::open: Buffer access not specified");
+    QVERIFY(!b.open(QIODevice::Text));
+    QVERIFY(!b.isOpen());
+    b.close();
+
+    QTest::ignoreMessage(QtWarningMsg, "QBuffer::open: Buffer access not specified");
+    QVERIFY(!b.open(QIODevice::Unbuffered));
+    QVERIFY(!b.isOpen());
+    b.close();
+
+    QVERIFY(b.open(QIODevice::ReadOnly));
+    QVERIFY(b.isReadable());
+    b.close();
+
+    QVERIFY(b.open(QIODevice::WriteOnly));
+    QVERIFY(b.isWritable());
+    b.close();
+
+    b.setData(data);
+    QVERIFY(b.open(QIODevice::Append));
+    QVERIFY(b.isWritable());
+    QCOMPARE(b.size(), qint64(10));
+    QCOMPARE(b.pos(), b.size());
+    b.close();
+
+    b.setData(data);
+    QVERIFY(b.open(QIODevice::Truncate));
+    QVERIFY(b.isWritable());
+    QCOMPARE(b.size(), qint64(0));
+    QCOMPARE(b.pos(), qint64(0));
+    b.close();
+
+    QVERIFY(b.open(QIODevice::ReadWrite));
+    QVERIFY(b.isReadable());
+    QVERIFY(b.isWritable());
+    b.close();
+}
+
 // some status() tests, too
 void tst_QBuffer::readBlock()
 {
-- 
cgit v0.12


From a9364af090fd3209b92ed5e07a1374488d22b1c4 Mon Sep 17 00:00:00 2001
From: Andy Shaw <andy.shaw@digia.com>
Date: Fri, 10 Jun 2011 11:22:00 +0200
Subject: Fix a case of SP_MediaSkipForward returning the wrong pixmap.

This fixes QTBUG-18311.

Merge-request: 2621
Reviewed-by: Joao
---
 src/gui/styles/qcommonstyle.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index e5171d8..ad0e151 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -5292,7 +5292,7 @@ QPixmap QCommonStyle::standardPixmap(StandardPixmap sp, const QStyleOption *opti
                 pixmap = QIcon::fromTheme(QLatin1String("media-seek-backward")).pixmap(16);
                 break;
         case SP_MediaSkipForward:
-                pixmap = QIcon::fromTheme(QLatin1String("media-skip-backward")).pixmap(16);
+                pixmap = QIcon::fromTheme(QLatin1String("media-skip-forward")).pixmap(16);
                 break;
         case SP_MediaSkipBackward:
                 pixmap = QIcon::fromTheme(QLatin1String("media-skip-backward")).pixmap(16);
-- 
cgit v0.12