fix #371 "allow deploy plugins"

Deploy/deploycore.cpp

@@ -189,9 +189,6 @@ void DeployCore::help() {
                 {"noCheckPATH", "Disables automatic search of paths to qmake in system PATH."},
                 {"noRecursiveiIgnoreEnv", "Disables recursive ignore for ignoreEnv option."},
                 {"v / version", "Shows compiled version"},
-                {"extractPlugins", "This flag will cause cqtdeployer to retrieve dependencies from plugins. Starting with version 1.4,"
-                 " this option has been disabled by default, as it can add low-level graphics libraries to the distribution,"
-                 " which will not be compatible with equipment on users' hosts."},
                 {"allQmlDependes", "Extracts all the qml libraries. (not recommended, as it takes great amount of computer memory)"},
                 {"qif", "Create the QIF installer for deployement programm"},
                 {"qifFromSystem", "force use system binarycreator tool of qif from path or qt"},

Deploy/extracter.cpp

@@ -357,11 +357,8 @@ void Extracter::extractLib(const QString &file,
 }
 
 void Extracter::extractPluginLib(const QString& item, const QString& package) {
-    if (QuasarAppUtils::Params::isEndable("extractPlugins")) {
     extract(item, &_packageDependencyes[package]);
-    } else {
+
-        extract(item, &_packageDependencyes[package], "Qt");
-    }
 }
 
 bool Extracter::extractQmlAll() {

UnitTests/tst_deploytest.cpp

@@ -136,10 +136,6 @@ private slots:
 
     void testEmptyParamsString();
 
-
-    // extractPlugins flags
-    void testExtractPlugins();
-
     // qif flags
     void testQIF();
 
@@ -554,52 +550,6 @@ void deploytest::testWebEngine() {
 #endif
 }
 
-void deploytest::testExtractPlugins() {
-    TestUtils utils;
-
-#ifdef Q_OS_UNIX
-    QString bin = TestBinDir + "TestQMLWidgets";
-    QString qmake = TestQtDir + "bin/qmake";
-
-#else
-    QString bin = TestBinDir + "TestQMLWidgets.exe";
-    QString qmake = TestQtDir + "bin/qmake.exe";
-
-#endif
-    auto comapareTree = TestModule.qmlLibs();
-
-    runTestParams({"-bin", bin, "clear" ,
-                   "-qmake", qmake,
-                   "-qmlDir", TestBinDir + "/../TestQMLWidgets",
-                   "extractPlugins"}, &comapareTree);
-
-
-    QuasarAppUtils::Params::parseParams({"-bin", bin, "clear" ,
-                                         "-qmake", qmake,
-                                         "-qmlDir", TestBinDir + "/../TestQMLWidgets",
-                                         "extractPlugins", "deploySystem"});
-
-    Deploy deploy;
-    QVERIFY(deploy.run() == Good);
-
-    QVERIFY(DeployCore::_config);
-    QVERIFY(!DeployCore::_config->getTargetDir().isEmpty());
-
-    auto resultTree = utils.getTree(DeployCore::_config->getTargetDir());
-    auto comapre = utils.compareTree(resultTree, comapareTree);
-
-#ifdef   Q_OS_LINUX
-    QVERIFY(comapre.size());
-#endif
-    for (auto i = comapre.begin(); i != comapre.end(); ++i) {
-        if (i.value() != 1 && getFilesTree().contains(QFileInfo(i.key()).fileName())) {
-            qCritical() << "missing library found " << i.key();
-            QVERIFY(false);
-        }
-
-    }
-}
-
 void deploytest::testQIF() {
     TestUtils utils;
 #ifdef Q_OS_UNIX
@@ -1839,6 +1789,7 @@ void deploytest::testExtraPlugins() {
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlpsql.so",
                     "./" + DISTRO_DIR + "/plugins/sqldrivers/libqsqlite.so",
                     "./" + DISTRO_DIR + "/lib/libQt5Sql.so",
+                    "./" + DISTRO_DIR + "/lib/libpq.so",
 
                 });
 #else

doc/wiki

@@ -1 +1 @@
-Subproject commit 838727b12b3d1e6367dd85aa3002d68f0c505a9e
+Subproject commit 676310ff1722456eebbc57c62c73d154aa825962