summaryrefslogtreecommitdiff
path: root/tests/manual
diff options
context:
space:
mode:
authorChristian Kandeler <christian.kandeler@digia.com>2013-10-30 18:22:21 +0100
committerChristian Kandeler <christian.kandeler@digia.com>2013-10-31 17:48:47 +0100
commit7f0cc84396dd3d729200d3c99aae6358b9ed647e (patch)
tree51db9c6c8c48e8a9af073afc0f3e679518910c01 /tests/manual
parent4cdb21ade421b4635d49a0f0d7b72118532b6ef6 (diff)
downloadqbs-7f0cc84396dd3d729200d3c99aae6358b9ed647e.tar.gz
Clean up manual tests.
Turn some manual tests that add coverage of a feature into autotests. Turn some manual tests that demonstrate a feature into examples. Remove some manual tests that do neither. Change-Id: Ie54005e1ba5aad07319eb864cc5ad70e26308080 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/genmoc_cpp/bla.txt15
-rw-r--r--tests/manual/genmoc_cpp/moc_cpp.qbs41
-rw-r--r--tests/manual/lib_subdir/app/app.qbs10
-rw-r--r--tests/manual/lib_subdir/app/main.cpp36
-rw-r--r--tests/manual/lib_subdir/lib/lib.cpp40
-rw-r--r--tests/manual/lib_subdir/lib/lib.qbs10
-rw-r--r--tests/manual/lib_subdir/lib_subdir.qbs8
-rw-r--r--tests/manual/objc/main.mm14
-rw-r--r--tests/manual/objc/objc.qbs10
-rw-r--r--tests/manual/productmoduledeps/lib1.cpp44
-rw-r--r--tests/manual/productmoduledeps/main.cpp47
-rw-r--r--tests/manual/productmoduledeps/productmoduledeps.qbs45
-rw-r--r--tests/manual/qrc2/bla.cpp32
-rw-r--r--tests/manual/qrc2/bla.qrc5
-rw-r--r--tests/manual/qrc2/foo.qrc5
-rw-r--r--tests/manual/qrc2/i.qbs19
-rw-r--r--tests/manual/qrc2/stuff.txt1
-rw-r--r--tests/manual/rc/main.cpp33
-rw-r--r--tests/manual/rc/rc.qbs14
-rw-r--r--tests/manual/rc/test.rc22
20 files changed, 0 insertions, 451 deletions
diff --git a/tests/manual/genmoc_cpp/bla.txt b/tests/manual/genmoc_cpp/bla.txt
deleted file mode 100644
index 26185684a..000000000
--- a/tests/manual/genmoc_cpp/bla.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <QObject>
-
-class MyObject : public QObject
-{
- Q_OBJECT
-};
-
-int main()
-{
- MyObject obj;
- return 0;
-}
-
-#include "bla.moc"
-
diff --git a/tests/manual/genmoc_cpp/moc_cpp.qbs b/tests/manual/genmoc_cpp/moc_cpp.qbs
deleted file mode 100644
index 681a93f28..000000000
--- a/tests/manual/genmoc_cpp/moc_cpp.qbs
+++ /dev/null
@@ -1,41 +0,0 @@
-import qbs 1.0
-import qbs.TextFile
-import qbs.FileInfo
-
-Project {
- Product {
- type: "application"
- name: "moc_cpp"
-
- Depends {
- name: "Qt.core"
- }
-
- Group {
- files: 'bla.txt'
- fileTags: ['text']
- }
- }
-
- Rule {
- inputs: ['text']
- Artifact {
- fileTags: ['cpp', 'moc_cpp']
- fileName: input.baseName + '.cpp'
- }
- prepare: {
- var cmd = new JavaScriptCommand();
- cmd.sourceCode = function () {
- var file = new TextFile(input.fileName, TextFile.ReadOnly);
- var text = file.readAll();
- file = new TextFile(output.fileName, TextFile.WriteOnly);
- file.truncate();
- file.write(text);
- file.close();
- }
- cmd.description = 'generating ' + FileInfo.fileName(output.fileName);
- cmd.highlight = 'codegen';
- return cmd;
- }
- }
-}
diff --git a/tests/manual/lib_subdir/app/app.qbs b/tests/manual/lib_subdir/app/app.qbs
deleted file mode 100644
index b4e5bf529..000000000
--- a/tests/manual/lib_subdir/app/app.qbs
+++ /dev/null
@@ -1,10 +0,0 @@
-import qbs 1.0
-
-Product {
- type: "application"
- name : "HelloWorld"
- files : [ "main.cpp" ]
- Depends { name: "cpp" }
- Depends { name: "lol" }
-}
-
diff --git a/tests/manual/lib_subdir/app/main.cpp b/tests/manual/lib_subdir/app/main.cpp
deleted file mode 100644
index e7d24bdc3..000000000
--- a/tests/manual/lib_subdir/app/main.cpp
+++ /dev/null
@@ -1,36 +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/lib_subdir/lib/lib.cpp b/tests/manual/lib_subdir/lib/lib.cpp
deleted file mode 100644
index 01c397614..000000000
--- a/tests/manual/lib_subdir/lib/lib.cpp
+++ /dev/null
@@ -1,40 +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>
-
-#ifndef CRUCIAL_DEFINE
-# error CRUCIAL_DEFINE not defined
-#endif
-
-int bla()
-{
- puts("Hello WOrld!");
- return 2;
-}
diff --git a/tests/manual/lib_subdir/lib/lib.qbs b/tests/manual/lib_subdir/lib/lib.qbs
deleted file mode 100644
index 036746692..000000000
--- a/tests/manual/lib_subdir/lib/lib.qbs
+++ /dev/null
@@ -1,10 +0,0 @@
-import qbs 1.0
-
-Product {
- type: "staticlibrary"
- name: "lol"
- files: [ "lib.cpp" ]
- cpp.defines: ['CRUCIAL_DEFINE']
- Depends { name: 'cpp' }
-}
-
diff --git a/tests/manual/lib_subdir/lib_subdir.qbs b/tests/manual/lib_subdir/lib_subdir.qbs
deleted file mode 100644
index 56edf28a4..000000000
--- a/tests/manual/lib_subdir/lib_subdir.qbs
+++ /dev/null
@@ -1,8 +0,0 @@
-import qbs 1.0
-Project {
- references: [
- "app/app.qbs",
- "lib/lib.qbs"
- ]
-}
-
diff --git a/tests/manual/objc/main.mm b/tests/manual/objc/main.mm
deleted file mode 100644
index 49b4f3915..000000000
--- a/tests/manual/objc/main.mm
+++ /dev/null
@@ -1,14 +0,0 @@
-#import <Foundation/Foundation.h>
-#include <QCoreApplication>
-
-int main(int argc, char **argv)
-{
- // We support both C++
- QCoreApplication app(argc, argv);
- Q_UNUSED(app);
- // And Objective-C
- NSDictionary *version = [NSDictionary dictionaryWithContentsOfFile:@"/System/Library/CoreServices/SystemVersion.plist"];
- NSString *productVersion = [version objectForKey:@"ProductVersion"];
- NSLog(@"Hello, OS X %@!", productVersion);
- // So it's Objective-C++
-}
diff --git a/tests/manual/objc/objc.qbs b/tests/manual/objc/objc.qbs
deleted file mode 100644
index b878097c4..000000000
--- a/tests/manual/objc/objc.qbs
+++ /dev/null
@@ -1,10 +0,0 @@
-import qbs 1.0
-
-Project {
- CppApplication {
- condition: qbs.targetOS.contains("osx")
- Depends { name: "Qt.core" }
- files: "main.mm"
- cpp.frameworks: [ "Foundation" ]
- }
-}
diff --git a/tests/manual/productmoduledeps/lib1.cpp b/tests/manual/productmoduledeps/lib1.cpp
deleted file mode 100644
index 2760a9170..000000000
--- a/tests/manual/productmoduledeps/lib1.cpp
+++ /dev/null
@@ -1,44 +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>
-
-#if defined(_WIN32) || defined(WIN32)
-# define EXPORT __declspec(dllexport)
-# define IMPORT __declspec(dllimport)
-#else
-# define EXPORT
-# define IMPORT
-#endif
-
-EXPORT int lib1_hello()
-{
- puts("lib1 says hello!");
- return 0;
-}
diff --git a/tests/manual/productmoduledeps/main.cpp b/tests/manual/productmoduledeps/main.cpp
deleted file mode 100644
index b7ddf7215..000000000
--- a/tests/manual/productmoduledeps/main.cpp
+++ /dev/null
@@ -1,47 +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>
-
-#if defined(_WIN32) || defined(WIN32)
-# define EXPORT __declspec(dllexport)
-# define IMPORT __declspec(dllimport)
-#else
-# define EXPORT
-# define IMPORT
-#endif
-
-IMPORT int lib1_hello();
-
-int main()
-{
- puts("application says hello!");
- return lib1_hello();
-}
-
diff --git a/tests/manual/productmoduledeps/productmoduledeps.qbs b/tests/manual/productmoduledeps/productmoduledeps.qbs
deleted file mode 100644
index 1b665b880..000000000
--- a/tests/manual/productmoduledeps/productmoduledeps.qbs
+++ /dev/null
@@ -1,45 +0,0 @@
-import qbs 1.0
-
-Project {
- Application {
- name : "HelloWorld"
- destinationDirectory: "bin"
- Group {
- files : [ "main.cpp" ]
- }
- Depends { name: "cpp" }
- Depends { name: 'dummy' }
- }
-
- Product {
- name: 'dummy'
- Group {
- files: 'main.cpp'
- qbs.install: true
- }
- Export {
- Depends { name: 'dummy2' }
- }
- }
-
- Product {
- name: 'dummy2'
- Group {
- files: 'lib1.cpp'
- qbs.install: true
- }
- Export {
- Depends { name: 'lib1' }
- }
- }
-
- DynamicLibrary {
- name : "lib1"
- destinationDirectory: "bin"
- Group {
- files : [ "lib1.cpp" ]
- }
- Depends { name: "cpp" }
- }
-}
-
diff --git a/tests/manual/qrc2/bla.cpp b/tests/manual/qrc2/bla.cpp
deleted file mode 100644
index 17ba1b7a7..000000000
--- a/tests/manual/qrc2/bla.cpp
+++ /dev/null
@@ -1,32 +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.
-**
-****************************************************************************/
-
-int main(){
- return 3;
-}
diff --git a/tests/manual/qrc2/bla.qrc b/tests/manual/qrc2/bla.qrc
deleted file mode 100644
index f0a7168f5..000000000
--- a/tests/manual/qrc2/bla.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/bla">
- <file>stuff.txt</file>
- </qresource>
-</RCC>
diff --git a/tests/manual/qrc2/foo.qrc b/tests/manual/qrc2/foo.qrc
deleted file mode 100644
index a8acfc34a..000000000
--- a/tests/manual/qrc2/foo.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
- <qresource prefix="/foo">
- <file>stuff.txt</file>
- </qresource>
-</RCC>
diff --git a/tests/manual/qrc2/i.qbs b/tests/manual/qrc2/i.qbs
deleted file mode 100644
index e5c310773..000000000
--- a/tests/manual/qrc2/i.qbs
+++ /dev/null
@@ -1,19 +0,0 @@
-import qbs 1.0
-
-Project {
- Product {
- type: "application"
- name: "i"
-
- Depends {
- name: "Qt.core"
- }
-
- files: [
- "bla.cpp",
- "bla.qrc",
- "foo.qrc",
- "stuff.txt"
- ]
- }
-}
diff --git a/tests/manual/qrc2/stuff.txt b/tests/manual/qrc2/stuff.txt
deleted file mode 100644
index 78f0d32c6..000000000
--- a/tests/manual/qrc2/stuff.txt
+++ /dev/null
@@ -1 +0,0 @@
-a resource file
diff --git a/tests/manual/rc/main.cpp b/tests/manual/rc/main.cpp
deleted file mode 100644
index f5fab598e..000000000
--- a/tests/manual/rc/main.cpp
+++ /dev/null
@@ -1,33 +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.
-**
-****************************************************************************/
-
-int main()
-{
- return 0;
-}
diff --git a/tests/manual/rc/rc.qbs b/tests/manual/rc/rc.qbs
deleted file mode 100644
index 75502cf88..000000000
--- a/tests/manual/rc/rc.qbs
+++ /dev/null
@@ -1,14 +0,0 @@
-import qbs 1.0
-
-Application {
- type: "application"
- name: "rc"
-
- Depends { name: 'cpp' }
-
- files: [
- "main.cpp",
- "test.rc"
- ]
-}
-
diff --git a/tests/manual/rc/test.rc b/tests/manual/rc/test.rc
deleted file mode 100644
index a8e5fd39b..000000000
--- a/tests/manual/rc/test.rc
+++ /dev/null
@@ -1,22 +0,0 @@
-#define IDR_VERSION1 1
-
-IDR_VERSION1 VERSIONINFO
-FILEVERSION 1,0,0,0
-PRODUCTVERSION 1,0,0,0
-FILEOS 0x00000004
-FILETYPE 0x00000000
-BEGIN
- BLOCK "StringFileInfo"
- BEGIN
- BLOCK "FFFF0000"
- BEGIN
- VALUE "FileVersion", "1.0.0.0\0"
- VALUE "ProductVersion", "1.0.0.0\0"
- END
- END
- BLOCK "VarFileInfo"
- BEGIN
- VALUE "Translation", 0xFFFF, 0x0000
- END
-END
-