qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
qtdeclarative/tests/auto/qml/qmlbasicapp/manual_imports.cpp

8 lines
254 B
C++
Raw Normal View History

Use SPDX license identifiers Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Pick-to: 6.4 Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
2022-05-13 13:12:05 +00:00
// Copyright (C) 2021 The Qt Company Ltd.
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
Fix plugin importing in tst_qmlbasicapp We get no automatic static plugin importing and linking for QML, so we have to do it manually ourselves. This includes all of the Qt QML modules we reference too. This also uncovered that the tst_qmlbasicapp test requires QtQuick, but no check was added in ccd3907b12810742d8897bc51de6ddfaa6a5e619 where the dependency was introduced. Add that check so that the test is now only added if QtQuick is enabled. And because the tst_qmlbasicapp test defines static plugins, we need CMake 3.21 or later to avoid linker command line ordering issues. Make adding the test conditional on that too. Pick-to: 6.2 Change-Id: I0f41352fb2fe9bd6548bf30eb8ed93366cefd263 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-28 07:58:07 +00:00
#include <QtQml/qqmlextensionplugin.h>
Avoid target name conflict The qmlqtimeexampleplugin exists as a target name both in examples and in a test; rename the one from the test. Change-Id: I21b68f7d6228ceaee49ba28e55516b5b10ffce3a Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2022-07-14 13:42:05 +00:00
Q_IMPORT_QML_PLUGIN(TimeExample2Plugin)
Fix plugin importing in tst_qmlbasicapp We get no automatic static plugin importing and linking for QML, so we have to do it manually ourselves. This includes all of the Qt QML modules we reference too. This also uncovered that the tst_qmlbasicapp test requires QtQuick, but no check was added in ccd3907b12810742d8897bc51de6ddfaa6a5e619 where the dependency was introduced. Add that check so that the test is now only added if QtQuick is enabled. And because the tst_qmlbasicapp test defines static plugins, we need CMake 3.21 or later to avoid linker command line ordering issues. Make adding the test conditional on that too. Pick-to: 6.2 Change-Id: I0f41352fb2fe9bd6548bf30eb8ed93366cefd263 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
2021-07-28 07:58:07 +00:00
Q_IMPORT_QML_PLUGIN(BasicExtension)