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: (374 commits)
  Add a test for the QPen::brush() != Qt::NoBrush for a Qt::NoPen pen.
  Calling QPen::brush() on a Qt::NoPen pen, should return QBrush::NoBrush.
  use QFile:map instead of ::mmap
  Do not use global static const references to objects
  Revert "Refactor blend_transformed_bilinear to simplify the blend type checking"
  Don't rely on mapFromGlobal in QGraphicsScenePrivate::itemsAtPosition.
  Refactor blend_transformed_bilinear to simplify the blend type checking
  Note RTL behavior changes in docs and changelog
  Implement qt_memfill32 with Neon.
  Implement the composition mode Plus with Neon.
  Fix the broken unicode detection of ODBC driver.
  Doc: Fixed qdoc warnings.
  Doc: updating getting started docs - not finished
  Make it possible again to build Qt without webkit
  Doc: fixing creator bugs, removing menus and textbox in the header
  Fixing qdoc index file...Commit hack to work around the massive amounts of dependencies in the upstream branch.
  Doc: Fixing overlapping text in header list
  Use Ctrl rather than Alt for switching tabs in the demo browser
  Doc: add link to new gettings started to index.html
  Doc: Fixing bug involving header misplacement in Creator style
  ...

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/qpen/tst_qpen.cpp b/tests/auto/qpen/tst_qpen.cpp
index 149f462..6ca4e13 100644
--- a/tests/auto/qpen/tst_qpen.cpp
+++ b/tests/auto/qpen/tst_qpen.cpp
@@ -67,6 +67,7 @@ private slots:
 
     void constructor();
     void constructor_data();
+    void noPenNoBrush();
 };
 
 // Testing get/set functions
@@ -213,6 +214,12 @@ void tst_QPen::stream()
     QCOMPARE(pen, cmp);
 }
 
+void tst_QPen::noPenNoBrush()
+{
+    QPen pen;
+    pen.setStyle(Qt::NoPen);
+    QVERIFY(pen.brush().style() == Qt::NoBrush);
+}
 
 QTEST_APPLESS_MAIN(tst_QPen)
 #include "tst_qpen.moc"