diff options
author | Jo Asplin <jo.asplin@nokia.com> | 2011-09-12 09:21:12 +0200 |
---|---|---|
committer | Jo Asplin <jo.asplin@nokia.com> | 2011-09-12 10:08:29 +0200 |
commit | 4c43b60323e88befb08504c1ec67305cc8f57e70 (patch) | |
tree | f63216a07d69701e791839d7a9938337792eaf73 /tests/auto/tools/qmake/testdata/simple_dll | |
parent | 3ade4d260f3afe160bd593e27e18f1dffdbee398 (diff) |
Moved autotests in category 'tools' into new directory structure
Task-number: QTBUG-21355
Change-Id: I315d4b1f55d42391524c0e8625952dee1b96fca3
Reviewed-on: http://codereview.qt-project.org/4449
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/tools/qmake/testdata/simple_dll')
-rw-r--r-- | tests/auto/tools/qmake/testdata/simple_dll/simple.cpp | 56 | ||||
-rw-r--r-- | tests/auto/tools/qmake/testdata/simple_dll/simple.h | 59 | ||||
-rw-r--r-- | tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro | 19 |
3 files changed, 134 insertions, 0 deletions
diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple.cpp b/tests/auto/tools/qmake/testdata/simple_dll/simple.cpp new file mode 100644 index 0000000000..539725eb0b --- /dev/null +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple.cpp @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include "simple.h" + +Simple::Simple() +{ +} + +Simple::~Simple() +{ +} + +QString Simple::test() +{ + return "This is a test"; +} diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple.h b/tests/auto/tools/qmake/testdata/simple_dll/simple.h new file mode 100644 index 0000000000..1a76482985 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple.h @@ -0,0 +1,59 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ +#ifndef SIMPLE_H +#define SIMPLE_H + +#include <qstring.h> + +//class SIMPLEDLL_EXPORT Simple +class Simple +{ +public: + Simple(); + ~Simple(); + + QString test(); +}; + +#endif + + + diff --git a/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro new file mode 100644 index 0000000000..9af38ecce6 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/simple_dll/simple_dll.pro @@ -0,0 +1,19 @@ +TEMPLATE = lib +CONFIG += qt warn_on dll + +win32:DEFINES += SIMPLEDLL_MAKEDLL + +HEADERS = simple.h +SOURCES = simple.cpp + +VERSION = 1.0.0 +INCLUDEPATH += . tmp +MOC_DIR = tmp +OBJECTS_DIR = tmp +TARGET = simple_dll +DESTDIR = ./ + +infile($(QTDIR)/.qmake.cache, CONFIG, debug):CONFIG += debug +infile($(QTDIR)/.qmake.cache, CONFIG, release):CONFIG += release + + |