diff options
author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-03-15 15:41:07 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-03-18 17:32:44 +0100 |
commit | 990ef350f429d7e8931063bc0837b84a92a8d7e5 (patch) | |
tree | e2353dc7d123e041569d77cd06e899234658b221 /tests/manual | |
parent | 4f79c5a15b1d9c73bac12fa7a6f4987a76a5ac26 (diff) |
turn tests/manual/link_staticlib into autotest
Fix following.
Change-Id: Id97db271cde3e5a949b14eb2b4e6a1137f3c5c24
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/link_staticlib/helper/helper.cpp | 35 | ||||
-rw-r--r-- | tests/manual/link_staticlib/helper/helper.h | 35 | ||||
-rw-r--r-- | tests/manual/link_staticlib/link_staticlib.qbs | 31 | ||||
-rw-r--r-- | tests/manual/link_staticlib/main.cpp | 38 | ||||
-rw-r--r-- | tests/manual/link_staticlib/mystaticlib.cpp | 38 | ||||
-rw-r--r-- | tests/manual/link_staticlib/mystaticlibhelper.cpp | 5 |
6 files changed, 0 insertions, 182 deletions
diff --git a/tests/manual/link_staticlib/helper/helper.cpp b/tests/manual/link_staticlib/helper/helper.cpp deleted file mode 100644 index 775d00d10..000000000 --- a/tests/manual/link_staticlib/helper/helper.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** 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 "helper.h" - -int getSomeNumber() -{ - return 156; -} - diff --git a/tests/manual/link_staticlib/helper/helper.h b/tests/manual/link_staticlib/helper/helper.h deleted file mode 100644 index 470b164fe..000000000 --- a/tests/manual/link_staticlib/helper/helper.h +++ /dev/null @@ -1,35 +0,0 @@ -/**************************************************************************** -** -** 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 HELPER_H -#define HELPER_H - -extern int getSomeNumber(); - -#endif - diff --git a/tests/manual/link_staticlib/link_staticlib.qbs b/tests/manual/link_staticlib/link_staticlib.qbs deleted file mode 100644 index e1d6ef241..000000000 --- a/tests/manual/link_staticlib/link_staticlib.qbs +++ /dev/null @@ -1,31 +0,0 @@ -import qbs 1.0 - -Project { - Application { - name: "HelloWorld" - files : [ "main.cpp" ] - Depends { name: "cpp" } - Depends { name: "mystaticlib" } - } - - StaticLibrary { - name : "mystaticlib" - files : [ "mystaticlib.cpp" ] - Depends { name: "cpp" } - Depends { name: "helperlib" } - } - - StaticLibrary { - name : "helperlib" - files : [ - "helper/helper.h", - "helper/helper.cpp" - ] - Depends { name: "cpp" } - ProductModule { - Depends { name: "cpp" } - cpp.includePaths: ['helper'] - } - } -} - diff --git a/tests/manual/link_staticlib/main.cpp b/tests/manual/link_staticlib/main.cpp deleted file mode 100644 index 7599d4c44..000000000 --- a/tests/manual/link_staticlib/main.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** 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 <stdio.h> - -int bla(); - -int main() -{ - return bla(); -} - diff --git a/tests/manual/link_staticlib/mystaticlib.cpp b/tests/manual/link_staticlib/mystaticlib.cpp deleted file mode 100644 index 299966d74..000000000 --- a/tests/manual/link_staticlib/mystaticlib.cpp +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** 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 <stdio.h> -#include <helper.h> - -int bla() -{ - int n = getSomeNumber(); - printf("Hello World! The magic number is %d.", n); - return n; -} diff --git a/tests/manual/link_staticlib/mystaticlibhelper.cpp b/tests/manual/link_staticlib/mystaticlibhelper.cpp deleted file mode 100644 index 76a6a38e9..000000000 --- a/tests/manual/link_staticlib/mystaticlibhelper.cpp +++ /dev/null @@ -1,5 +0,0 @@ -int helper_function() -{ - return 156; -} - |