diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-01-31 11:22:08 +1000 |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2012-01-31 06:33:34 +0100 |
| commit | dbf35e498db723ae9850686e462ec4f45bc7b67c (patch) | |
| tree | cf1f98717e131f26e5a6d63f6693935b2fbdb76f /tests/auto/declarative/qdeclarativeborderimage | |
| parent | 12a5ddf456ba8549645a8cb28a8b4ed6197a14da (diff) | |
Modify QtQuick1 to build in Qt5
Change-Id: I1c5ccaef420e8f119e761f50b969127f430df7ba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Diffstat (limited to 'tests/auto/declarative/qdeclarativeborderimage')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro | 7 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro index c5b1bfa1..96bbc7c2 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro +++ b/tests/auto/declarative/qdeclarativeborderimage/qdeclarativeborderimage.pro @@ -1,5 +1,8 @@ -load(qttest_p4) -contains(QT_CONFIG,declarative): QT += declarative gui network +CONFIG += testcase +TARGET = tst_qdeclarativeborderimage + +QT += testlib +contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets network macx:CONFIG -= app_bundle HEADERS += ../shared/testhttpserver.h diff --git a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp index e8ebc34e..1658f8a6 100644 --- a/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp +++ b/tests/auto/declarative/qdeclarativeborderimage/tst_qdeclarativeborderimage.cpp @@ -46,16 +46,15 @@ #include <QGraphicsScene> #include <QPainter> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> +#include <QtQuick1/qdeclarativeengine.h> +#include <QtQuick1/qdeclarativecomponent.h> #include <private/qdeclarativeborderimage_p.h> #include <private/qdeclarativeimagebase_p.h> #include <private/qdeclarativescalegrid_p_p.h> #include <private/qdeclarativeloader_p.h> -#include <QtDeclarative/qdeclarativecontext.h> +#include <QtQuick1/qdeclarativecontext.h> #include "../shared/testhttpserver.h" -#include "../../../shared/util.h" #ifdef Q_OS_SYMBIAN // In Symbian OS test data is located in applications private dir @@ -249,6 +248,7 @@ void tst_qdeclarativeborderimage::mirror() p_screenshot.fillRect(QRect(0, 0, width, height), Qt::white); scene.render(&p_screenshot, QRect(0, 0, width, height), QRect(0, 0, width, height)); + QEXPECT_FAIL("", "QTBUG-19538", Continue); QCOMPARE(screenshot, expected); delete obj; |