From: Stephen Kelly <stephen.kelly@kdab.com>
Date: Wed, 31 Oct 2012 13:51:49 +0000 (+0100)
Subject: CMake: Remove obsolete test_modules test
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=732db404eac8982a69f4cf0c99378c54914be684;p=profile%2Fivi%2Fqtdeclarative.git

CMake: Remove obsolete test_modules test

The generated module_includes test is a super-set of this test.

Change-Id: I086d81806cdbc3c4afbeae0f8683a5b693b6f85a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---

diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt
index 43f826d..a88564e 100644
--- a/tests/auto/cmake/CMakeLists.txt
+++ b/tests/auto/cmake/CMakeLists.txt
@@ -9,8 +9,6 @@ find_package(Qt5Core REQUIRED)
 
 include("${_Qt5CTestMacros}")
 
-expect_pass(test_modules)
-
 set(Qt5_MODULE_TEST_DEPENDS Network Gui)
 
 test_module_includes(
diff --git a/tests/auto/cmake/test_modules/CMakeLists.txt b/tests/auto/cmake/test_modules/CMakeLists.txt
deleted file mode 100644
index 509320b..0000000
--- a/tests/auto/cmake/test_modules/CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-
-cmake_minimum_required(VERSION 2.8)
-
-project(test_modules)
-
-# We have to find the dependencies separately because they are installed,
-# whereas the modules under test are not installed yet, and are found in the
-# build directory. Normally the Qt5 CMake files expect all modules in one
-# installation prefix, so we work around that by finding the dependencies
-# explicitly first.
-find_package(Qt5Network REQUIRED)
-find_package(Qt5Gui REQUIRED)
-
-find_package(Qt5Qml REQUIRED)
-find_package(Qt5Quick REQUIRED)
-
-include_directories(
-  ${Qt5Qml_INCLUDE_DIRS}
-  ${Qt5Quick_INCLUDE_DIRS}
-)
-
-add_definitions(
-  ${Qt5Qml_DEFINITIONS}
-  ${Qt5Quick_DEFINITIONS}
-)
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}")
-
-add_executable(mainapp main.cpp)
-target_link_libraries(mainapp
-  ${Qt5Qml_LIBRARIES}
-  ${Qt5Quick_LIBRARIES}
-)
diff --git a/tests/auto/cmake/test_modules/main.cpp b/tests/auto/cmake/test_modules/main.cpp
deleted file mode 100644
index c771ead..0000000
--- a/tests/auto/cmake/test_modules/main.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/****************************************************************************
-**
-** 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/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, 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, Digia gives you certain additional
-** rights.  These rights are described in the Digia 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.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QQmlEngine>
-#include <QQuickItem>
-
-int main(int argc, char **argv)
-{
-    QQmlEngine qmlEngine;
-
-    QQuickItem quickItem;
-
-    return 0;
-}