From bcaa8575352ad16e1f6020436e1a3f450eefd53e Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 6 Aug 2013 15:11:37 +0200 Subject: fix strings from #included sources not being collected Task-number: QTBUG-27974 Change-Id: I30edae2db5449605984a118458b1ccce7ad67eb1 Reviewed-by: hjk Reviewed-by: Oswald Buddenhagen --- .../lupdate/testdata/good/parsecpp/included.cpp | 42 ++++++++++++++++++++++ .../lupdate/testdata/good/parsecpp/main.cpp | 5 +++ .../testdata/good/parsecpp/project.ts.result | 5 +++ 3 files changed, 52 insertions(+) create mode 100644 tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp (limited to 'tests/auto') diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp new file mode 100644 index 000000000..a6b1a1826 --- /dev/null +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/included.cpp @@ -0,0 +1,42 @@ +/**************************************************************************** +** +** 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. +** +** $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 +** 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, 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +QObject::tr("message from #included .cpp file"); diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp index bbd29e3b5..54781ba9f 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/main.cpp @@ -394,3 +394,8 @@ Class42::Class42() : Class42::hello(int something /*= 17 */, QString str = Class42::tr("eyo")) { } + + + +// QTBUG-27974: strings from included sources are not collected +#include "included.cpp" diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result index 83eb95eba..db908d987 100644 --- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/project.ts.result @@ -251,6 +251,11 @@ backslashed \ stuff. just QObject + + + message from #included .cpp file + + QTranslator -- cgit v1.2.1