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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (47 commits)
  QScript: More missing APIShim
  QScriptEngine: Fix reentrency involving creation and desctructions of QScriptEngines
  Work-around Symbian 10.1's broken egl.h
  Add some #warnings to debug Symbian EGL build failure
  Don't detect EGLImage presence by testing function pointers
  Implement proper QStaticText support in QPaintBuffer
  Make QStaticText layout lazy
  Change QStaticText::setMaximumSize() to setTextWidth()
  Respect QPainter::pen() in QPainter::drawStaticText()
  QVarLenghtArray:  add some API to be consistant to QVector
  Don't try to resolve EGLImage function pointers if they are defined
  Change ORs to ANDs when checking EGLImage extension defines
  Protect EGLImage function definitions in #ifdef
  Fix a bug in greek shaping causing infinite loops
  Define QT_NO_EGL in configure.exe
  improve mingw 64 bit support
  Fix build on Windows
  Round instead of ceil font metrics when ForceIntegerMetrics is enabled
  cetest: remove source file duplicates from cetest.pro
  Remove EGLImage create/destroy resolving from VG pixmap data
  ...

3 files changed, 15 insertions, 19 deletions

diff --git a/examples/graphicsview/weatheranchorlayout/main.cpp b/examples/graphicsview/weatheranchorlayout/main.cpp
index aa06476..391fdd8 100644
--- a/examples/graphicsview/weatheranchorlayout/main.cpp
+++ b/examples/graphicsview/weatheranchorlayout/main.cpp
@@ -97,6 +97,8 @@ protected:
             case Qt::MaximumSize:
                 sh = QSizeF(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
                 break;
+            default:
+                break;
         }
          return sh;
     }
@@ -167,15 +169,6 @@ private:
 };
 
 
-static QGraphicsProxyWidget *createItem(const QString &name = "Unnamed")
-{
-    QGraphicsProxyWidget *w = new QGraphicsProxyWidget;
-    w->setWidget(new QPushButton(name));
-    w->setData(0, name);
-    w->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
-    return w;
-}
-
 int main(int argc, char **argv)
 {
     Q_INIT_RESOURCE(weatheranchorlayout);
diff --git a/examples/script/qstetrix/tetrixboard.cpp b/examples/script/qstetrix/tetrixboard.cpp
index 7d44c4c..f35740d 100644
--- a/examples/script/qstetrix/tetrixboard.cpp
+++ b/examples/script/qstetrix/tetrixboard.cpp
@@ -54,7 +54,12 @@ TetrixBoard::TetrixBoard(QWidget *parent)
 
 void TetrixBoard::setNextPieceLabel(QWidget *label)
 {
-    nextPieceLabel = qobject_cast<QLabel*>(label);
+    nextPieceLbl = qobject_cast<QLabel*>(label);
+}
+
+QLabel *TetrixBoard::nextPieceLabel() const
+{ 
+    return nextPieceLbl;
 }
 
 QObject *TetrixBoard::getTimer()
@@ -82,16 +87,16 @@ void TetrixBoard::keyPressEvent(QKeyEvent *event)
 
 void TetrixBoard::showNextPiece(int width, int height)
 {
-    if (!nextPieceLabel)
+    if (!nextPieceLabel())
         return;
 
     QPixmap pixmap(width * squareWidth(), height * squareHeight());
     QPainter painter(&pixmap);
-    painter.fillRect(pixmap.rect(), nextPieceLabel->palette().background());
+    painter.fillRect(pixmap.rect(), nextPieceLabel()->palette().background());
 
     emit paintNextPieceRequested(&painter);
 
-    nextPieceLabel->setPixmap(pixmap);
+    nextPieceLabel()->setPixmap(pixmap);
 }
 
 void TetrixBoard::drawPauseScreen(QPainter *painter)
diff --git a/examples/script/qstetrix/tetrixboard.h b/examples/script/qstetrix/tetrixboard.h
index 7a04317..781ec39 100644
--- a/examples/script/qstetrix/tetrixboard.h
+++ b/examples/script/qstetrix/tetrixboard.h
@@ -45,21 +45,19 @@
 #include <QTimer>
 #include <QFrame>
 #include <QPointer>
-
-QT_BEGIN_NAMESPACE
-class QLabel;
-QT_END_NAMESPACE
+#include <QLabel>
 
 class TetrixBoard : public QFrame
 {
     Q_OBJECT
     Q_PROPERTY(QObject* timer READ getTimer)
-    Q_PROPERTY(QWidget* nextPieceLabel WRITE setNextPieceLabel)
+    Q_PROPERTY(QWidget* nextPieceLabel READ nextPieceLabel WRITE setNextPieceLabel)
 
 public:
     TetrixBoard(QWidget *parent = 0);
 
     void setNextPieceLabel(QWidget *label);
+    QLabel *nextPieceLabel() const;
     void setBoardWidth(int width);
     void setBoardHeight(int height);
     QSize minimumSizeHint() const;
@@ -95,7 +93,7 @@ private:
     int squareHeight() { return contentsRect().height() / BoardHeight; }
 
     QTimer *timer;
-    QPointer<QLabel> nextPieceLabel;
+    QPointer<QLabel> nextPieceLbl;
     QImage image;
 };