Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration

* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse: (388 commits)
  Fix the license in files for Lighthouse
  Fix typos found by the spellchecking autotest
  Add missing QT_MODULE macros.
  Fix qt_defaultDpi, but not use Q_DECL_IMPORT but Q_GUI_EXPORT
  Compile fix for RVCT 4
  Fix QT_BLITTER_RASTEROVERLAY and namespace error
  Lighthouse: initial COCOA plugin
  Lighthouse on OS X.
  Fix QWS generic mac mkspec
  actually set egl swap interval
  Remove debug code added by 650a0078e2cef43eff107fe8d2505f64a0bfedf0
  Update sections if model content changes.
  Don't clobber the tty by default
  Add touch offset
  Jitter removal
  Mouse event compression
  Add keycodes for some additional multimedia keys
  Make it possible to choose some EGLFS configuration options via envvars
  use swapInterval=1 by default in EglFS to potentially avoid tearing
  Lighthouse: make QFontconfigDatabase not override application font
  ...

3 files changed, 34 insertions, 13 deletions

diff --git a/tests/auto/qaction/tst_qaction.cpp b/tests/auto/qaction/tst_qaction.cpp
index 313178e..66a1039 100644
--- a/tests/auto/qaction/tst_qaction.cpp
+++ b/tests/auto/qaction/tst_qaction.cpp
@@ -242,7 +242,7 @@ void tst_QAction::setStandardKeys()
     QList<QKeySequence> expected;
 #if defined(Q_WS_MAC) || defined(Q_OS_SYMBIAN)
     expected  << QKeySequence("CTRL+C");
-#elif defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#elif defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
     expected  << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT");
 #else
     expected  << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
diff --git a/tests/auto/qsound/tst_qsound.cpp b/tests/auto/qsound/tst_qsound.cpp
index eda99a1..295ed91 100644
--- a/tests/auto/qsound/tst_qsound.cpp
+++ b/tests/auto/qsound/tst_qsound.cpp
@@ -63,6 +63,9 @@ private slots:
 
 void tst_QSound::checkFinished()
 {
+#if defined(Q_WS_QPA)
+    QSKIP("QSound is not implemented on Lighthouse", SkipAll);
+#else
     QSound sound(SRCDIR"4.wav");
     sound.setLoops(3);
     sound.play();
@@ -72,15 +75,17 @@ void tst_QSound::checkFinished()
     QEXPECT_FAIL("", "QSound buggy on embedded (task QTBUG-157)", Abort);
 #endif
     QVERIFY(sound.isFinished() );
+#endif
 }
 
 void tst_QSound::staticPlay()
 {
     QSKIP("Test disabled -- only for manual purposes", SkipAll);
-
+#if !defined(Q_WS_QPA)
     // Check that you hear sound with static play also.
     QSound::play(SRCDIR"4.wav");
     QTest::qWait(2000);
+#endif
 }
 
 QTEST_MAIN(tst_QSound);
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index c7d4617..d230f2c 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -364,7 +364,7 @@ private slots:
 
     void setClearAndResizeMask();
     void maskedUpdate();
-#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS)
+#if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
     void syntheticEnterLeave();
     void taskQTBUG_4055_sendSyntheticEnterLeave();
 #endif
@@ -1966,7 +1966,7 @@ void tst_QWidget::showMaximized()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowMaximized));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_S60)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_S60) && !defined(Q_WS_QPA)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -2065,7 +2065,7 @@ void tst_QWidget::showFullScreen()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined (Q_WS_S60)
+#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined (Q_WS_S60) && !defined(Q_WS_QPA)
 //embedded may choose a different size to fit on the screen.
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
@@ -2154,7 +2154,10 @@ void tst_QWidget::resizeEvent()
         wParent.show();
         QCOMPARE (wChild.m_resizeEventCount, 1); // initial resize event before paint
         wParent.hide();
