From 61c433785eb918d81b927f17bcad4687f2269afe Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Wed, 18 Apr 2012 16:46:26 +0200 Subject: Move the CMake unit tests to auto/ This will allow the CI system to run the tests. The tests are only run if cmake is found. Change-Id: Ie73a56114c151871160bafcbf0b90b2d54620855 Reviewed-by: Oswald Buddenhagen Reviewed-by: Stephen Kelly Reviewed-by: Sergio Ahumada --- tests/manual/cmake/CMakeLists.txt | 97 ---------------------- tests/manual/cmake/fail4/CMakeLists.txt | 22 ----- tests/manual/cmake/fail4/myobject.cpp | 54 ------------ tests/manual/cmake/fail4/myobject.h | 57 ------------- tests/manual/cmake/fail4/pass4.qrc | 6 -- tests/manual/cmake/fail4/resource_file.txt | 1 - tests/manual/cmake/fail5/CMakeLists.txt | 19 ----- tests/manual/cmake/fail5/myobject.cpp | 54 ------------ tests/manual/cmake/fail5/myobject.h | 57 ------------- .../cmake/pass(needsquoting)6/CMakeLists.txt | 22 ----- .../manual/cmake/pass(needsquoting)6/mywidget.cpp | 56 ------------- tests/manual/cmake/pass(needsquoting)6/mywidget.h | 65 --------------- tests/manual/cmake/pass(needsquoting)6/mywidget.ui | 34 -------- tests/manual/cmake/pass1/CMakeLists.txt | 51 ------------ tests/manual/cmake/pass1/three.cpp | 58 ------------- tests/manual/cmake/pass1/two.cpp | 56 ------------- tests/manual/cmake/pass2/CMakeLists.txt | 19 ----- tests/manual/cmake/pass2/myobject.cpp | 56 ------------- tests/manual/cmake/pass2/myobject.h | 57 ------------- tests/manual/cmake/pass2/pass2.qrc | 6 -- tests/manual/cmake/pass2/resource_file.txt | 1 - tests/manual/cmake/pass3/CMakeLists.txt | 21 ----- tests/manual/cmake/pass3/mywidget.cpp | 56 ------------- tests/manual/cmake/pass3/mywidget.h | 65 --------------- tests/manual/cmake/pass3/mywidget.ui | 34 -------- tests/manual/cmake/pass7/CMakeLists.txt | 13 --- tests/manual/cmake/pass7/main.cpp | 47 ----------- tests/manual/cmake/pass8/CMakeLists.txt | 20 ----- tests/manual/cmake/pass8/myobject.cpp | 54 ------------ tests/manual/cmake/pass8/myobject.h | 57 ------------- tests/manual/cmake/pass9/CMakeLists.txt | 36 -------- tests/manual/cmake/pass9/mydbusobject.cpp | 56 ------------- tests/manual/cmake/pass9/mydbusobject.h | 58 ------------- 33 files changed, 1365 deletions(-) delete mode 100644 tests/manual/cmake/CMakeLists.txt delete mode 100644 tests/manual/cmake/fail4/CMakeLists.txt delete mode 100644 tests/manual/cmake/fail4/myobject.cpp delete mode 100644 tests/manual/cmake/fail4/myobject.h delete mode 100644 tests/manual/cmake/fail4/pass4.qrc delete mode 100644 tests/manual/cmake/fail4/resource_file.txt delete mode 100644 tests/manual/cmake/fail5/CMakeLists.txt delete mode 100644 tests/manual/cmake/fail5/myobject.cpp delete mode 100644 tests/manual/cmake/fail5/myobject.h delete mode 100644 tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass(needsquoting)6/mywidget.cpp delete mode 100644 tests/manual/cmake/pass(needsquoting)6/mywidget.h delete mode 100644 tests/manual/cmake/pass(needsquoting)6/mywidget.ui delete mode 100644 tests/manual/cmake/pass1/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass1/three.cpp delete mode 100644 tests/manual/cmake/pass1/two.cpp delete mode 100644 tests/manual/cmake/pass2/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass2/myobject.cpp delete mode 100644 tests/manual/cmake/pass2/myobject.h delete mode 100644 tests/manual/cmake/pass2/pass2.qrc delete mode 100644 tests/manual/cmake/pass2/resource_file.txt delete mode 100644 tests/manual/cmake/pass3/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass3/mywidget.cpp delete mode 100644 tests/manual/cmake/pass3/mywidget.h delete mode 100644 tests/manual/cmake/pass3/mywidget.ui delete mode 100644 tests/manual/cmake/pass7/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass7/main.cpp delete mode 100644 tests/manual/cmake/pass8/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass8/myobject.cpp delete mode 100644 tests/manual/cmake/pass8/myobject.h delete mode 100644 tests/manual/cmake/pass9/CMakeLists.txt delete mode 100644 tests/manual/cmake/pass9/mydbusobject.cpp delete mode 100644 tests/manual/cmake/pass9/mydbusobject.h (limited to 'tests/manual') diff --git a/tests/manual/cmake/CMakeLists.txt b/tests/manual/cmake/CMakeLists.txt deleted file mode 100644 index fdcf2b76f8..0000000000 --- a/tests/manual/cmake/CMakeLists.txt +++ /dev/null @@ -1,97 +0,0 @@ - -# This is an automatic test for the CMake configuration files. -# To run it, -# 1) mkdir build # Create a build directory -# 2) cd build -# 3) cmake .. # Run cmake on this directory. -# 4) ctest # Run ctest -# -# The expected output is something like: -# -# Start 1: pass1 -# 1/7 Test #1: pass1 ............................ Passed 4.25 sec -# Start 2: pass2 -# 2/7 Test #2: pass2 ............................ Passed 2.00 sec -# Start 3: pass3 -# 3/7 Test #3: pass3 ............................ Passed 2.85 sec -# Start 4: fail4 -# 4/7 Test #4: fail4 ............................ Passed 1.88 sec -# Start 5: fail5 -# 5/7 Test #5: fail5 ............................ Passed 1.36 sec -# Start 6: pass_needsquoting_6 -# 6/7 Test #6: pass_needsquoting_6 .............. Passed 2.88 sec -# Start 7: pass7 -# 7/7 Test #7: pass7 ............................ Passed 0.93 sec -# -# Note that if Qt is not installed, or if it is installed to a -# non-standard prefix, the environment variable CMAKE_PREFIX_PATH -# needs to be set to the installation prefix or build prefix of Qt -# before running these tests. - -cmake_minimum_required(VERSION 2.8) - -project(qmake_cmake_files) - -enable_testing() - -macro(expect_pass _dir) - string(REPLACE "(" "_" testname "${_dir}") - string(REPLACE ")" "_" testname "${testname}") - add_test(${testname} ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}" - "${CMAKE_CURRENT_BINARY_DIR}/${_dir}" - --build-generator ${CMAKE_GENERATOR} - --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - ) -endmacro() - -macro(expect_fail _dir) - string(REPLACE "(" "_" testname "${_dir}") - string(REPLACE ")" "_" testname "${testname}") - file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}") - file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/${_dir}" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}") - file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/CMakeLists.txt" - " - cmake_minimum_required(VERSION 2.8) - project(${_dir}_build) - - try_compile(Result \${CMAKE_CURRENT_BINARY_DIR}/${_dir} - \${CMAKE_CURRENT_SOURCE_DIR}/${_dir} - ${_dir} - OUTPUT_VARIABLE Out - ) - message(\"\${Out}\") - if (Result) - message(SEND_ERROR \"Succeeded build which should fail\") - endif() - " - ) - add_test(${testname} ${CMAKE_CTEST_COMMAND} - --build-and-test - "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}" - "${CMAKE_CURRENT_BINARY_DIR}/failbuild/${_dir}/build" - --build-generator ${CMAKE_GENERATOR} - --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-options -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} - ) -endmacro() - -if(${CMAKE_VERSION} VERSION_EQUAL 2.8.7 OR ${CMAKE_VERSION} VERSION_GREATER 2.8.7) - # Requires CMAKE_AUTOMOC function in CMake 2.8.7 - expect_pass(pass1) -else() - message("CMake version older than 2.8.7. Not running test \"pass1\"") -endif() -expect_pass(pass2) -# Modules do not currently find their own dependencies. -# expect_pass(pass3) -expect_fail(fail4) -expect_fail(fail5) -expect_pass("pass(needsquoting)6") -expect_pass(pass7) -expect_pass(pass8) -if (UNIX) - expect_pass(pass9) -endif() diff --git a/tests/manual/cmake/fail4/CMakeLists.txt b/tests/manual/cmake/fail4/CMakeLists.txt deleted file mode 100644 index fdf90e17a7..0000000000 --- a/tests/manual/cmake/fail4/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass4) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -qt5_wrap_cpp(moc_files myobject.h) - -# Test options. The -binary option generates a binary to dlopen instead of -# a source file to compile. The compiler will consider it garbage when used -# in the add_executable call. -qt5_add_resources(rcc_files "pass4.qrc" OPTIONS -binary) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(myobject myobject.cpp ${moc_files} ${rcc_files}) -target_link_libraries(myobject ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/fail4/myobject.cpp b/tests/manual/cmake/fail4/myobject.cpp deleted file mode 100644 index 292a76e569..0000000000 --- a/tests/manual/cmake/fail4/myobject.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "myobject.h" - -MyObject::MyObject(QObject *parent) - : QObject(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - MyObject myObject; - return 0; -} diff --git a/tests/manual/cmake/fail4/myobject.h b/tests/manual/cmake/fail4/myobject.h deleted file mode 100644 index cd8765d03f..0000000000 --- a/tests/manual/cmake/fail4/myobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYOBJECT_H -#define MYOBJECT_H - -#include - -class MyObject : public QObject -{ - Q_OBJECT -public: - MyObject(QObject *parent = 0); - -signals: - void someSignal(); -}; - -#endif diff --git a/tests/manual/cmake/fail4/pass4.qrc b/tests/manual/cmake/fail4/pass4.qrc deleted file mode 100644 index 00a17f541f..0000000000 --- a/tests/manual/cmake/fail4/pass4.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - resource_file.txt - - - diff --git a/tests/manual/cmake/fail4/resource_file.txt b/tests/manual/cmake/fail4/resource_file.txt deleted file mode 100644 index 2c604a4f18..0000000000 --- a/tests/manual/cmake/fail4/resource_file.txt +++ /dev/null @@ -1 +0,0 @@ -Ken sent me. diff --git a/tests/manual/cmake/fail5/CMakeLists.txt b/tests/manual/cmake/fail5/CMakeLists.txt deleted file mode 100644 index 962314c818..0000000000 --- a/tests/manual/cmake/fail5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass5) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -# Test options. The -i option removes the include "myobject.h" from the moc file -# causing a compile failure. -> Options work -qt5_wrap_cpp(moc_files myobject.h OPTIONS -i) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(myobject myobject.cpp ${moc_files}) -target_link_libraries(myobject ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/fail5/myobject.cpp b/tests/manual/cmake/fail5/myobject.cpp deleted file mode 100644 index 292a76e569..0000000000 --- a/tests/manual/cmake/fail5/myobject.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "myobject.h" - -MyObject::MyObject(QObject *parent) - : QObject(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - MyObject myObject; - return 0; -} diff --git a/tests/manual/cmake/fail5/myobject.h b/tests/manual/cmake/fail5/myobject.h deleted file mode 100644 index cd8765d03f..0000000000 --- a/tests/manual/cmake/fail5/myobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYOBJECT_H -#define MYOBJECT_H - -#include - -class MyObject : public QObject -{ - Q_OBJECT -public: - MyObject(QObject *parent = 0); - -signals: - void someSignal(); -}; - -#endif diff --git a/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt b/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt deleted file mode 100644 index 7b9561c588..0000000000 --- a/tests/manual/cmake/pass(needsquoting)6/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project("pass(needsquoting)6") - -find_package(Qt5Core REQUIRED) -find_package(Qt5Gui REQUIRED) -find_package(Qt5Widgets REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS} ${Qt5Gui_DEFINITIONS} ${Qt5Widgets_DEFINITIONS}) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -qt5_wrap_cpp(moc_files mywidget.h) -qt5_wrap_ui(ui_files mywidget.ui) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mywidget mywidget.cpp ${moc_files} ${ui_files}) -target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp b/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp deleted file mode 100644 index 7f8923810d..0000000000 --- a/tests/manual/cmake/pass(needsquoting)6/mywidget.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "mywidget.h" -#include "ui_mywidget.h" - -MyWidget::MyWidget(QWidget *parent) - : QWidget(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - MyWidget myWidget; - return 0; -} diff --git a/tests/manual/cmake/pass(needsquoting)6/mywidget.h b/tests/manual/cmake/pass(needsquoting)6/mywidget.h deleted file mode 100644 index 11968e6454..0000000000 --- a/tests/manual/cmake/pass(needsquoting)6/mywidget.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYWIDGET_H -#define MYWIDGET_H - -#include - -namespace Ui -{ -class MyWidget; -} - -class MyWidget : public QWidget -{ - Q_OBJECT -public: - MyWidget(QWidget *parent = 0); - -signals: - void someSignal(); - -private: - Ui::MyWidget *ui; -}; - -#endif diff --git a/tests/manual/cmake/pass(needsquoting)6/mywidget.ui b/tests/manual/cmake/pass(needsquoting)6/mywidget.ui deleted file mode 100644 index ac42ac4dc2..0000000000 --- a/tests/manual/cmake/pass(needsquoting)6/mywidget.ui +++ /dev/null @@ -1,34 +0,0 @@ - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - PushButton - - - - - - - - - - - - - - diff --git a/tests/manual/cmake/pass1/CMakeLists.txt b/tests/manual/cmake/pass1/CMakeLists.txt deleted file mode 100644 index 970ca33078..0000000000 --- a/tests/manual/cmake/pass1/CMakeLists.txt +++ /dev/null @@ -1,51 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass1) - -set(CMAKE_AUTOMOC ON) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -macro(qt5_use_package _target _package) - if (NOT Qt5${_package}_FOUND) - find_package(Qt5${_package} ${ARG1}) - endif() - if (Qt5${_package}_FOUND) - # TODO: Handle public/private keywords? - target_link_libraries(${_target} ${Qt5${_package}_LIBRARIES}) - # ### Requires CMake 2.8.8: - # set_property(TARGET ${_target} APPEND PROPERTY INCLUDE_DIRECTORIES ${Qt5${_package}_INCLUDE_DIRS}) - include_directories(${Qt5${_package}_INCLUDE_DIRS}) - set_property(TARGET ${_target} APPEND PROPERTY COMPILE_DEFINITIONS ${Qt5${_package}_COMPILE_DEFINITIONS}) - - # We can't just append to the COMPILE_FLAGS property. That creats a ';' separated list - # which breaks the compile commmand line. - # Ensure non-duplication here manually instead. - get_property(_taget_type TARGET ${_target} PROPERTY TYPE) - if ("${_taget_type}" STREQUAL "EXECUTABLE") - get_target_property(_flags ${_target} COMPILE_FLAGS) - if (_flags) - list(APPEND _flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS}) - list(REMOVE_DUPLICATES _flags) - else() - set(_flags ${Qt5${_package}_EXECUTABLE_COMPILE_FLAGS}) - endif() - if (_flags) - set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags}) - endif() - endif() - else() - message(FATAL_ERROR "NOT FOUND: Qt5${_package}") - endif() -endmacro() - -add_executable(two two.cpp) -add_executable(three three.cpp) - -qt5_use_package(two Core) -qt5_use_package(two Test) -qt5_use_package(three Widgets) -qt5_use_package(three Gui) -qt5_use_package(three Core) -qt5_use_package(three Test) diff --git a/tests/manual/cmake/pass1/three.cpp b/tests/manual/cmake/pass1/three.cpp deleted file mode 100644 index 63bcbff480..0000000000 --- a/tests/manual/cmake/pass1/three.cpp +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 -#include - -class Three : public QObject -{ - Q_OBJECT -public: - Three(QObject *parent = 0) - { - QWidget *w = new QWidget; - w->show(); - } -}; - -QTEST_MAIN(Three) - -#include "three.moc" diff --git a/tests/manual/cmake/pass1/two.cpp b/tests/manual/cmake/pass1/two.cpp deleted file mode 100644 index 24fcd5dba4..0000000000 --- a/tests/manual/cmake/pass1/two.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 - -class Two : public QObject -{ - Q_OBJECT -public: - Two(QObject *parent = 0) - { - - } -}; - -QTEST_MAIN(Two) - -#include "two.moc" diff --git a/tests/manual/cmake/pass2/CMakeLists.txt b/tests/manual/cmake/pass2/CMakeLists.txt deleted file mode 100644 index c859f13fff..0000000000 --- a/tests/manual/cmake/pass2/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass2) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -qt5_wrap_cpp(moc_files myobject.h) - -qt5_add_resources(rcc_files "pass2.qrc") - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(myobject myobject.cpp ${moc_files} ${rcc_files}) -target_link_libraries(myobject ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass2/myobject.cpp b/tests/manual/cmake/pass2/myobject.cpp deleted file mode 100644 index a237b00c50..0000000000 --- a/tests/manual/cmake/pass2/myobject.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "myobject.h" - -MyObject::MyObject(QObject *parent) - : QObject(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - MyObject myObject; - // Compile error if the resource file was not created. - Q_INIT_RESOURCE(pass2); - return 0; -} diff --git a/tests/manual/cmake/pass2/myobject.h b/tests/manual/cmake/pass2/myobject.h deleted file mode 100644 index cd8765d03f..0000000000 --- a/tests/manual/cmake/pass2/myobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYOBJECT_H -#define MYOBJECT_H - -#include - -class MyObject : public QObject -{ - Q_OBJECT -public: - MyObject(QObject *parent = 0); - -signals: - void someSignal(); -}; - -#endif diff --git a/tests/manual/cmake/pass2/pass2.qrc b/tests/manual/cmake/pass2/pass2.qrc deleted file mode 100644 index 00a17f541f..0000000000 --- a/tests/manual/cmake/pass2/pass2.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - resource_file.txt - - - diff --git a/tests/manual/cmake/pass2/resource_file.txt b/tests/manual/cmake/pass2/resource_file.txt deleted file mode 100644 index 2c604a4f18..0000000000 --- a/tests/manual/cmake/pass2/resource_file.txt +++ /dev/null @@ -1 +0,0 @@ -Ken sent me. diff --git a/tests/manual/cmake/pass3/CMakeLists.txt b/tests/manual/cmake/pass3/CMakeLists.txt deleted file mode 100644 index 7fa6731f9b..0000000000 --- a/tests/manual/cmake/pass3/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass3) - -# The module finds its dependencies -find_package(Qt5Widgets REQUIRED) - -include_directories(${Qt5Widgets_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -set(CMAKE_INCLUDE_CURRENT_DIR ON) - -qt5_wrap_cpp(moc_files mywidget.h) -qt5_wrap_ui(ui_files mywidget.ui) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(mywidget mywidget.cpp ${moc_files} ${ui_files}) -target_link_libraries(mywidget ${Qt5Widgets_LIBRARIES}) diff --git a/tests/manual/cmake/pass3/mywidget.cpp b/tests/manual/cmake/pass3/mywidget.cpp deleted file mode 100644 index 7f8923810d..0000000000 --- a/tests/manual/cmake/pass3/mywidget.cpp +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "mywidget.h" -#include "ui_mywidget.h" - -MyWidget::MyWidget(QWidget *parent) - : QWidget(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - QApplication app(argc, argv); - MyWidget myWidget; - return 0; -} diff --git a/tests/manual/cmake/pass3/mywidget.h b/tests/manual/cmake/pass3/mywidget.h deleted file mode 100644 index 11968e6454..0000000000 --- a/tests/manual/cmake/pass3/mywidget.h +++ /dev/null @@ -1,65 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYWIDGET_H -#define MYWIDGET_H - -#include - -namespace Ui -{ -class MyWidget; -} - -class MyWidget : public QWidget -{ - Q_OBJECT -public: - MyWidget(QWidget *parent = 0); - -signals: - void someSignal(); - -private: - Ui::MyWidget *ui; -}; - -#endif diff --git a/tests/manual/cmake/pass3/mywidget.ui b/tests/manual/cmake/pass3/mywidget.ui deleted file mode 100644 index ac42ac4dc2..0000000000 --- a/tests/manual/cmake/pass3/mywidget.ui +++ /dev/null @@ -1,34 +0,0 @@ - - - Form - - - - 0 - 0 - 400 - 300 - - - - Form - - - - - - PushButton - - - - - - - - - - - - - - diff --git a/tests/manual/cmake/pass7/CMakeLists.txt b/tests/manual/cmake/pass7/CMakeLists.txt deleted file mode 100644 index ecf6b3649e..0000000000 --- a/tests/manual/cmake/pass7/CMakeLists.txt +++ /dev/null @@ -1,13 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass7) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) -add_definitions(${Qt5Core_DEFINITIONS}) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -add_executable(myobject main.cpp) diff --git a/tests/manual/cmake/pass7/main.cpp b/tests/manual/cmake/pass7/main.cpp deleted file mode 100644 index 0a6b09d877..0000000000 --- a/tests/manual/cmake/pass7/main.cpp +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "qplatformdefs.h" - -int main(int argc, char **argv) -{ - return 0; -} diff --git a/tests/manual/cmake/pass8/CMakeLists.txt b/tests/manual/cmake/pass8/CMakeLists.txt deleted file mode 100644 index 735b1bd26e..0000000000 --- a/tests/manual/cmake/pass8/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass8) - -find_package(Qt5Core REQUIRED) - -include_directories(${Qt5Core_INCLUDE_DIRS}) - -add_definitions(${Qt5Core_DEFINITIONS}) - -qt5_wrap_cpp(moc_files myobject.h) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -# On non-windows, the WIN32 is harmless, and Qt5Core_QTMAIN_LIBRARIES is empty. -# We test that it is harmless on those, and test that it builds on Windows. -# It wouldn't build if WIN32 is used and Qt5Core_QTMAIN_LIBRARIES is empty. -add_executable(myobject WIN32 myobject.cpp ${moc_files} ) -target_link_libraries(myobject ${Qt5Core_LIBRARIES} ${Qt5Core_QTMAIN_LIBRARIES}) diff --git a/tests/manual/cmake/pass8/myobject.cpp b/tests/manual/cmake/pass8/myobject.cpp deleted file mode 100644 index b6287b2540..0000000000 --- a/tests/manual/cmake/pass8/myobject.cpp +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 "myobject.h" - -MyObject::MyObject(QObject *parent) - : QObject(parent) -{ - emit someSignal(); -} - -int main(int argc, char **argv) -{ - MyObject myObject; - return 0; -} diff --git a/tests/manual/cmake/pass8/myobject.h b/tests/manual/cmake/pass8/myobject.h deleted file mode 100644 index 71a65ee801..0000000000 --- a/tests/manual/cmake/pass8/myobject.h +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Stephen Kelly -** 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 MYOBJECT_H -#define MYOBJECT_H - -#include - -class MyObject : public QObject -{ - Q_OBJECT -public: - MyObject(QObject *parent = 0); - -signals: - void someSignal(); -}; - -#endif diff --git a/tests/manual/cmake/pass9/CMakeLists.txt b/tests/manual/cmake/pass9/CMakeLists.txt deleted file mode 100644 index bf8ff6b3da..0000000000 --- a/tests/manual/cmake/pass9/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ - -cmake_minimum_required(VERSION 2.8) - -project(pass9) - -find_package(Qt5Core REQUIRED) -find_package(Qt5DBus REQUIRED) - -include_directories( - ${Qt5Core_INCLUDE_DIRS} - ${Qt5DBus_INCLUDE_DIRS} -) - -add_definitions(${Qt5Core_DEFINITIONS} ${Qt5DBus_DEFINITIONS}) - -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") - -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} ${Qt5Core_LIBRARIES}) diff --git a/tests/manual/cmake/pass9/mydbusobject.cpp b/tests/manual/cmake/pass9/mydbusobject.cpp deleted file mode 100644 index ee211bbe9b..0000000000 --- a/tests/manual/cmake/pass9/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 -** 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/pass9/mydbusobject.h b/tests/manual/cmake/pass9/mydbusobject.h deleted file mode 100644 index dd9a023ffe..0000000000 --- a/tests/manual/cmake/pass9/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 -** 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 - -class MyDBusObject : public QObject -{ - Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.qtProject.Tests.MyDBusObject") -public: - MyDBusObject(QObject *parent = 0); - -signals: - void someSignal(); -}; - -#endif -- cgit v1.2.3