Merge pull request #802 from QuasarApp/task_801

Added multimedia plugin into deploy rules

Author: EndrII

src/Deploy/src/pluginsparser.cpp

@@ -36,6 +36,7 @@ static const PluginModuleMapping pluginModuleMappings[] =
     {"audio", DeployCore::QtModule::QtMultimediaModule},
     {"mediaservice", DeployCore::QtModule::QtMultimediaModule},
     {"playlistformats", DeployCore::QtModule::QtMultimediaModule},
+    {"multimedia", DeployCore::QtModule::QtMultimediaModule},
     {"bearer", DeployCore::QtModule::QtNetworkModule},
     {"tls", DeployCore::QtModule::QtNetworkModule},
     {"networkinformation", DeployCore::QtModule::QtNetworkModule},

tests/modules/modulesqt6_5.cpp

@@ -57,6 +57,22 @@ QSet<QString> ModulesQt6_5::qmlVirtualKeyBoadrLibs(const QString &distDir) const
     TestUtils utils;
 
     auto Tree = ModulesQt6_4::qmlVirtualKeyBoadrLibs(distDir);
+
+#ifdef Q_OS_WIN
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/plugins/multimedia/ffmpegmediaplugin.dll",
+            "./" + distDir + "/plugins/multimedia/windowsmediaplugin.dll"
+        }
+        );
+#else
+    Tree += utils.createTree(
+        {
+            "./" + distDir + "/plugins/multimedia/libffmpegmediaplugin.so",
+            "./" + distDir + "/plugins/multimedia/libgstreamermediaplugin.so"
+        }
+        );
+#endif
     return Tree;
 }
 

tests/tstMain.cpp

@@ -278,6 +278,9 @@ tstMain::tstMain() {
     cqtTestPath = cqtTestPath +
                   DeployCore::getEnvSeparator() +
                   QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.6/bin/";
+    cqtTestPath = cqtTestPath +
+                  DeployCore::getEnvSeparator() +
+                  QT_BASE_DIR + "/../../Tools/QtInstallerFramework/4.7/bin/";
     qputenv("PATH", cqtTestPath.toLatin1().data());
     TestUtils utils;
 

tests/units/linux/allowemptypackagestest.cpp

@@ -30,3 +30,7 @@ void AllowEmptyPackagesTest::test() {
                    "-prefix", "package;prefix",
                    "allowEmptyPackages"});
 }
+
+QString AllowEmptyPackagesTest::testName() const {
+    return "AllowEmptyPackagesTest";
+}

tests/units/linux/allowemptypackagestest.h

@@ -18,6 +18,10 @@ class AllowEmptyPackagesTest: public TestBase, protected TestUtils
 public:
     void test() override;
 
+
+    // TestBase interface
+public:
+     QString testName() const override;
 };
 
 #endif // ALLOW_EMPTY_PACKAGES_TEST_H

tests/units/testbase.cpp

@@ -17,6 +17,10 @@ TestBase::TestBase()
 
 }
 
+QString TestBase::testName() const {
+    return typeid(*this).name();
+}
+
 int TestBase::generateLib(const QString &paath) {
     QDir dir;
     dir.mkpath(QFileInfo(paath).absolutePath());
@@ -115,13 +119,13 @@ void TestBase::checkResults(const QSet<QString> &tree, bool noWarnings, bool onl
 
         QJsonDocument doc(obj);
 
-        QFile lasttree("./LastTree.json");
+        QFile lasttree(QString("./%0_LastTree.json").arg(testName()));
         lasttree.open(QIODevice::WriteOnly| QIODevice::Truncate);
 
         lasttree.write(doc.toJson());
         lasttree.close();
 
-        lasttree.setFileName("./CompareTree.json");
+        lasttree.setFileName(QString("./%0_CompareTree.json").arg(testName()));
         lasttree.open(QIODevice::WriteOnly| QIODevice::Truncate);
 
         lasttree.write(QJsonDocument(comapreResult).toJson());

tests/units/testbase.h

@@ -15,6 +15,7 @@ class TestBase: public Test
 public:
     TestBase();
 
+    virtual QString testName() const;
     void deploytest();
     int generateLib(const QString &paath);
     void deleteLib(const QString &paath);