summaryrefslogtreecommitdiffstats
path: root/tests/manual
diff options
context:
space:
mode:
authorStephen Kelly <stephen.kelly@kdab.com>2012-03-14 17:23:53 +0100
committerQt by Nokia <qt-info@nokia.com>2012-04-18 13:20:33 +0200
commit8059b4b64f371f584f9fa383583371a2c05391a3 (patch)
treeaca0b5a81a757e325a5907e02c9f6ea8519a6835 /tests/manual
parent178aac93f389ca4ba4e8613214a5acb4384dfd58 (diff)
Remove the dbus build-tools, CMake config files and tests.
They have been moved to qtbase. Change-Id: Id3707032bc399e2ee915581789e17a58b9413166 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'tests/manual')
-rw-r--r--tests/manual/cmake/CMakeLists.txt1
-rw-r--r--tests/manual/cmake/pass1/CMakeLists.txt35
-rw-r--r--tests/manual/cmake/pass1/mydbusobject.cpp56
-rw-r--r--tests/manual/cmake/pass1/mydbusobject.h58
4 files changed, 0 insertions, 150 deletions
diff --git a/tests/manual/cmake/CMakeLists.txt b/tests/manual/cmake/CMakeLists.txt
index 28019680b..b7e11d64b 100644
--- a/tests/manual/cmake/CMakeLists.txt
+++ b/tests/manual/cmake/CMakeLists.txt
@@ -66,6 +66,5 @@ macro(expect_fail _dir)
)
endmacro()
-expect_pass(pass1)
expect_pass(pass2)
diff --git a/tests/manual/cmake/pass1/CMakeLists.txt b/tests/manual/cmake/pass1/CMakeLists.txt
deleted file mode 100644
index 2220db484..000000000
--- a/tests/manual/cmake/pass1/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(pass1)
-
-find_package(Qt5Core REQUIRED)
-find_package(Qt5DBus REQUIRED)
-find_package(Qt5DBusTools REQUIRED)
-
-include_directories(
- ${Qt5Core_INCLUDE_DIRS}
- ${Qt5DBus_INCLUDE_DIRS}
-)
-
-add_definitions(${Qt5DBus_DEFINITIONS})
-
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
-
-set(my_srcs mydbusobject.cpp)
-
-qt5_wrap_cpp(moc_files mydbusobject.h)
-
-qt5_generate_dbus_interface(
- mydbusobject.h
- ${CMAKE_BINARY_DIR}/org.qtProject.Tests.MyDBusObject.xml
-)
-
-qt5_add_dbus_adaptor(my_srcs
- ${CMAKE_BINARY_DIR}/org.qtProject.Tests.MyDBusObject.xml
- mydbusobject.h
- MyDBusObject
-)
-
-add_executable(myobject ${my_srcs} ${moc_files})
-target_link_libraries(myobject ${Qt5DBus_LIBRARIES})
diff --git a/tests/manual/cmake/pass1/mydbusobject.cpp b/tests/manual/cmake/pass1/mydbusobject.cpp
deleted file mode 100644
index ee211bbe9..000000000
--- a/tests/manual/cmake/pass1/mydbusobject.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
-** Contact: http://www.qt-project.org/
-**
-** 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 "mydbusobject.h"
-#include "mydbusobjectadaptor.h"
-
-MyDBusObject::MyDBusObject(QObject *parent)
- : QObject(parent)
-{
- new MyDBusObjectAdaptor(this);
- emit someSignal();
-}
-
-int main(int argc, char **argv)
-{
- MyDBusObject myDBusObject;
- return 0;
-}
diff --git a/tests/manual/cmake/pass1/mydbusobject.h b/tests/manual/cmake/pass1/mydbusobject.h
deleted file mode 100644
index dd9a023ff..000000000
--- a/tests/manual/cmake/pass1/mydbusobject.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly <stephen.kelly@kdab.com>
-** Contact: http://www.qt-project.org/
-**
-** 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 MYDBUSOBJECT_H
-#define MYDBUSOBJECT_H
-
-#include <QObject>
-
-class MyDBusObject : public QObject
-{
- Q_OBJECT
- Q_CLASSINFO("D-Bus Interface", "org.qtProject.Tests.MyDBusObject")
-public:
- MyDBusObject(QObject *parent = 0);
-
-signals:
- void someSignal();
-};
-
-#endif