From e7c740cee32e22621324f94589cee12c69f2b99a Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Mon, 25 Sep 2017 09:47:00 +0200 Subject: Remove old precompiled header test data This was forgotten in commit 0655ccbe. Change-Id: I2319193e4fecb7576d3eb8b2256a9d3708791225 Reviewed-by: Christian Kandeler --- .../auto/api/testdata/precompiled-header/main.cpp | 55 ---------------------- .../api/testdata/precompiled-header/myobject.cpp | 41 ---------------- .../api/testdata/precompiled-header/myobject.h | 43 ----------------- .../precompiled-header/precompiled-header.qbs | 15 ------ .../auto/api/testdata/precompiled-header/stable.h | 37 --------------- 5 files changed, 191 deletions(-) delete mode 100644 tests/auto/api/testdata/precompiled-header/main.cpp delete mode 100644 tests/auto/api/testdata/precompiled-header/myobject.cpp delete mode 100644 tests/auto/api/testdata/precompiled-header/myobject.h delete mode 100644 tests/auto/api/testdata/precompiled-header/precompiled-header.qbs delete mode 100644 tests/auto/api/testdata/precompiled-header/stable.h diff --git a/tests/auto/api/testdata/precompiled-header/main.cpp b/tests/auto/api/testdata/precompiled-header/main.cpp deleted file mode 100644 index b719b42e3..000000000 --- a/tests/auto/api/testdata/precompiled-header/main.cpp +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qbs. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "myobject.h" -#include -#include -#include - -using namespace std; - -int main() -{ - MyObject obj; - list lst; - lst.push_back(1); - lst.push_back(2); - lst.push_back(3); - lst.push_back(4); - lst.push_back(5); - lst.push_back(6); - lst.push_back(7); - lst.push_back(8); - lst.push_back(9); - reverse(lst.begin(), lst.end()); - for (list::iterator it=lst.begin(); it != lst.end(); ++it) - cout << *it << ", "; - cout << endl; - return 0; -} - diff --git a/tests/auto/api/testdata/precompiled-header/myobject.cpp b/tests/auto/api/testdata/precompiled-header/myobject.cpp deleted file mode 100644 index 018b91e9d..000000000 --- a/tests/auto/api/testdata/precompiled-header/myobject.cpp +++ /dev/null @@ -1,41 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qbs. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include "myobject.h" - -MyObject::MyObject() -{ - std::cout << "MyObject::MyObject()\n"; -} - -MyObject::~MyObject() -{ - std::cout << "MyObject::~MyObject()" << std::endl; -} - diff --git a/tests/auto/api/testdata/precompiled-header/myobject.h b/tests/auto/api/testdata/precompiled-header/myobject.h deleted file mode 100644 index a84536002..000000000 --- a/tests/auto/api/testdata/precompiled-header/myobject.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qbs. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef MYOBJECT_H -#define MYOBJECT_H - -#include - -class MyObject : public QObject -{ - Q_OBJECT -public: - MyObject(); - ~MyObject(); -}; - -#endif - diff --git a/tests/auto/api/testdata/precompiled-header/precompiled-header.qbs b/tests/auto/api/testdata/precompiled-header/precompiled-header.qbs deleted file mode 100644 index 5f7b4b616..000000000 --- a/tests/auto/api/testdata/precompiled-header/precompiled-header.qbs +++ /dev/null @@ -1,15 +0,0 @@ -import qbs 1.0 - -Product { - type: "application" - consoleApplication: true - name: "MyApp" - files: ["stable.h", - "myobject.h", - "main.cpp", - "myobject.cpp"] - Depends { name: "cpp" } - cpp.precompiledHeader: "stable.h" - Depends { name: "Qt.core" } -} - diff --git a/tests/auto/api/testdata/precompiled-header/stable.h b/tests/auto/api/testdata/precompiled-header/stable.h deleted file mode 100644 index d9a6222dd..000000000 --- a/tests/auto/api/testdata/precompiled-header/stable.h +++ /dev/null @@ -1,37 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qbs. -** -** $QT_BEGIN_LICENSE:GPL-EXCEPT$ -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/* Add C includes here */ - -#if defined __cplusplus -/* Add C++ includes here */ - -# include -# include -#endif - -- cgit v1.2.3