diff --git a/tests/modules/modulesqt6_3.cpp b/tests/modules/modulesqt6_3.cpp index 14b77e4..1890e7f 100644 --- a/tests/modules/modulesqt6_3.cpp +++ b/tests/modules/modulesqt6_3.cpp @@ -865,55 +865,30 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const { #ifdef Q_OS_WIN Tree += utils.createTree( { + "./" + distDir + "/Qt6Core.dll", + "./" + distDir + "/Qt6Gui.dll", + "./" + distDir + "/Qt6Svg.dll", + "./" + distDir + "/Qt6Widgets.dll", "./" + distDir + "/QtWidgetsProject.bat", "./" + distDir + "/QtWidgetsProject.exe", + "./" + distDir + "/libgcc_s_seh-1.dll", + "./" + distDir + "/libstdc++-6.dll", + "./" + distDir + "/libwinpthread-1.dll", + "./" + distDir + "/plugins/iconengines/qsvgicon.dll", + "./" + distDir + "/plugins/imageformats/qgif.dll", + "./" + distDir + "/plugins/imageformats/qicns.dll", + "./" + distDir + "/plugins/imageformats/qico.dll", + "./" + distDir + "/plugins/imageformats/qjpeg.dll", + "./" + distDir + "/plugins/imageformats/qsvg.dll", + "./" + distDir + "/plugins/imageformats/qtga.dll", + "./" + distDir + "/plugins/imageformats/qtiff.dll", + "./" + distDir + "/plugins/imageformats/qwbmp.dll", + "./" + distDir + "/plugins/imageformats/qwebp.dll", + "./" + distDir + "/plugins/platforms/qminimal.dll", + "./" + distDir + "/plugins/platforms/qoffscreen.dll", + "./" + distDir + "/plugins/platforms/qwindows.dll", + "./" + distDir + "/plugins/styles/qwindowsvistastyle.dll", "./" + distDir + "/qt.conf", - "./" + distDir + "/Qt6Core.so", - "./" + distDir + "/Qt6DBus.so", - "./" + distDir + "/Qt6EglFSDeviceIntegration.so", - "./" + distDir + "/Qt6Gui.so", - "./" + distDir + "/Qt6Network.so", - "./" + distDir + "/Qt6OpenGL.so", - "./" + distDir + "/Qt6Pdf.so", - "./" + distDir + "/Qt6Svg.so", - "./" + distDir + "/Qt6WaylandClient.so", - "./" + distDir + "/Qt6WaylandEglClientHwIntegration.so", - "./" + distDir + "/Qt6Widgets.so", - "./" + distDir + "/Qt6WlShellIntegration.so", - "./" + distDir + "/Qt6XcbQpa.so", - "./" + distDir + "/lib/libicudata.so", - "./" + distDir + "/lib/libicui18n.so", - "./" + distDir + "/lib/libicuuc.so", - "./" + distDir + "/plugins/iconengines/libqsvgicon.so", - "./" + distDir + "/plugins/imageformats/libqgif.so", - "./" + distDir + "/plugins/imageformats/libqicns.so", - "./" + distDir + "/plugins/imageformats/libqico.so", - "./" + distDir + "/plugins/imageformats/libqjpeg.so", - "./" + distDir + "/plugins/imageformats/libqpdf.so", - "./" + distDir + "/plugins/imageformats/libqsvg.so", - "./" + distDir + "/plugins/imageformats/libqtga.so", - "./" + distDir + "/plugins/imageformats/libqtiff.so", - "./" + distDir + "/plugins/imageformats/libqwbmp.so", - "./" + distDir + "/plugins/imageformats/libqwebp.so", - "./" + distDir + "/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so", - "./" + distDir + "/plugins/platforminputcontexts/libibusplatforminputcontextplugin.so", - "./" + distDir + "/plugins/platforms/libqeglfs.so", - "./" + distDir + "/plugins/platforms/libqlinuxfb.so", - "./" + distDir + "/plugins/platforms/libqminimal.so", - "./" + distDir + "/plugins/platforms/libqminimalegl.so", - "./" + distDir + "/plugins/platforms/libqoffscreen.so", - "./" + distDir + "/plugins/platforms/libqwayland-egl.so", - "./" + distDir + "/plugins/platforms/libqwayland-generic.so", - "./" + distDir + "/plugins/platforms/libqxcb.so", - "./" + distDir + "/plugins/platformthemes/libqgtk3.so", - "./" + distDir + "/plugins/platformthemes/libqxdgdesktopportal.so", - "./" + distDir + "/plugins/wayland-shell-integration/libfullscreen-shell-v1.so", - "./" + distDir + "/plugins/wayland-shell-integration/libivi-shell.so", - "./" + distDir + "/plugins/wayland-shell-integration/libqt-shell.so", - "./" + distDir + "/plugins/wayland-shell-integration/libwl-shell-plugin.so", - "./" + distDir + "/plugins/wayland-shell-integration/libxdg-shell.so", - "./" + distDir + "/plugins/xcbglintegrations/libqxcb-egl-integration.so", - "./" + distDir + "/plugins/xcbglintegrations/libqxcb-glx-integration.so", "./" + distDir + "/translations/qtbase_ar.qm", "./" + distDir + "/translations/qtbase_bg.qm", "./" + distDir + "/translations/qtbase_ca.qm", @@ -943,8 +918,7 @@ QSet<QString> ModulesQt63::qtLibs(const QString &distDir) const { "./" + distDir + "/translations/qtbase_uk.qm", "./" + distDir + "/translations/qtbase_zh_CN.qm", "./" + distDir + "/translations/qtbase_zh_TW.qm" - - }); + }); #else Tree += utils.createTree( @@ -1044,32 +1018,6 @@ QSet<QString> ModulesQt63::qmlVirtualKeyBoadrLibs(const QString &distDir) const #ifdef Q_OS_WIN Tree += utils.createTree( { - "./" + distDir + "/basic.sh", - "./" + distDir + "/bin/basic", - "./" + distDir + "/lib/libQt6LabsFolderListModel.so", - "./" + distDir + "/lib/libQt6QuickLayouts.so", - "./" + distDir + "/lib/libQt6VirtualKeyboard.so", - "./" + distDir + "/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so", - "./" + distDir + "/plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so", - "./" + distDir + "/plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so", - "./" + distDir + "/plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so", - "./" + distDir + "/plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so", - "./" + distDir + "/plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so", - "./" + distDir + "/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.so", - "./" + distDir + "/qml/Qt/labs/folderlistmodel/plugins.qmltypes", - "./" + distDir + "/qml/Qt/labs/folderlistmodel/qmldir", - "./" + distDir + "/qml/QtQuick/Layouts/libqquicklayoutsplugin.so", - "./" + distDir + "/qml/QtQuick/Layouts/plugins.qmltypes", - "./" + distDir + "/qml/QtQuick/Layouts/qmldir", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Settings/plugins.qmltypes", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Settings/qmldir", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Styles/plugins.qmltypes", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/Styles/qmldir", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/plugins.qmltypes", - "./" + distDir + "/qml/QtQuick/VirtualKeyboard/qmldir" } ); @@ -1122,106 +1070,7 @@ QSet<QString> ModulesQt63::qtWebEngine(const QString &distDir) const #ifdef Q_OS_WIN Tree += utils.createTree( - { - "./" + distDir + "/bin/QtWebEngineProcess", - "./" + distDir + "/bin/quicknanobrowser", - "./" + distDir + "/lib/libQt6LabsSettings.so", - "./" + distDir + "/lib/libQt6Positioning.so", - "./" + distDir + "/lib/libQt6QuickLayouts.so", - "./" + distDir + "/lib/libQt6SerialPort.so", - "./" + distDir + "/lib/libQt6WebChannel.so", - "./" + distDir + "/lib/libQt6WebEngineCore.so", - "./" + distDir + "/lib/libQt6WebEngineQuick.so", - "./" + distDir + "/plugins/position/libqtposition_geoclue2.so", - "./" + distDir + "/plugins/position/libqtposition_nmea.so", - "./" + distDir + "/plugins/position/libqtposition_positionpoll.so", - "./" + distDir + "/qml/Qt/labs/settings/libqmlsettingsplugin.so", - "./" + distDir + "/qml/Qt/labs/settings/plugins.qmltypes", - "./" + distDir + "/qml/Qt/labs/settings/qmldir", - "./" + distDir + "/qml/QtQuick/Layouts/libqquicklayoutsplugin.so", - "./" + distDir + "/qml/QtQuick/Layouts/plugins.qmltypes", - "./" + distDir + "/qml/QtQuick/Layouts/qmldir", - "./" + distDir + "/qml/QtWebEngine/libqtwebenginequickplugin.so", - "./" + distDir + "/qml/QtWebEngine/plugins.qmltypes", - "./" + distDir + "/qml/QtWebEngine/qmldir", - "./" + distDir + "/quicknanobrowser.sh", - "./" + distDir + "/resources/icudtl.dat", - "./" + distDir + "/resources/qtwebengine_devtools_resources.pak", - "./" + distDir + "/resources/qtwebengine_resources.pak", - "./" + distDir + "/resources/qtwebengine_resources_100p.pak", - "./" + distDir + "/resources/qtwebengine_resources_200p.pak", - "./" + distDir + "/translations/qtserialport_de.qm", - "./" + distDir + "/translations/qtserialport_en.qm", - "./" + distDir + "/translations/qtserialport_es.qm", - "./" + distDir + "/translations/qtserialport_ja.qm", - "./" + distDir + "/translations/qtserialport_ko.qm", - "./" + distDir + "/translations/qtserialport_pl.qm", - "./" + distDir + "/translations/qtserialport_ru.qm", - "./" + distDir + "/translations/qtserialport_uk.qm", - "./" + distDir + "/translations/qtwebengine_ca.qm", - "./" + distDir + "/translations/qtwebengine_de.qm", - "./" + distDir + "/translations/qtwebengine_en.qm", - "./" + distDir + "/translations/qtwebengine_es.qm", - "./" + distDir + "/translations/qtwebengine_ko.qm", - "./" + distDir + "/translations/qtwebengine_locales/am.pak", - "./" + distDir + "/translations/qtwebengine_locales/ar.pak", - "./" + distDir + "/translations/qtwebengine_locales/bg.pak", - "./" + distDir + "/translations/qtwebengine_locales/bn.pak", - "./" + distDir + "/translations/qtwebengine_locales/ca.pak", - "./" + distDir + "/translations/qtwebengine_locales/cs.pak", - "./" + distDir + "/translations/qtwebengine_locales/da.pak", - "./" + distDir + "/translations/qtwebengine_locales/de.pak", - "./" + distDir + "/translations/qtwebengine_locales/el.pak", - "./" + distDir + "/translations/qtwebengine_locales/en-GB.pak", - "./" + distDir + "/translations/qtwebengine_locales/en-US.pak", - "./" + distDir + "/translations/qtwebengine_locales/es-419.pak", - "./" + distDir + "/translations/qtwebengine_locales/es.pak", - "./" + distDir + "/translations/qtwebengine_locales/et.pak", - "./" + distDir + "/translations/qtwebengine_locales/fa.pak", - "./" + distDir + "/translations/qtwebengine_locales/fi.pak", - "./" + distDir + "/translations/qtwebengine_locales/fil.pak", - "./" + distDir + "/translations/qtwebengine_locales/fr.pak", - "./" + distDir + "/translations/qtwebengine_locales/gu.pak", - "./" + distDir + "/translations/qtwebengine_locales/he.pak", - "./" + distDir + "/translations/qtwebengine_locales/hi.pak", - "./" + distDir + "/translations/qtwebengine_locales/hr.pak", - "./" + distDir + "/translations/qtwebengine_locales/hu.pak", - "./" + distDir + "/translations/qtwebengine_locales/id.pak", - "./" + distDir + "/translations/qtwebengine_locales/it.pak", - "./" + distDir + "/translations/qtwebengine_locales/ja.pak", - "./" + distDir + "/translations/qtwebengine_locales/kn.pak", - "./" + distDir + "/translations/qtwebengine_locales/ko.pak", - "./" + distDir + "/translations/qtwebengine_locales/lt.pak", - "./" + distDir + "/translations/qtwebengine_locales/lv.pak", - "./" + distDir + "/translations/qtwebengine_locales/ml.pak", - "./" + distDir + "/translations/qtwebengine_locales/mr.pak", - "./" + distDir + "/translations/qtwebengine_locales/ms.pak", - "./" + distDir + "/translations/qtwebengine_locales/nb.pak", - "./" + distDir + "/translations/qtwebengine_locales/nl.pak", - "./" + distDir + "/translations/qtwebengine_locales/pl.pak", - "./" + distDir + "/translations/qtwebengine_locales/pt-BR.pak", - "./" + distDir + "/translations/qtwebengine_locales/pt-PT.pak", - "./" + distDir + "/translations/qtwebengine_locales/ro.pak", - "./" + distDir + "/translations/qtwebengine_locales/ru.pak", - "./" + distDir + "/translations/qtwebengine_locales/sk.pak", - "./" + distDir + "/translations/qtwebengine_locales/sl.pak", - "./" + distDir + "/translations/qtwebengine_locales/sr.pak", - "./" + distDir + "/translations/qtwebengine_locales/sv.pak", - "./" + distDir + "/translations/qtwebengine_locales/sw.pak", - "./" + distDir + "/translations/qtwebengine_locales/ta.pak", - "./" + distDir + "/translations/qtwebengine_locales/te.pak", - "./" + distDir + "/translations/qtwebengine_locales/th.pak", - "./" + distDir + "/translations/qtwebengine_locales/tr.pak", - "./" + distDir + "/translations/qtwebengine_locales/uk.pak", - "./" + distDir + "/translations/qtwebengine_locales/vi.pak", - "./" + distDir + "/translations/qtwebengine_locales/zh-CN.pak", - "./" + distDir + "/translations/qtwebengine_locales/zh-TW.pak", - "./" + distDir + "/translations/qtwebengine_pl.qm", - "./" + distDir + "/translations/qtwebengine_ru.qm", - "./" + distDir + "/translations/qtwebengine_uk.qm", - "./" + distDir + "/translations/qtwebengine_zh_CN.qm" - } - + {} ); #else @@ -1340,140 +1189,6 @@ QSet<QString> ModulesQt63::qtWebEngineWidgets(const QString &distDir) const { #ifdef Q_OS_WIN Tree += utils.createTree( { - "./" + distDir + "/bin/QtWebEngineProcess", - "./" + distDir + "/bin/webui", - "./" + distDir + "/lib/libQt6Positioning.so", - "./" + distDir + "/lib/libQt6PrintSupport.so", - "./" + distDir + "/lib/libQt6Qml.so", - "./" + distDir + "/lib/libQt6QmlModels.so", - "./" + distDir + "/lib/libQt6Quick.so", - "./" + distDir + "/lib/libQt6QuickWidgets.so", - "./" + distDir + "/lib/libQt6SerialPort.so", - "./" + distDir + "/lib/libQt6WaylandCompositor.so", - "./" + distDir + "/lib/libQt6WaylandEglCompositorHwIntegration.so", - "./" + distDir + "/lib/libQt6WebChannel.so", - "./" + distDir + "/lib/libQt6WebEngineCore.so", - "./" + distDir + "/lib/libQt6WebEngineWidgets.so", - "./" + distDir + "/plugins/position/libqtposition_geoclue2.so", - "./" + distDir + "/plugins/position/libqtposition_nmea.so", - "./" + distDir + "/plugins/position/libqtposition_positionpoll.so", - "./" + distDir + "/plugins/printsupport/libcupsprintersupport.so", - "./" + distDir + "/plugins/tls/libqcertonlybackend.so", - "./" + distDir + "/plugins/tls/libqopensslbackend.so", - "./" + distDir + "/plugins/wayland-decoration-client/libbradient.so", - "./" + distDir + "/plugins/wayland-graphics-integration-client/libdmabuf-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-client/libdrm-egl-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so", - "./" + distDir + "/plugins/wayland-graphics-integration-client/libshm-emulation-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-client/libvulkan-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so", - "./" + distDir + "/plugins/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so", - "./" + distDir + "/resources/icudtl.dat", - "./" + distDir + "/resources/qtwebengine_devtools_resources.pak", - "./" + distDir + "/resources/qtwebengine_resources.pak", - "./" + distDir + "/resources/qtwebengine_resources_100p.pak", - "./" + distDir + "/resources/qtwebengine_resources_200p.pak", - "./" + distDir + "/translations/qtdeclarative_ar.qm", - "./" + distDir + "/translations/qtdeclarative_bg.qm", - "./" + distDir + "/translations/qtdeclarative_ca.qm", - "./" + distDir + "/translations/qtdeclarative_da.qm", - "./" + distDir + "/translations/qtdeclarative_de.qm", - "./" + distDir + "/translations/qtdeclarative_en.qm", - "./" + distDir + "/translations/qtdeclarative_es.qm", - "./" + distDir + "/translations/qtdeclarative_fa.qm", - "./" + distDir + "/translations/qtdeclarative_fi.qm", - "./" + distDir + "/translations/qtdeclarative_fr.qm", - "./" + distDir + "/translations/qtdeclarative_hr.qm", - "./" + distDir + "/translations/qtdeclarative_hu.qm", - "./" + distDir + "/translations/qtdeclarative_ja.qm", - "./" + distDir + "/translations/qtdeclarative_ko.qm", - "./" + distDir + "/translations/qtdeclarative_lv.qm", - "./" + distDir + "/translations/qtdeclarative_nl.qm", - "./" + distDir + "/translations/qtdeclarative_nn.qm", - "./" + distDir + "/translations/qtdeclarative_pl.qm", - "./" + distDir + "/translations/qtdeclarative_pt_BR.qm", - "./" + distDir + "/translations/qtdeclarative_ru.qm", - "./" + distDir + "/translations/qtdeclarative_sk.qm", - "./" + distDir + "/translations/qtdeclarative_tr.qm", - "./" + distDir + "/translations/qtdeclarative_uk.qm", - "./" + distDir + "/translations/qtdeclarative_zh_CN.qm", - "./" + distDir + "/translations/qtdeclarative_zh_TW.qm", - "./" + distDir + "/translations/qtserialport_de.qm", - "./" + distDir + "/translations/qtserialport_en.qm", - "./" + distDir + "/translations/qtserialport_es.qm", - "./" + distDir + "/translations/qtserialport_ja.qm", - "./" + distDir + "/translations/qtserialport_ko.qm", - "./" + distDir + "/translations/qtserialport_pl.qm", - "./" + distDir + "/translations/qtserialport_ru.qm", - "./" + distDir + "/translations/qtserialport_uk.qm", - "./" + distDir + "/translations/qtwebengine_ca.qm", - "./" + distDir + "/translations/qtwebengine_de.qm", - "./" + distDir + "/translations/qtwebengine_en.qm", - "./" + distDir + "/translations/qtwebengine_es.qm", - "./" + distDir + "/translations/qtwebengine_ko.qm", - "./" + distDir + "/translations/qtwebengine_locales/am.pak", - "./" + distDir + "/translations/qtwebengine_locales/ar.pak", - "./" + distDir + "/translations/qtwebengine_locales/bg.pak", - "./" + distDir + "/translations/qtwebengine_locales/bn.pak", - "./" + distDir + "/translations/qtwebengine_locales/ca.pak", - "./" + distDir + "/translations/qtwebengine_locales/cs.pak", - "./" + distDir + "/translations/qtwebengine_locales/da.pak", - "./" + distDir + "/translations/qtwebengine_locales/de.pak", - "./" + distDir + "/translations/qtwebengine_locales/el.pak", - "./" + distDir + "/translations/qtwebengine_locales/en-GB.pak", - "./" + distDir + "/translations/qtwebengine_locales/en-US.pak", - "./" + distDir + "/translations/qtwebengine_locales/es-419.pak", - "./" + distDir + "/translations/qtwebengine_locales/es.pak", - "./" + distDir + "/translations/qtwebengine_locales/et.pak", - "./" + distDir + "/translations/qtwebengine_locales/fa.pak", - "./" + distDir + "/translations/qtwebengine_locales/fi.pak", - "./" + distDir + "/translations/qtwebengine_locales/fil.pak", - "./" + distDir + "/translations/qtwebengine_locales/fr.pak", - "./" + distDir + "/translations/qtwebengine_locales/gu.pak", - "./" + distDir + "/translations/qtwebengine_locales/he.pak", - "./" + distDir + "/translations/qtwebengine_locales/hi.pak", - "./" + distDir + "/translations/qtwebengine_locales/hr.pak", - "./" + distDir + "/translations/qtwebengine_locales/hu.pak", - "./" + distDir + "/translations/qtwebengine_locales/id.pak", - "./" + distDir + "/translations/qtwebengine_locales/it.pak", - "./" + distDir + "/translations/qtwebengine_locales/ja.pak", - "./" + distDir + "/translations/qtwebengine_locales/kn.pak", - "./" + distDir + "/translations/qtwebengine_locales/ko.pak", - "./" + distDir + "/translations/qtwebengine_locales/lt.pak", - "./" + distDir + "/translations/qtwebengine_locales/lv.pak", - "./" + distDir + "/translations/qtwebengine_locales/ml.pak", - "./" + distDir + "/translations/qtwebengine_locales/mr.pak", - "./" + distDir + "/translations/qtwebengine_locales/ms.pak", - "./" + distDir + "/translations/qtwebengine_locales/nb.pak", - "./" + distDir + "/translations/qtwebengine_locales/nl.pak", - "./" + distDir + "/translations/qtwebengine_locales/pl.pak", - "./" + distDir + "/translations/qtwebengine_locales/pt-BR.pak", - "./" + distDir + "/translations/qtwebengine_locales/pt-PT.pak", - "./" + distDir + "/translations/qtwebengine_locales/ro.pak", - "./" + distDir + "/translations/qtwebengine_locales/ru.pak", - "./" + distDir + "/translations/qtwebengine_locales/sk.pak", - "./" + distDir + "/translations/qtwebengine_locales/sl.pak", - "./" + distDir + "/translations/qtwebengine_locales/sr.pak", - "./" + distDir + "/translations/qtwebengine_locales/sv.pak", - "./" + distDir + "/translations/qtwebengine_locales/sw.pak", - "./" + distDir + "/translations/qtwebengine_locales/ta.pak", - "./" + distDir + "/translations/qtwebengine_locales/te.pak", - "./" + distDir + "/translations/qtwebengine_locales/th.pak", - "./" + distDir + "/translations/qtwebengine_locales/tr.pak", - "./" + distDir + "/translations/qtwebengine_locales/uk.pak", - "./" + distDir + "/translations/qtwebengine_locales/vi.pak", - "./" + distDir + "/translations/qtwebengine_locales/zh-CN.pak", - "./" + distDir + "/translations/qtwebengine_locales/zh-TW.pak", - "./" + distDir + "/translations/qtwebengine_pl.qm", - "./" + distDir + "/translations/qtwebengine_ru.qm", - "./" + distDir + "/translations/qtwebengine_uk.qm", - "./" + distDir + "/translations/qtwebengine_zh_CN.qm", - "./" + distDir + "/webui.sh" } ); diff --git a/tests/units/qttest.cpp b/tests/units/qttest.cpp index bf90437..fea93bc 100644 --- a/tests/units/qttest.cpp +++ b/tests/units/qttest.cpp @@ -35,20 +35,20 @@ void QtTest::test() { runTestParams({"-bin", bin, "clear" , "-qmake", qmake}, &comapareTree); -// // test auto detection of detection qmake from PATH -// runTestParams({"-bin", bin, "clear", "noCheckRPATH"}, &comapareTree); + // test auto detection of detection qmake from PATH + runTestParams({"-bin", bin, "clear", "noCheckRPATH"}, &comapareTree); -//#ifdef Q_OS_UNIX -// // test auto detection of detection qmake from RPATH -// runTestParams({"-bin", bin, "clear", "noCheckPATH"}, &comapareTree); -//#endif +#ifdef Q_OS_UNIX + // test auto detection of detection qmake from RPATH + runTestParams({"-bin", bin, "clear", "noCheckPATH"}, &comapareTree); +#endif -// comapareTree = TestModule.qtWithoutTr(); + comapareTree = TestModule.qtWithoutTr(); -// runTestParams({"-bin", bin, "clear" , -// "-qmake", qmake, "noTranslations"}, &comapareTree); + runTestParams({"-bin", bin, "clear" , + "-qmake", qmake, "noTranslations"}, &comapareTree); // comapareTree = TestModule.qmlLibs();