diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-24 15:32:08 +0200 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-24 17:59:48 +0200 |
commit | d0eafa6d03f3b0b54d05902507bf5883c0892ce5 (patch) | |
tree | 1d72339aa58374b3882b875576aea90a248dcf12 /tests/auto/blackbox/testdata/link_staticlib/helper1 | |
parent | efa32a229a8c0f85aa25a10a2a5c6f9e39ba66d2 (diff) |
enhance link_staticlib test for QBS-294
Fix follows.
Change-Id: I79e34e460710c3ea17bef397eace6b65d004d0e9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/auto/blackbox/testdata/link_staticlib/helper1')
-rw-r--r-- | tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.cpp | 36 | ||||
-rw-r--r-- | tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.h | 35 |
2 files changed, 71 insertions, 0 deletions
diff --git a/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.cpp b/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.cpp new file mode 100644 index 000000000..69a52e3c9 --- /dev/null +++ b/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.cpp @@ -0,0 +1,36 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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. +** +****************************************************************************/ +#include "helper1.h" +#include <helper2.h> + +int getSomeNumber() +{ + return 12 * getOddNumber(); +} + diff --git a/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.h b/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.h new file mode 100644 index 000000000..6af7f8dd3 --- /dev/null +++ b/tests/auto/blackbox/testdata/link_staticlib/helper1/helper1.h @@ -0,0 +1,35 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Build Suite. +** +** 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. +** +****************************************************************************/ +#ifndef HELPER1_H +#define HELPER1_H + +extern int getSomeNumber(); + +#endif + |