Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / tests / auto / qtquick2 / qquickpathview / tst_qquickpathview.cpp

diff --git a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
index 8e602c7..2a4e1be 100644 (file)
--- a/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
+++ b/tests/auto/qtquick2/qquickpathview/tst_qquickpathview.cpp
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
 ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the test suite of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -1194,10 +1194,6 @@ void tst_QQuickPathView::pathUpdateOnStartChanged()
 
 void tst_QQuickPathView::package()
 {
-#ifdef Q_OS_MAC
-    QSKIP("QTBUG-23482");
-#endif
-
     QQuickView *canvas = createView();
     QVERIFY(canvas);
     canvas->setSource(testFileUrl("pathview_package.qml"));
@@ -1207,6 +1203,10 @@ void tst_QQuickPathView::package()
     QQuickPathView *pathView = canvas->rootObject()->findChild<QQuickPathView*>("photoPathView");
     QVERIFY(pathView);
 
+#ifdef Q_OS_MAC
+    QSKIP("QTBUG-21590 view does not reliably receive polish without a running animation");
+#endif
+
     QQuickItem *item = findItem<QQuickItem>(pathView, "pathItem");
     QVERIFY(item);
     QVERIFY(item->scale() != 1.0);
@@ -1288,17 +1288,16 @@ void tst_QQuickPathView::visualDataModel()
 
 void tst_QQuickPathView::undefinedPath()
 {
-#ifdef Q_OS_MAC
-    QSKIP("QTBUG-23482");
-#endif
-
     QDeclarativeEngine engine;
 
-    QString warning1("QPainterPath::moveTo: Adding point where x or y is NaN or Inf, ignoring call");
-    QTest::ignoreMessage(QtWarningMsg,qPrintable(warning1));
+    // QPainterPath warnings are only received if QT_NO_DEBUG is not defined
+    if (QLibraryInfo::isDebugBuild()) {
+        QString warning1("QPainterPath::moveTo: Adding point where x or y is NaN or Inf, ignoring call");
+        QTest::ignoreMessage(QtWarningMsg,qPrintable(warning1));
 
-    QString warning2("QPainterPath::lineTo: Adding point where x or y is NaN or Inf, ignoring call");
-    QTest::ignoreMessage(QtWarningMsg,qPrintable(warning2));
+        QString warning2("QPainterPath::lineTo: Adding point where x or y is NaN or Inf, ignoring call");
+        QTest::ignoreMessage(QtWarningMsg,qPrintable(warning2));
+    }
 
     QDeclarativeComponent c(&engine, testFileUrl("undefinedpath.qml"));
 
@@ -1329,11 +1328,11 @@ void tst_QQuickPathView::mouseDrag()
 
     {
         QMouseEvent mv(QEvent::MouseMove, QPoint(30,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
+        QGuiApplication::sendEvent(canvas, &mv);
     }
     {
         QMouseEvent mv(QEvent::MouseMove, QPoint(90,100), Qt::LeftButton, Qt::LeftButton,Qt::NoModifier);
-        QApplication::sendEvent(canvas, &mv);
+        QGuiApplication::sendEvent(canvas, &mv);
     }
 
     QVERIFY(pathview->currentIndex() != current);