diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-15 17:35:38 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-15 17:37:59 +0200 |
| commit | 416ce875b2949d6a7d13f956298fc44832ed8205 (patch) | |
| tree | cbb848c24a4d45ba8239ceddaf1466df946b3670 /tests | |
| parent | 8d8a1e137604ae6e69aa7b052f15dcc1e1d4cc4b (diff) | |
| download | qbs-416ce875b2949d6a7d13f956298fc44832ed8205.tar.gz | |
Remove manual test "group tagger conflict".
It does not seem to do anything valuable.
Change-Id: Ib5e4fc5db9bfc755cbede96896534e6855f68810
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/groupTaggerConflict/src/bar.cpp | 12 | ||||
| -rw-r--r-- | tests/manual/groupTaggerConflict/src/bar_qt4.h | 12 | ||||
| -rw-r--r-- | tests/manual/groupTaggerConflict/src/bar_qt5.h | 12 | ||||
| -rw-r--r-- | tests/manual/groupTaggerConflict/test.qbs | 31 |
4 files changed, 0 insertions, 67 deletions
diff --git a/tests/manual/groupTaggerConflict/src/bar.cpp b/tests/manual/groupTaggerConflict/src/bar.cpp deleted file mode 100644 index 031040f41..000000000 --- a/tests/manual/groupTaggerConflict/src/bar.cpp +++ /dev/null @@ -1,12 +0,0 @@ -#include <qglobal.h> -#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) -#include "bar_qt5.h" -#else -#include "bar_qt4.h" -#endif - - -Bar::Bar(QObject *parent) : - QObject(parent) -{ -} diff --git a/tests/manual/groupTaggerConflict/src/bar_qt4.h b/tests/manual/groupTaggerConflict/src/bar_qt4.h deleted file mode 100644 index 13c342937..000000000 --- a/tests/manual/groupTaggerConflict/src/bar_qt4.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef BAR_QT4_H -#define BAR_QT4_H -#include <QObject> - -class Bar : public QObject -{ - Q_OBJECT -public: - explicit Bar(QObject *parent = 0); -}; - -#endif // BAR_QT4_H diff --git a/tests/manual/groupTaggerConflict/src/bar_qt5.h b/tests/manual/groupTaggerConflict/src/bar_qt5.h deleted file mode 100644 index 758029c24..000000000 --- a/tests/manual/groupTaggerConflict/src/bar_qt5.h +++ /dev/null @@ -1,12 +0,0 @@ -#ifndef BAR_QT5_H -#define BAR_QT5_H -#include <QObject> - -class Bar : public QObject -{ - Q_OBJECT -public: - explicit Bar(QObject *parent = 0); -}; - -#endif // BAR_QT5_H diff --git a/tests/manual/groupTaggerConflict/test.qbs b/tests/manual/groupTaggerConflict/test.qbs deleted file mode 100644 index 86b9424ee..000000000 --- a/tests/manual/groupTaggerConflict/test.qbs +++ /dev/null @@ -1,31 +0,0 @@ -import qbs 1.0 - -Project { - - Product { - type: ["dynamiclibrary"] - name: "bar" - - Depends { name: "cpp" } - Depends { name: "Qt"; submodules: ['core'] } - - files: [ - "src/bar.cpp" - ] - - Group { - condition: Qt.core.versionMajor === 4 - qbs.install: true - qbs.installDir: "include/bar" - files: ["src/bar_qt4.h"] - } - Group { - condition: Qt.core.versionMajor === 5 - qbs.install: true - qbs.installDir: "include/bar" - files: ["src/bar_qt5.h"] - } - } -} - - |
