diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-07-19 15:07:22 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-20 07:23:51 +0200 |
commit | b69aa82d1efb49f5f681fe945784611d67b56e29 (patch) | |
tree | b64c780a4cd33c5de1d4c4987482bcd6b37d8054 | |
parent | d9231b99acd57f442159e91381fa3027fb0add8f (diff) | |
download | qt3d-b69aa82d1efb49f5f681fe945784611d67b56e29.tar.gz |
Test that the package configs for Qt3D work.
Change-Id: I079b5b4ec7fb7301e732b8898cd64c6d7afe1c9d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rw-r--r-- | tests/auto/auto.pro | 4 | ||||
-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 | 27 | ||||
-rw-r--r-- | tests/auto/cmake/test_modules/main.cpp | 52 |
5 files changed, 99 insertions, 1 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 68c8b55f0..b92739c5c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,5 +1,7 @@ TEMPLATE = subdirs -SUBDIRS = threed +SUBDIRS = threed \ + cmake + !isEmpty(QT.qml.name): SUBDIRS += imports contains(QT_CONFIG, qmltest) { SUBDIRS += qml3d diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt new file mode 100644 index 000000000..4f15a69ec --- /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 000000000..bf2dbcb77 --- /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 000000000..02b1b1341 --- /dev/null +++ b/tests/auto/cmake/test_modules/CMakeLists.txt @@ -0,0 +1,27 @@ + +cmake_minimum_required(VERSION 2.8) + +project(test_modules) + +find_package(Qt5Quick REQUIRED) + +find_package(Qt53D REQUIRED) +find_package(Qt53DQuick REQUIRED) + +include_directories( + ${Qt53D_INCLUDE_DIRS} + ${Qt53DQuick_INCLUDE_DIRS} +) + +add_definitions( + ${Qt53D_DEFINITIONS} + ${Qt53DQuick_DEFINITIONS} +) + +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") + +add_executable(mainapp main.cpp) +target_link_libraries(mainapp + ${Qt53D_LIBRARIES} + ${Qt53DQuick_LIBRARIES} +) diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp new file mode 100644 index 000000000..47436e595 --- /dev/null +++ b/tests/auto/cmake/test_modules/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** 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 <QGLTexture2D> +#include <QQuickItem3D> + +int main(int argc, char **argv) +{ + QGLTexture2D gLTexture2D; + + QQuickItem3D quickItem3D; + + return 0; +} |