Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7

7 files changed, 56 insertions, 9 deletions

diff --git a/src/corelib/kernel/qeventdispatcher_symbian.cpp b/src/corelib/kernel/qeventdispatcher_symbian.cpp
index 9abb000..47dd558 100644
--- a/src/corelib/kernel/qeventdispatcher_symbian.cpp
+++ b/src/corelib/kernel/qeventdispatcher_symbian.cpp
@@ -217,13 +217,13 @@ QTimerActiveObject::QTimerActiveObject(QEventDispatcherSymbian *dispatcher, Symb
 QTimerActiveObject::~QTimerActiveObject()
 {
     Cancel();
+    m_rTimer.Close(); //close of null handle is safe
 }
 
 void QTimerActiveObject::DoCancel()
 {
     if (m_timerInfo->interval > 0) {
         m_rTimer.Cancel();
-        m_rTimer.Close();
     } else {
         if (iStatus.Int() == KRequestPending) {
             TRequestStatus *status = &iStatus;
@@ -302,7 +302,9 @@ void QTimerActiveObject::Start()
     CActiveScheduler::Add(this);
     m_timerInfo->msLeft = m_timerInfo->interval;
     if (m_timerInfo->interval > 0) {
-        m_rTimer.CreateLocal();
+        if (!m_rTimer.Handle()) {
+            qt_symbian_throwIfError(m_rTimer.CreateLocal());
+        }
         StartTimer();
     } else {
         iStatus = KRequestPending;
diff --git a/src/gui/kernel/qwidget_s60.cpp b/src/gui/kernel/qwidget_s60.cpp
index 7f8fec7..8e4e99a 100644
--- a/src/gui/kernel/qwidget_s60.cpp
+++ b/src/gui/kernel/qwidget_s60.cpp
@@ -780,6 +780,14 @@ void QWidgetPrivate::s60UpdateIsOpaque()
         if (window->SetTransparencyAlphaChannel() == KErrNone) {
             window->SetBackgroundColor(TRgb(255, 255, 255, 0));
             extra->topextra->nativeWindowTransparencyEnabled = 1;
+
+            if (extra->topextra->backingStore.data() &&
+                    QApplicationPrivate::graphics_system_name == QLatin1String("openvg")) {
+                // Semi-transparent EGL surfaces aren't supported. We need to
+                // recreate backing store to get translucent surface (raster surface).
+                extra->topextra->backingStore.create(q);
+                extra->topextra->backingStore.registerWidget(q);
+            }
         }
     } else if (extra->topextra->nativeWindowTransparencyEnabled) {
         window->SetTransparentRegion(TRegionFix<1>());
diff --git a/src/gui/painting/qgraphicssystem_runtime.cpp b/src/gui/painting/qgraphicssystem_runtime.cpp
index a5aa580..0294c4b 100644
--- a/src/gui/painting/qgraphicssystem_runtime.cpp
+++ b/src/gui/painting/qgraphicssystem_runtime.cpp
@@ -322,7 +322,6 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
     : m_windowSurfaceDestroyPolicy(DestroyImmediately),
       m_graphicsSystem(0)
 {
-    QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
     QApplicationPrivate::runtime_graphics_system = true;
 
 #ifdef QT_DEFAULT_RUNTIME_SYSTEM
@@ -336,6 +335,8 @@ QRuntimeGraphicsSystem::QRuntimeGraphicsSystem()
 #endif
 
     m_graphicsSystem = QGraphicsSystemFactory::create(m_graphicsSystemName);
+
+    QApplicationPrivate::graphics_system_name = QLatin1String("runtime");
 }
 
 
diff --git a/src/gui/text/qtextobject.cpp b/src/gui/text/qtextobject.cpp
index 019942f..e323fd0 100644
--- a/src/gui/text/qtextobject.cpp
+++ b/src/gui/text/qtextobject.cpp
@@ -1488,7 +1488,7 @@ QTextBlock::iterator QTextBlock::end() const
 */
 QTextBlock QTextBlock::next() const
 {
-    if (!p)
+    if (!isValid())
         return QTextBlock();
 
     return QTextBlock(p, p->blockMap().next(n));
@@ -1504,7 +1504,7 @@ QTextBlock QTextBlock::next() const
 */
 QTextBlock QTextBlock::previous() const
 {
-    if (!p)
+    if (!isValid())
         return QTextBlock();
 
     return QTextBlock(p, p->blockMap().previous(n));
diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
index 263b9f5..58c78ec 100644
--- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
+++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
@@ -293,9 +293,6 @@ void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
     if (mask.format() == QImage::Format_RGB32) {
         glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_BGRA, GL_UNSIGNED_BYTE, mask.bits());
     } else {
-#ifdef QT_OPENGL_ES_2
-        glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y, maskWidth, maskHeight, GL_ALPHA, GL_UNSIGNED_BYTE, mask.bits());
-#else
         // glTexSubImage2D() might cause some garbage to appear in the texture if the mask width is
         // not a multiple of four bytes. The bug appeared on a computer with 32-bit Windows Vista
         // and nVidia GeForce 8500GT. GL_UNPACK_ALIGNMENT is set to four bytes, 'mask' has a
@@ -307,7 +304,6 @@ void QGLTextureGlyphCache::fillTexture(const Coord &c, glyph_t glyph)
 
         for (int i = 0; i < maskHeight; ++i)
             glTexSubImage2D(GL_TEXTURE_2D, 0, c.x, c.y + i, maskWidth, 1, GL_ALPHA, GL_UNSIGNED_BYTE, mask.scanLine(i));
-#endif
     }
 }
 
diff --git a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
index 5b1b595..0c107b5 100644
--- a/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
+++ b/src/plugins/graphicssystems/openvg/qgraphicssystem_vg.cpp
@@ -45,11 +45,13 @@
 #if defined(Q_OS_SYMBIAN) && !defined(Q_SYMBIAN_SEMITRANSPARENT_BG_SURFACE)
 #include <QtGui/private/qwidget_p.h>
 #endif
+#include <QtGui/private/qapplication_p.h>
 
 QT_BEGIN_NAMESPACE
 
 QVGGraphicsSystem::QVGGraphicsSystem()
 {
+    QApplicationPrivate::graphics_system_name = QLatin1String("openvg");
 }
 
 QPixmapData *QVGGraphicsSystem::createPixmapData(QPixmapData::PixelType type) const
diff --git a/tests/auto/qtimer/tst_qtimer.cpp b/tests/auto/qtimer/tst_qtimer.cpp
index e955de1..6cff7c53 100644
--- a/tests/auto/qtimer/tst_qtimer.cpp
+++ b/tests/auto/qtimer/tst_qtimer.cpp
@@ -90,6 +90,9 @@ private slots:
 
     void QTBUG13633_dontBlockEvents();
     void postedEventsShouldNotStarveTimers();
+#ifdef Q_OS_SYMBIAN
+    void handleLeaks();
+#endif
 };
 
 class TimerHelper : public QObject
@@ -750,5 +753,40 @@ void tst_QTimer::postedEventsShouldNotStarveTimers()
     QVERIFY(timerHelper.count > 5);
 }
 
+#ifdef Q_OS_SYMBIAN
+void tst_QTimer::handleLeaks()
+{
+    const int timercount = 5;
+    int processhandles_start;
+    int threadhandles_start;
+    RThread().HandleCount(processhandles_start, threadhandles_start);
+    {
+    TimerHelper timerHelper;
+    QList<QTimer*> timers;
+    for (int i=0;i<timercount;i++) {
+        QTimer* timer = new QTimer;
+        timers.append(timer);
+        connect(timer, SIGNAL(timeout()), &timerHelper, SLOT(timeout()));
+        timer->setSingleShot(true);
+        timer->start(i); //test both zero and normal timeouts
+    }
+    int processhandles_mid;
+    int threadhandles_mid;
+    RThread().HandleCount(processhandles_mid, threadhandles_mid);
+    qDebug() << threadhandles_mid - threadhandles_start << "new thread owned handles";
+    QTest::qWait(100);
+    QCOMPARE(timerHelper.count, timercount);
+    qDeleteAll(timers);
+    }
+    int processhandles_end;
+    int threadhandles_end;
+    RThread().HandleCount(processhandles_end, threadhandles_end);
+    QCOMPARE(threadhandles_end, threadhandles_start); //RTimer::CreateLocal creates a thread owned handle
+    //Can not verify process handles because QObject::connect may create up to 2 mutexes
+    //from a QMutexPool (4 process owned handles with open C imp.)
+    //QCOMPARE(processhandles_end, processhandles_start);
+}
+#endif
+
 QTEST_MAIN(tst_QTimer)
 #include "tst_qtimer.moc"