Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
	qmake/generators/win32/msbuild_objectmodel.cpp
	src/declarative/qml/qdeclarativexmlhttprequest.cpp
	src/opengl/opengl.pro
	src/opengl/qgl_p.h
	src/plugins/bearer/connman/qconnmanservice_linux.cpp
	tests/auto/qpainter/tst_qpainter.cpp
	tools/assistant/tools/assistant/helpviewer_qwv.h
	tools/assistant/tools/assistant/openpageswidget.h

1 files changed, 0 insertions, 65 deletions

diff --git a/tests/auto/qpainter/tst_qpainter.cpp b/tests/auto/qpainter/tst_qpainter.cpp
index 5003950ac7..1ba5859737 100644
--- a/tests/auto/qpainter/tst_qpainter.cpp
+++ b/tests/auto/qpainter/tst_qpainter.cpp
@@ -118,12 +118,10 @@ private slots:
     void drawLine_task190634();
     void drawLine_task229459();
     void drawLine_task234891();
-    void drawHorizontalLineF();
 
     void drawRect_data() { fillData(); }
     void drawRect();
     void drawRect2();
-    void drawRectFHorizontalLine();
 
     void fillRect();
     void fillRect2();
@@ -255,7 +253,6 @@ private slots:
     void setPenColorOnPixmap();
 
     void QTBUG5939_attachPainterPrivate();
-    void drawHorizontalLine();
 
 private:
     void fillData();
@@ -1223,26 +1220,6 @@ void tst_QPainter::drawLine_task234891()
     QCOMPARE(expected, img);
 }
 
-void tst_QPainter::drawHorizontalLineF()
-{
-    QPixmap pixmap(100, 3);
-    pixmap.fill();
-
-    {
-        QPainter painter(&pixmap);
-        painter.drawLine(QLineF(1.5f, 1.5f, 98.5f, 1.5f));
-    }
-
-    QImage refImage(100, 3, QImage::Format_ARGB32);
-    refImage.fill(0xFFFFFFFF);
-    {
-        QPainter painter(&refImage);
-        painter.drawLine(QLineF(1.5f, 1.5f, 98.5f, 1.5f));
-    }
-
-    QCOMPARE(pixmap.toImage().convertToFormat(QImage::Format_ARGB32), refImage);
-}
-
 void tst_QPainter::drawLine_task216948()
 {
     QImage img(1, 10, QImage::Format_ARGB32_Premultiplied);
@@ -1327,26 +1304,6 @@ void tst_QPainter::drawRect2()
     }
 }
 
-void tst_QPainter::drawRectFHorizontalLine()
-{
-    QPixmap pixmap(100, 3);
-    pixmap.fill();
-
-    {
-        QPainter painter(&pixmap);
-        painter.drawRect(QRectF(1.5f, 1.5f, 98.5f, 1.5f));
-    }
-
-    QImage refImage(100, 3, QImage::Format_ARGB32);
-    refImage.fill(0xFFFFFFFF);
-    {
-        QPainter painter(&refImage);
-        painter.drawRect(QRectF(1.5f, 1.5f, 98.5f, 1.5f));
-    }
-
-    QCOMPARE(pixmap.toImage().convertToFormat(QImage::Format_ARGB32), refImage);
-}
-
 void tst_QPainter::fillRect()
 {
     QImage image(100, 100, QImage::Format_ARGB32_Premultiplied);
@@ -4605,28 +4562,6 @@ void tst_QPainter::clipBoundingRect()
 
 }
 
-void tst_QPainter::drawHorizontalLine()
-{
-    QPixmap pixmap(100, 3);
-    pixmap.fill();
-
-    {
-        QPainter painter(&pixmap);
-        painter.translate(0.3, 0.3);
-        painter.drawLine(QLine(1, 1, 99, 1));
-    }
-
-    QImage refImage(100, 3, QImage::Format_ARGB32);
-    refImage.fill(0xFFFFFFFF);
-    {
-        QPainter painter(&refImage);
-        painter.translate(0.3, 0.3);
-        painter.drawLine(QLine(1, 1, 99, 1));
-    }
-
-    QCOMPARE(pixmap.toImage().convertToFormat(QImage::Format_ARGB32), refImage);
-}
-
 QTEST_MAIN(tst_QPainter)
 
 #include "tst_qpainter.moc"