diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:49:21 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:50:15 +0200 |
| commit | 862f941bdc02f104e3aecc756a003f1c1f9f5112 (patch) | |
| tree | 3ad5342cc2806d4dd51b88f26a9ff9e6eb30e63e /tests/auto/declarative/qdeclarativerepeater | |
| parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
| parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) | |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'tests/auto/declarative/qdeclarativerepeater')
| -rw-r--r-- | tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro | 3 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro index 9cb17a57..7e233023 100644 --- a/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro +++ b/tests/auto/declarative/qdeclarativerepeater/qdeclarativerepeater.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativerepeater -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private gui widgets +QT += testlib declarative declarative-private gui widgets macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativerepeater.cpp diff --git a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp index d4fb9e37..10d2bad6 100644 --- a/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp +++ b/tests/auto/declarative/qdeclarativerepeater/tst_qdeclarativerepeater.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 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. |