Skip to content
Snippets Groups Projects
Commit f0ff6102 authored by Tobias C. Berner's avatar Tobias C. Berner
Browse files

x11-toolkits/qt5-declarative-test: fix packaging

When x11-toolkits/qt5-declarative-test was split out of
x11-toolkits/qt5-declarative in 4d10eef6 a handfull of
files got dropped unnoticed.

KDE's CI systems noticed this issue a while back as QtQuick test cases
would no longer work.

This change now again makes sure to install the QtQuick-Test related QML
files so that these should again work.

Reported by:		KDE
parent 7b3c5065
No related branches found
No related tags found
No related merge requests found
PORTNAME= declarative-test
PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH}
PORTREVISION= 1
CATEGORIES= x11-toolkits
PKGNAMEPREFIX= qt5-
......
--- src/imports/imports.pro.orig 2022-03-08 11:32:59 UTC
+++ src/imports/imports.pro
@@ -1,34 +1,4 @@
TEMPLATE = subdirs
QT_FOR_CONFIG += qml-private
-SUBDIRS += \
- builtins \
- qtqml \
- models \
- labsmodels
-
-qtConfig(qml-itemmodel): SUBDIRS += folderlistmodel
-qtConfig(qml-worker-script): SUBDIRS += workerscript
-qtHaveModule(sql): SUBDIRS += localstorage
-qtConfig(settings): SUBDIRS += settings
-qtConfig(statemachine): SUBDIRS += statemachine
-
-qtHaveModule(quick) {
- QT_FOR_CONFIG += quick-private
-
- SUBDIRS += \
- labsanimation \
- layouts \
- qtquick2 \
- window
-
- qtConfig(quick-shadereffect): SUBDIRS += wavefrontmesh
-
- qtHaveModule(testlib): SUBDIRS += testlib
- qtConfig(systemsemaphore): SUBDIRS += sharedimage
- qtConfig(quick-particles): \
- SUBDIRS += particles
-
- qtConfig(quick-path): SUBDIRS += shapes
-}
-
+SUBDIRS= testlib
--- src/src.pro.orig 2021-09-24 07:19:35 UTC
--- src/src.pro.orig 2021-11-16 21:43:56 UTC
+++ src/src.pro
@@ -7,40 +7,6 @@ QT_FOR_CONFIG += qml qml-private quick-private
@@ -7,40 +7,7 @@ QT_FOR_CONFIG += qml qml-private quick-private
# Otherwise we cannot compile qmltyperegistrar
requires(qtConfig(commandlineparser))
......@@ -39,6 +39,7 @@
- QT_FOR_CONFIG += network
- qtConfig(thread):qtConfig(localserver):qtConfig(qml-debug): SUBDIRS += qmldebug
-}
+SUBDIRS += qmltest
+SUBDIRS += qmltest \
+ imports
DISTFILES += sync.profile configure.json
......@@ -22,4 +22,11 @@
%%QT_MKSPECDIR%%/modules/qt_lib_qmltest_private.pri
%%QT_QMLDIR%%/Qt/test/qtestroot/plugins.qmltypes
%%QT_QMLDIR%%/Qt/test/qtestroot/qmldir
%%QT_QMLDIR%%/QtTest/SignalSpy.qml
%%QT_QMLDIR%%/QtTest/TestCase.qml
%%QT_QMLDIR%%/QtTest/libqmltestplugin.so
%%QT_QMLDIR%%/QtTest/libqmltestplugin.so.debug
%%QT_QMLDIR%%/QtTest/plugins.qmltypes
%%QT_QMLDIR%%/QtTest/qmldir
%%QT_QMLDIR%%/QtTest/testlogger.js
libdata/pkgconfig/Qt5QuickTest.pc
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment