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/qdeclarativedebugobservermode | |
parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'tests/auto/declarative/qdeclarativedebugobservermode')
3 files changed, 3 insertions, 4 deletions
diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp b/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp index 7769e3ac..e4fa2c68 100644 --- a/tests/auto/declarative/qdeclarativedebugobservermode/app/main.cpp +++ b/tests/auto/declarative/qdeclarativedebugobservermode/app/main.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. diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.cpp b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.cpp index ef2a492e..83c2f21a 100644 --- a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.cpp +++ b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.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. diff --git a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro index 008708be..a28aefdb 100644 --- a/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro +++ b/tests/auto/declarative/qdeclarativedebugobservermode/tst_qdeclarativedebugobservermode.pro @@ -1,8 +1,7 @@ CONFIG += testcase TARGET = tst_qdeclarativedebugobservermode -QT += testlib -contains(QT_CONFIG,declarative): QT += declarative declarative-private network script core-private gui-private widgets-private +QT += testlib declarative declarative-private network script core-private gui-private widgets-private macx:CONFIG -= app_bundle HEADERS += ../shared/debugutil_p.h |