diff options
| author | Cristian Adam <cristian.adam@gmail.com> | 2020-06-22 18:19:06 +0200 |
|---|---|---|
| committer | Cristian Adam <cristian.adam@qt.io> | 2020-06-24 19:05:58 +0000 |
| commit | 1d164c6dcbda5906d0e10137e81ea8f853e997b8 (patch) | |
| tree | 6f65df59e650fb9ef5c2bd4cc3a738aac8aa5846 /tests/auto/qml/qqmlmoduleplugin | |
| parent | 8a19c2c64dcc07221d4d4a88782d51cb2ec93995 (diff) | |
CMake: Fix tst_qqmlmoduleplugin for MinGW
Some of the pro files didn't have the CONFIG += plugin line, which
resulted in pro2cmake generating shared libraries for the respective
plugins.
The shared libraries had the "lib" prefix on MinGW, which caused the
plugin loading mechanism to fail.
Task-number: QTBUG-84886
Change-Id: I240967d918db13be45cf9b79bfcc989e9b826937
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlmoduleplugin')
5 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt index e74104e381..6b240a9291 100644 --- a/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/.prev_CMakeLists.txt @@ -30,6 +30,7 @@ qt_add_test(tst_qqmlmoduleplugin Qt::GuiPrivate Qt::Network Qt::QmlPrivate + Qt::QuickShapesPrivate TESTDATA ${test_data} ) @@ -89,3 +90,4 @@ add_subdirectory(plugin.2/childplugin) add_subdirectory(plugin.2.1/childplugin) add_subdirectory(plugin.2.2) add_subdirectory(moduleWithQmlSingleton) +add_subdirectory(optionalPlugin) diff --git a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt index abaf01573a..ce87292240 100644 --- a/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/nestedPlugin/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_cmake_library(nestedPlugin + MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../imports/org/qtproject/AutoTestQmlNestedPluginType" SOURCES nestedPlugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt index 95a9153499..d68158d95f 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2.1/childplugin/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_cmake_library(childplugin.2.1 # special case + MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2.1/ChildPlugin" SOURCES childplugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt index aeab9f84fa..d7675ba6f1 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin.2/childplugin/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_cmake_library(childplugin.2 # special case + MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType.2/ChildPlugin" SOURCES childplugin.cpp diff --git a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt index bc7d85029a..962471f304 100644 --- a/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt +++ b/tests/auto/qml/qqmlmoduleplugin/plugin/childplugin/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### qt_add_cmake_library(childplugin + MODULE # special case OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/../../imports/org/qtproject/AutoTestQmlPluginType/ChildPlugin" SOURCES childplugin.cpp |