diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-19 14:45:45 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 07:22:38 +0200 |
commit | 27de593721697e1f5616cac862fa227b9b40b339 (patch) | |
tree | a6fd06031b45376c7a2fe667cd3cb95629642e55 | |
parent | afe9113cac9a3b0b5157c0b7585b50c3385c19bf (diff) |
Test that the package configs for QtSystems work.
Change-Id: I6b625db7249aeaf9e5c67d67656c0d1972b1d828
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | tests/auto/auto.pro | 2 | ||||
-rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 12 | ||||
-rw-r--r-- | tests/auto/cmake/cmake.pro | 5 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/CMakeLists.txt | 32 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/main.cpp | 55 |
5 files changed, 106 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f27f487b..ece5f706 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -3,3 +3,5 @@ TEMPLATE = subdirs !without-publishsubscribe: SUBDIRS += publishsubscribe !without-serviceframework: SUBDIRS += serviceframework !without-systeminfo: SUBDIRS += systeminfo + +SUBDIRS += cmake diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 00000000..4f15a69e --- /dev/null +++ b/tests/auto/cmake/CMakeLists.txt @@ -0,0 +1,12 @@ + +cmake_minimum_required(VERSION 2.8) + +project(qmake_cmake_files) + +enable_testing() + +find_package(Qt5Core REQUIRED) + +include("${_Qt5CTestMacros}") + +expect_pass(test_modules) diff --git a/tests/auto/cmake/cmake.pro b/tests/auto/cmake/cmake.pro new file mode 100644 index 00000000..bf2dbcb7 --- /dev/null +++ b/tests/auto/cmake/cmake.pro @@ -0,0 +1,5 @@ + +# Cause make to do nothing. +TEMPLATE = subdirs + +CONFIG += ctest_testcase diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt new file mode 100644 index 00000000..34af2dd3 --- /dev/null +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -0,0 +1,32 @@ + +cmake_minimum_required(VERSION 2.8) + +project(test_modules) + +find_package(Qt5Gui REQUIRED) +find_package(Qt5Network REQUIRED) + +find_package(Qt5PublishSubscribe REQUIRED) +find_package(Qt5ServiceFramework REQUIRED) +find_package(Qt5SystemInfo REQUIRED) + +include_directories( + ${Qt5PublishSubscribe_INCLUDE_DIRS} + ${Qt5ServiceFramework_INCLUDE_DIRS} + ${Qt5SystemInfo_INCLUDE_DIRS} +) + +add_definitions( + ${Qt5PublishSubscribe_DEFINITIONS} + ${Qt5ServiceFramework_DEFINITIONS} + ${Qt5SystemInfo_DEFINITIONS} +) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + +add_executable(mainapp main.cpp) +target_link_libraries(mainapp + ${Qt5PublishSubscribe_LIBRARIES} + ${Qt5ServiceFramework_LIBRARIES} + ${Qt5SystemInfo_LIBRARIES} +) diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp new file mode 100644 index 00000000..50eac1ab --- /dev/null +++ b/tests/auto/cmake/test_modules/main.cpp @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2012 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 <QValueSpaceSubscriber> +#include <QServiceInterfaceDescriptor> +#include <QDisplayInfo> + +int main(int argc, char **argv) +{ + QValueSpaceSubscriber valueSpaceSubscriber; + + QServiceInterfaceDescriptor serviceInterfaceDescriptor; + + QDisplayInfo displayInfo; + + return 0; +} |