From 9bcd137da0c5cc3e61736d7c1d959605f1b31447 Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Thu, 14 Jul 2022 15:42:05 +0200 Subject: 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 Reviewed-by: Ulf Hermann --- tests/auto/qml/qmlbasicapp/CMakeLists.txt | 4 +-- .../qml/qmlbasicapp/TimeExample/CMakeLists.txt | 22 ------------ tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml | 6 ---- tests/auto/qml/qmlbasicapp/TimeExample/center.png | Bin 765 -> 0 bytes tests/auto/qml/qmlbasicapp/TimeExample/clock.png | Bin 20653 -> 0 bytes tests/auto/qml/qmlbasicapp/TimeExample/hour.png | Bin 518 -> 0 bytes tests/auto/qml/qmlbasicapp/TimeExample/minute.png | Bin 528 -> 0 bytes .../auto/qml/qmlbasicapp/TimeExample/timemodel.cpp | 27 --------------- tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h | 38 --------------------- .../qml/qmlbasicapp/TimeExample2/CMakeLists.txt | 22 ++++++++++++ tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml | 6 ++++ tests/auto/qml/qmlbasicapp/TimeExample2/center.png | Bin 0 -> 765 bytes tests/auto/qml/qmlbasicapp/TimeExample2/clock.png | Bin 0 -> 20653 bytes tests/auto/qml/qmlbasicapp/TimeExample2/hour.png | Bin 0 -> 518 bytes tests/auto/qml/qmlbasicapp/TimeExample2/minute.png | Bin 0 -> 528 bytes .../qml/qmlbasicapp/TimeExample2/timemodel.cpp | 27 +++++++++++++++ .../auto/qml/qmlbasicapp/TimeExample2/timemodel.h | 38 +++++++++++++++++++++ tests/auto/qml/qmlbasicapp/main.qml | 2 +- tests/auto/qml/qmlbasicapp/manual_imports.cpp | 2 +- tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp | 38 ++++++++++----------- 20 files changed, 116 insertions(+), 116 deletions(-) delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/center.png delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/clock.png delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/hour.png delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/minute.png delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp delete mode 100644 tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/center.png create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/clock.png create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/hour.png create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/minute.png create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp create mode 100644 tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h (limited to 'tests/auto/qml/qmlbasicapp') diff --git a/tests/auto/qml/qmlbasicapp/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/CMakeLists.txt index 35b0bcfa1d..4926dc3e2b 100644 --- a/tests/auto/qml/qmlbasicapp/CMakeLists.txt +++ b/tests/auto/qml/qmlbasicapp/CMakeLists.txt @@ -18,7 +18,7 @@ qt6_add_qml_module(tst_qmlbasicapp ) add_subdirectory(BasicExtension) -add_subdirectory(TimeExample) +add_subdirectory(TimeExample2) if(QT6_IS_SHARED_LIBS_BUILD) # Plugins are static, but qt6_import_qml_plugins() can't be used because @@ -26,7 +26,7 @@ if(QT6_IS_SHARED_LIBS_BUILD) target_sources(tst_qmlbasicapp PRIVATE manual_imports.cpp) target_link_libraries(tst_qmlbasicapp PRIVATE additional_qml_module_plugin - qmlqtimeexampleplugin + qmlqtimeexample2plugin ) else() # For fully static builds, let qmlimportscanner take care of everything diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt deleted file mode 100644 index bfb32ee2c9..0000000000 --- a/tests/auto/qml/qmlbasicapp/TimeExample/CMakeLists.txt +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 - -qt6_add_library(qmlqtimeexample STATIC) -qt_autogen_tools_initial_setup(qmlqtimeexample) -qt6_add_qml_module(qmlqtimeexample - VERSION 1.0 - URI "TimeExample" - RESOURCE_PREFIX "/" - SOURCES - timemodel.cpp timemodel.h - QML_FILES - Clock.qml - RESOURCES - center.png - clock.png - hour.png - minute.png - DEPENDENCIES - QtQml -) -qt_autogen_tools_initial_setup(qmlqtimeexampleplugin) diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml b/tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml deleted file mode 100644 index 3ee53b9c0b..0000000000 --- a/tests/auto/qml/qmlbasicapp/TimeExample/Clock.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQml - -QtObject { - property int hours: -1 - property int minutes: -1 -} diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/center.png b/tests/auto/qml/qmlbasicapp/TimeExample/center.png deleted file mode 100644 index 7fbd802a44..0000000000 Binary files a/tests/auto/qml/qmlbasicapp/TimeExample/center.png and /dev/null differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/clock.png b/tests/auto/qml/qmlbasicapp/TimeExample/clock.png deleted file mode 100644 index 462edacc0e..0000000000 Binary files a/tests/auto/qml/qmlbasicapp/TimeExample/clock.png and /dev/null differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/hour.png b/tests/auto/qml/qmlbasicapp/TimeExample/hour.png deleted file mode 100644 index 9f33fc5d48..0000000000 Binary files a/tests/auto/qml/qmlbasicapp/TimeExample/hour.png and /dev/null differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/minute.png b/tests/auto/qml/qmlbasicapp/TimeExample/minute.png deleted file mode 100644 index e2f216c897..0000000000 Binary files a/tests/auto/qml/qmlbasicapp/TimeExample/minute.png and /dev/null differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp b/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp deleted file mode 100644 index 7f2736a76b..0000000000 --- a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.cpp +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#include "timemodel.h" - -void TimeModel::timerEvent(QTimerEvent *) -{ - const QTime now = QTime::currentTime(); - if (now.second() == 59 - && now.minute() == m_time.value().minute() - && now.hour() == m_time.value().hour()) { - // just missed time tick over, force it, wait extra 0.5 seconds - timer.start(60500, this); - } else { - timer.start(60000 - m_time.value().second() * 1000, this); - } - m_time = now; -} - -TimeModel::TimeModel(QObject *parent) - : QObject(parent) - , m_time(QTime::currentTime()) -{ - m_minute.setBinding([this]() { return m_time.value().minute(); }); - m_hour.setBinding([this]() { return m_time.value().hour(); }); - timer.start(60000 - m_time.value().second() * 1000, this); -} diff --git a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h b/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h deleted file mode 100644 index b42542be31..0000000000 --- a/tests/auto/qml/qmlbasicapp/TimeExample/timemodel.h +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause - -#ifndef TIMEMODEL_H -#define TIMEMODEL_H - -#include -#include -#include -#include -#include - -class TimeModel : public QObject -{ - Q_OBJECT - Q_PROPERTY(int hour READ hour BINDABLE hourBindable FINAL) - Q_PROPERTY(int minute READ minute BINDABLE minuteBindable FINAL) - QML_NAMED_ELEMENT(Time) - -public: - TimeModel(QObject *parent=nullptr); - - int minute() const { return m_minute.value(); } - int hour() const { return m_hour.value(); } - - QBindable hourBindable() { return QBindable(&m_hour); } - QBindable minuteBindable() { return QBindable(&m_minute); } - -private: - void timerEvent(QTimerEvent *) override; - - QProperty m_minute; - QProperty m_hour; - QProperty m_time; - QBasicTimer timer; -}; - -#endif // TIMEMODEL_H diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt new file mode 100644 index 0000000000..060eb1edb8 --- /dev/null +++ b/tests/auto/qml/qmlbasicapp/TimeExample2/CMakeLists.txt @@ -0,0 +1,22 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0 + +qt6_add_library(qmlqtimeexample2 STATIC) +qt_autogen_tools_initial_setup(qmlqtimeexample2) +qt6_add_qml_module(qmlqtimeexample2 + VERSION 1.0 + URI "TimeExample2" + RESOURCE_PREFIX "/" + SOURCES + timemodel.cpp timemodel.h + QML_FILES + Clock.qml + RESOURCES + center.png + clock.png + hour.png + minute.png + DEPENDENCIES + QtQml +) +qt_autogen_tools_initial_setup(qmlqtimeexample2plugin) diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml b/tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml new file mode 100644 index 0000000000..3ee53b9c0b --- /dev/null +++ b/tests/auto/qml/qmlbasicapp/TimeExample2/Clock.qml @@ -0,0 +1,6 @@ +import QtQml + +QtObject { + property int hours: -1 + property int minutes: -1 +} diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/center.png b/tests/auto/qml/qmlbasicapp/TimeExample2/center.png new file mode 100644 index 0000000000..7fbd802a44 Binary files /dev/null and b/tests/auto/qml/qmlbasicapp/TimeExample2/center.png differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/clock.png b/tests/auto/qml/qmlbasicapp/TimeExample2/clock.png new file mode 100644 index 0000000000..462edacc0e Binary files /dev/null and b/tests/auto/qml/qmlbasicapp/TimeExample2/clock.png differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/hour.png b/tests/auto/qml/qmlbasicapp/TimeExample2/hour.png new file mode 100644 index 0000000000..9f33fc5d48 Binary files /dev/null and b/tests/auto/qml/qmlbasicapp/TimeExample2/hour.png differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/minute.png b/tests/auto/qml/qmlbasicapp/TimeExample2/minute.png new file mode 100644 index 0000000000..e2f216c897 Binary files /dev/null and b/tests/auto/qml/qmlbasicapp/TimeExample2/minute.png differ diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp new file mode 100644 index 0000000000..7f2736a76b --- /dev/null +++ b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.cpp @@ -0,0 +1,27 @@ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#include "timemodel.h" + +void TimeModel::timerEvent(QTimerEvent *) +{ + const QTime now = QTime::currentTime(); + if (now.second() == 59 + && now.minute() == m_time.value().minute() + && now.hour() == m_time.value().hour()) { + // just missed time tick over, force it, wait extra 0.5 seconds + timer.start(60500, this); + } else { + timer.start(60000 - m_time.value().second() * 1000, this); + } + m_time = now; +} + +TimeModel::TimeModel(QObject *parent) + : QObject(parent) + , m_time(QTime::currentTime()) +{ + m_minute.setBinding([this]() { return m_time.value().minute(); }); + m_hour.setBinding([this]() { return m_time.value().hour(); }); + timer.start(60000 - m_time.value().second() * 1000, this); +} diff --git a/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h new file mode 100644 index 0000000000..b42542be31 --- /dev/null +++ b/tests/auto/qml/qmlbasicapp/TimeExample2/timemodel.h @@ -0,0 +1,38 @@ +// Copyright (C) 2017 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +#ifndef TIMEMODEL_H +#define TIMEMODEL_H + +#include +#include +#include +#include +#include + +class TimeModel : public QObject +{ + Q_OBJECT + Q_PROPERTY(int hour READ hour BINDABLE hourBindable FINAL) + Q_PROPERTY(int minute READ minute BINDABLE minuteBindable FINAL) + QML_NAMED_ELEMENT(Time) + +public: + TimeModel(QObject *parent=nullptr); + + int minute() const { return m_minute.value(); } + int hour() const { return m_hour.value(); } + + QBindable hourBindable() { return QBindable(&m_hour); } + QBindable minuteBindable() { return QBindable(&m_minute); } + +private: + void timerEvent(QTimerEvent *) override; + + QProperty m_minute; + QProperty m_hour; + QProperty m_time; + QBasicTimer timer; +}; + +#endif // TIMEMODEL_H diff --git a/tests/auto/qml/qmlbasicapp/main.qml b/tests/auto/qml/qmlbasicapp/main.qml index b9e61c39bc..37598a5235 100644 --- a/tests/auto/qml/qmlbasicapp/main.qml +++ b/tests/auto/qml/qmlbasicapp/main.qml @@ -1,7 +1,7 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause -import TimeExample // import types from the plugin +import TimeExample2 // import types from the plugin import BasicExtension Clock { // this class is defined in QML (Clock.qml) diff --git a/tests/auto/qml/qmlbasicapp/manual_imports.cpp b/tests/auto/qml/qmlbasicapp/manual_imports.cpp index f1b30f8352..61df826af4 100644 --- a/tests/auto/qml/qmlbasicapp/manual_imports.cpp +++ b/tests/auto/qml/qmlbasicapp/manual_imports.cpp @@ -3,5 +3,5 @@ #include -Q_IMPORT_QML_PLUGIN(TimeExamplePlugin) +Q_IMPORT_QML_PLUGIN(TimeExample2Plugin) Q_IMPORT_QML_PLUGIN(BasicExtension) diff --git a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp index 7bb7628587..6d61d4d7a3 100644 --- a/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp +++ b/tests/auto/qml/qmlbasicapp/tst_qmlbasicapp.cpp @@ -48,15 +48,15 @@ void tst_basicapp::resourceFiles() { QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/main.qml"))); QVERIFY(QFile::exists(QStringLiteral(":/BasicApp/qmldir"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/Clock.qml"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/center.png"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/clock.png"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/hour.png"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/minute.png"))); - QVERIFY(QFile::exists(QStringLiteral(":/TimeExample/qmldir"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/Clock.qml"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/center.png"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/clock.png"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/hour.png"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/minute.png"))); + QVERIFY(QFile::exists(QStringLiteral(":/TimeExample2/qmldir"))); QVERIFY(!QFile::exists(QStringLiteral(":/BasicApp/tst_qmlbasicapp.qmltypes"))); - QVERIFY(!QFile::exists(QStringLiteral(":/TimeExample/qmlqtimeexample.qmltypes"))); + QVERIFY(!QFile::exists(QStringLiteral(":/TimeExample2/qmlqtimeexample2.qmltypes"))); } void tst_basicapp::fileSystemFiles() @@ -68,14 +68,14 @@ void tst_basicapp::fileSystemFiles() QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/main.qml"))); QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/qmldir"))); QVERIFY(QFile::exists(basedir + QStringLiteral("/BasicApp/tst_qmlbasicapp.qmltypes"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/Clock.qml"))); - - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/center.png"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/clock.png"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/hour.png"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/minute.png"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/qmldir"))); - QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample/qmlqtimeexample.qmltypes"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/Clock.qml"))); + + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/center.png"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/clock.png"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/hour.png"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/minute.png"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmldir"))); + QVERIFY(QFile::exists(basedir + QStringLiteral("/TimeExample2/qmlqtimeexample2.qmltypes"))); } void tst_basicapp::qmldirContents() @@ -101,18 +101,18 @@ void tst_basicapp::qmldirContents() } { - QFile qmldir(basedir + "/TimeExample/qmldir"); + QFile qmldir(basedir + "/TimeExample2/qmldir"); QVERIFY(qmldir.open(QIODevice::ReadOnly)); const QByteArray contents = qmldir.readAll(); - QVERIFY(contents.contains("module TimeExample")); + QVERIFY(contents.contains("module TimeExample2")); QVERIFY(contents.contains("optional plugin")); QVERIFY(contents.contains("classname")); QVERIFY(contents.contains("typeinfo")); QVERIFY(contents.contains("depends QtQml")); - QVERIFY(contents.contains("prefer :/TimeExample/")); + QVERIFY(contents.contains("prefer :/TimeExample2/")); QVERIFY(contents.contains("Clock 1.0 Clock.qml")); - QFile qmldirInResources(":/TimeExample/qmldir"); + QFile qmldirInResources(":/TimeExample2/qmldir"); QVERIFY(qmldirInResources.open(QIODevice::ReadOnly)); QCOMPARE(qmldirInResources.readAll(), contents); } -- cgit v1.2.3