Make QPen default to 1-width non-cosmetic.

[profile/ivi/qtbase.git] / tests / auto / gui / painting / qpathclipper / tst_qpathclipper.cpp

diff --git a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
index 57a56b2..4172076 100644 (file)
--- a/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
+++ b/tests/auto/gui/painting/qpathclipper/tst_qpathclipper.cpp
@@ -1,38 +1,38 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
 ** GNU Lesser General Public License Usage
-** This file may be used under the terms of the GNU Lesser General Public
-** License version 2.1 as published by the Free Software Foundation and
-** appearing in the file LICENSE.LGPL included in the packaging of this
-** file. Please review the following information to ensure the GNU Lesser
-** General Public License version 2.1 requirements will be met:
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain additional
-** rights. These rights are described in the Nokia Qt LGPL Exception
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU General
-** Public License version 3.0 as published by the Free Software Foundation
-** and appearing in the file LICENSE.GPL included in the packaging of this
-** file. Please review the following information to ensure the GNU General
-** Public License version 3.0 requirements will be met:
-** http://www.gnu.org/copyleft/gpl.html.
-**
-** Other Usage
-** Alternatively, this file may be used in accordance with the terms and
-** conditions contained in a signed written agreement between you and Nokia.
-**
-**
-**
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
 **
 **
 ** $QT_END_LICENSE$
@@ -421,7 +421,7 @@ void tst_QPathClipper::testComparePaths()
 void tst_QPathClipper::clip()
 {
     if (sizeof(double) != sizeof(qreal)) {
-        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
+        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
     }
     QFETCH( QPainterPath, subject );
     QFETCH( QPainterPath, clip );
@@ -470,9 +470,9 @@ void tst_QPathClipper::clipTest(int subjectIndex, int clipIndex, QPathClipper::O
     p.setRenderHint(QPainter::Antialiasing);
     p.scale(scale, scale);
     p.translate(-bounds.topLeft());
-    p.setPen(Qt::black);
+    p.setPen(QPen(Qt::black, 0));
     p.drawPath(subject);
-    p.setPen(Qt::red);
+    p.setPen(QPen(Qt::red, 0));
     p.drawPath(clip);
     p.end();
 
@@ -513,27 +513,6 @@ void tst_QPathClipper::clipTest(int subjectIndex, int clipIndex, QPathClipper::O
                  op == QPathClipper::BoolOr ? "or" : "sub";
             sprintf(str, "Expected: %d, actual: %d, subject: %d, clip: %d, op: %s\n",
                      int(expected), int(inResult), subjectIndex, clipIndex, opStr);
-
-            // debugging
-#if 0
-            QRect rect = bounds.toAlignedRect();
-
-            QPainter p(&img);
-            p.scale(scale, scale);
-            p.translate(-bounds.topLeft());
-
-            p.setPen(Qt::NoPen);
-            p.setBrush(QColor(0x700ff00));
-            p.drawPath(result);
-
-            p.setPen(Qt::blue);
-            p.drawPoint(point);
-            p.end();
-
-            char str2[256];
-            sprintf(str2, "fail-%d-%d-%s.png", subjectIndex, clipIndex, opStr);
-            img.save(str2);
-#endif
             QFAIL(str);
         }
     }
@@ -542,7 +521,7 @@ void tst_QPathClipper::clipTest(int subjectIndex, int clipIndex, QPathClipper::O
 void tst_QPathClipper::clip2()
 {
     if (sizeof(double) != sizeof(qreal))
-        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
+        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
 
     int operation = 0;
 
@@ -1301,7 +1280,7 @@ void tst_QPathClipper::task251909()
 void tst_QPathClipper::qtbug3778()
 {
     if (sizeof(double) != sizeof(qreal)) {
-        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors", SkipAll);
+        QSKIP("This test only works for qreal=double, otherwise ends in rounding errors");
     }
     QPainterPath path1;
     path1.moveTo(200, 3.22409e-5);
@@ -1328,7 +1307,7 @@ void tst_QPathClipper::qtbug3778()
     QVERIFY(p12.contains(QPointF(100, 100)));
 }
 
-QTEST_APPLESS_MAIN(tst_QPathClipper)
+QTEST_MAIN(tst_QPathClipper)
 
 
 #include "tst_qpathclipper.moc"