diff options
author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-06-19 17:53:22 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-20 10:11:57 +0200 |
commit | ce1393d9897707416ee4a259b9eb2005bedf9538 (patch) | |
tree | 2d7ae8eadcb3b449a0b86414a9abc723e78bfbc5 /tests/manual | |
parent | c2e35cd3ec62f1be9234acdbb43ea21da75eada6 (diff) | |
download | qttools-ce1393d9897707416ee4a259b9eb2005bedf9538.tar.gz |
Handle files with includes from extra directories with lupdate.
Forward port of 7a6d2796e63a8a390bd86fe9a029c4add119132b in cmake.git.
Change-Id: I35d05a6160e192e9ea0966fdd2ebc21ce2d73d24
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/manual')
-rw-r--r-- | tests/manual/cmake/pass2/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tests/manual/cmake/pass2/myi18nobject.cpp | 2 | ||||
-rw-r--r-- | tests/manual/cmake/pass2/some_dir/some_include.h | 49 |
3 files changed, 53 insertions, 0 deletions
diff --git a/tests/manual/cmake/pass2/CMakeLists.txt b/tests/manual/cmake/pass2/CMakeLists.txt index fd8db7888..c11bf750f 100644 --- a/tests/manual/cmake/pass2/CMakeLists.txt +++ b/tests/manual/cmake/pass2/CMakeLists.txt @@ -16,6 +16,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Core_EXECUTABLE_COMPILE_FLAGS}") set(my_srcs myi18nobject.cpp) +include_directories("${CMAKE_CURRENT_SOURCE_DIR}/some_dir") + qt5_create_translation(qm_files ${my_srcs} myobject_de.ts) add_executable(myobject ${my_srcs} ${qm_files}) diff --git a/tests/manual/cmake/pass2/myi18nobject.cpp b/tests/manual/cmake/pass2/myi18nobject.cpp index 0b79d7806..f4287d89c 100644 --- a/tests/manual/cmake/pass2/myi18nobject.cpp +++ b/tests/manual/cmake/pass2/myi18nobject.cpp @@ -43,6 +43,8 @@ #include <QCoreApplication> #include <QTranslator> +#include "some_include.h" + int main(int argc, char **argv) { QCoreApplication app(argc, argv); diff --git a/tests/manual/cmake/pass2/some_dir/some_include.h b/tests/manual/cmake/pass2/some_dir/some_include.h new file mode 100644 index 000000000..fcdacc8cb --- /dev/null +++ b/tests/manual/cmake/pass2/some_dir/some_include.h @@ -0,0 +1,49 @@ +/**************************************************************************** +** +** 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 SOME_INCLUDE_H +#define SOME_INCLUDE_H + +enum { + Non_Empty_File +}; + +#endif |