configure: enable inline tests to contain auxiliary files
... and use that to migrate the pch test. Change-Id: I2ce884442cab6124c37142f571cf6f82191ee4f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
b6cd5fdc6b
commit
73b8769730
@ -1 +0,0 @@
|
|||||||
#define HEADER_H
|
|
@ -1,4 +0,0 @@
|
|||||||
CONFIG += precompile_header
|
|
||||||
PRECOMPILED_DIR = .pch
|
|
||||||
PRECOMPILED_HEADER = header.h
|
|
||||||
SOURCES = source.cpp
|
|
@ -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; }
|
|
@ -324,7 +324,21 @@
|
|||||||
"precompile_header": {
|
"precompile_header": {
|
||||||
"label": "precompiled header support",
|
"label": "precompiled header support",
|
||||||
"type": "compile",
|
"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": {
|
"use_gold_linker": {
|
||||||
"label": "gold linker",
|
"label": "gold linker",
|
||||||
|
@ -1170,6 +1170,11 @@ defineTest(qtConfPrepareCompileTestSource) {
|
|||||||
"}"
|
"}"
|
||||||
write_file($$test_dir/main.$$suffix, contents)|error()
|
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
|
# Create stub .pro file
|
||||||
contents = "SOURCES = main.$$suffix"
|
contents = "SOURCES = main.$$suffix"
|
||||||
# Custom project code
|
# Custom project code
|
||||||
|
Loading…
Reference in New Issue
Block a user