-        wChild.resize(QSize(640,480));
+        QSize safeSize(640,480);
+        if (wChild.size() == safeSize)
+            safeSize.setWidth(639);
+        wChild.resize(safeSize);
         QCOMPARE (wChild.m_resizeEventCount, 1);
         wParent.show();
         QCOMPARE (wChild.m_resizeEventCount, 2);
@@ -2165,7 +2168,10 @@ void tst_QWidget::resizeEvent()
         wTopLevel.show();
         QCOMPARE (wTopLevel.m_resizeEventCount, 1); // initial resize event before paint for toplevels
         wTopLevel.hide();
-        wTopLevel.resize(QSize(640,480));
+        QSize safeSize(640,480);
+        if (wTopLevel.size() == safeSize)
+            safeSize.setWidth(639);
+        wTopLevel.resize(safeSize);
         QCOMPARE (wTopLevel.m_resizeEventCount, 1);
         wTopLevel.show();
         QCOMPARE (wTopLevel.m_resizeEventCount, 2);
@@ -3362,6 +3368,10 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_SYMBIAN)
     QEXPECT_FAIL("", "Symbian/S60 does only support rectangular regions", Continue); //See also task 147191
 #endif
+#if defined(Q_WS_QPA)
+    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); 
+#endif
+
     QTRY_COMPARE(QApplication::widgetAt(100,100)->objectName(), w1->objectName());
     QTRY_COMPARE(QApplication::widgetAt(101,101)->objectName(), w2->objectName());
 
@@ -3380,6 +3390,9 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_SYMBIAN)
     QEXPECT_FAIL("", "Symbian/S60 does only support rectangular regions", Continue); //See also task 147191
 #endif
+#if defined(Q_WS_QPA)
+    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); 
+#endif
     QTRY_VERIFY(QApplication::widgetAt(100,100) == w1);
     QTRY_VERIFY(QApplication::widgetAt(101,101) == w2);
 
@@ -5452,9 +5465,12 @@ public:
             QCOMPARE(pixmap.size(), rect.size());                       \
             QPixmap expectedPixmap(pixmap); /* ensure equal formats */  \
             expectedPixmap.fill(color);                                 \
-            if (pixmap.toImage().pixel(0,0) != QColor(color).rgb() && t < 4 ) \
+            QImage image = pixmap.toImage();                          \
+            uint alphaCorrection = image.format() == QImage::Format_RGB32 ? 0xff000000 : 0; \
+            uint firstPixel = image.pixel(0,0) | alphaCorrection;        \
+            if ( firstPixel != QColor(color).rgb() && t < 4 )          \
             { QTest::qWait(200); continue; }                            \
-            QCOMPARE(pixmap.toImage().pixel(0,0), QColor(color).rgb()); \
+            QCOMPARE(firstPixel, QColor(color).rgb());                  \
             QCOMPARE(pixmap, expectedPixmap);                           \
             break;                                                      \
         }                                                               \
@@ -6346,7 +6362,7 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             EventRecorder::EventList()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60) || defined(Q_WS_QPA)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -6442,7 +6458,7 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
             << qMakePair(&widget, QEvent::Type(QEvent::User + 2))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60) || defined(Q_WS_QPA)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -6538,7 +6554,7 @@ void tst_QWidget::compatibilityChildInsertedEvents()
             << qMakePair(&widget, QEvent::PolishRequest)
             << qMakePair(&widget, QEvent::Type(QEvent::User + 1))
             << qMakePair(&widget, QEvent::Type(QEvent::User + 2))
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_S60) || defined(Q_WS_QPA)
             << qMakePair(&widget, QEvent::UpdateRequest)
 #endif
             ;
@@ -9151,7 +9167,7 @@ void tst_QWidget::maskedUpdate()
     QTRY_COMPARE(grandChild.paintedRegion, QRegion(grandChild.rect())); // Full update.
 }
 
-#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS)
+#if defined(Q_WS_X11) || defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
 void tst_QWidget::syntheticEnterLeave()
 {
     class MyWidget : public QWidget