diff options
| -rw-r--r-- | config.tests/common/pch/header.h | 1 | ||||
| -rw-r--r-- | config.tests/common/pch/pch.pro | 4 | ||||
| -rw-r--r-- | config.tests/common/pch/source.cpp | 44 | ||||
| -rw-r--r-- | configure.json | 16 | ||||
| -rw-r--r-- | mkspecs/features/qt_configure.prf | 5 |
5 files changed, 20 insertions, 50 deletions
diff --git a/config.tests/common/pch/header.h b/config.tests/common/pch/header.h deleted file mode 100644 index ebc22c4fb0..0000000000 --- a/config.tests/common/pch/header.h +++ /dev/null @@ -1 +0,0 @@ -#define HEADER_H diff --git a/config.tests/common/pch/pch.pro b/config.tests/common/pch/pch.pro deleted file mode 100644 index f6384b71e1..0000000000 --- a/config.tests/common/pch/pch.pro +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG += precompile_header -PRECOMPILED_DIR = .pch -PRECOMPILED_HEADER = header.h -SOURCES = source.cpp diff --git a/config.tests/common/pch/source.cpp b/config.tests/common/pch/source.cpp deleted file mode 100644 index 855672ffa8..0000000000 --- a/config.tests/common/pch/source.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the configuration 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef HEADER_H -#error no go -#endif - -int main() { return 0; } diff --git a/configure.json b/configure.json index 2a717daf9a..9fce6d039e 100644 --- a/configure.json +++ b/configure.json @@ -324,7 +324,21 @@ "precompile_header": { "label": "precompiled header support", "type": "compile", - "test": "common/pch" + "test": { + "files": { + "header.h": "#define HEADER_H" + }, + "tail": [ + "#ifndef HEADER_H", + "#error no go", + "#endif" + ], + "qmake": [ + "CONFIG += precompile_header", + "PRECOMPILED_DIR = .pch", + "PRECOMPILED_HEADER = header.h" + ] + } }, "use_gold_linker": { "label": "gold linker", diff --git a/mkspecs/features/qt_configure.prf b/mkspecs/features/qt_configure.prf index 72bbd42fa5..f5aa444ade 100644 --- a/mkspecs/features/qt_configure.prf +++ b/mkspecs/features/qt_configure.prf @@ -1170,6 +1170,11 @@ defineTest(qtConfPrepareCompileTestSource) { "}" write_file($$test_dir/main.$$suffix, contents)|error() + for (test, tests) { + for (file, $$qtConfScalarOrList($${test}.test.files._KEYS_)): \ + write_file($$test_dir/$$file, $$qtConfScalarOrList($${test}.test.files.$${file}))|error() + } + # Create stub .pro file contents = "SOURCES = main.$$suffix" # Custom project code |