fix #614

Deploy/Deploy.pro

@@ -19,7 +19,7 @@ TEMPLATE = lib
 
 DEFINES += DEPLOY_LIBRARY
 
-VERSION = 1.5.0.36
+VERSION = 1.5.0.37
 
 DEFINES += APP_VERSION='\\"$$VERSION\\"'
 

Deploy/deploycore.cpp

@@ -588,10 +588,23 @@ QString DeployCore::getMSVCVersion(MSVCVersion msvc) {
 
 QtMajorVersion DeployCore::isQtLib(const QString &lib) {
     QFileInfo info(lib);
-/*
+
+    QtMajorVersion isQt = isQtLibName(lib);
+
+    if (_config && !_config->qtDir.isQt(info.absoluteFilePath())) {
+        return QtMajorVersion::NoQt;
+    }
+
+    return isQt;
+}
+
+QtMajorVersion DeployCore::isQtLibName(const QString &lib) {
+    QFileInfo info(lib);
+
+    /*
      * Task https://github.com/QuasarApp/CQtDeployer/issues/422
      * All qt libs need to contains the Qt label.
-*/
+    */
     QtMajorVersion isQt = QtMajorVersion::NoQt;
 
     if (!isLib(info)) {
@@ -607,10 +620,6 @@ QtMajorVersion DeployCore::isQtLib(const QString &lib) {
         isQt = QtMajorVersion::Qt6;
     }
 
-    if (_config && !_config->qtDir.isQt(info.absoluteFilePath())) {
-        return QtMajorVersion::NoQt;
-    }
-
     if (isQt && QuasarAppUtils::Params::isEndable("noQt") &&
             !QuasarAppUtils::Params::isEndable("qmake")) {
         return QtMajorVersion::NoQt;

Deploy/deploycore.h

@@ -194,7 +194,20 @@ public:
     static MSVCVersion getMSVC(const QString & _qtBin);
     static QString getVCredist(const QString & _qtBin);
 
+    /**
+     * @brief isQtLib This method check full path of the library. If the @a @lib contains only name then this method retun QtMajorVersion::NoQt enum. For validate @a lib by name only use the DeployCore::isQtLibName method.
+     * @param lib This is library full path..
+     * @return major version of the Qt.
+     */
     static QtMajorVersion isQtLib(const QString &lib);
+
+    /**
+     * @brief isQtLib This method check name of the library.
+     * @param lib This is library full path..
+     * @return major version of the Qt.
+     */
+    static QtMajorVersion isQtLibName(const QString &lib);
+
     static bool isExtraLib(const QString &lib);
     static QChar getSeparator(int lvl);
     static bool isAlienLib(const QString &lib);

Deploy/libinfo.cpp

@@ -104,7 +104,7 @@ void LibInfo::setWinApi(WinAPI winApi) {
 
 QtMajorVersion LibInfo::isDependetOfQt() const {
     for (const auto& i : _dependncies) {
-        if (QtMajorVersion result = DeployCore::isQtLib(i)) {
+        if (QtMajorVersion result = DeployCore::isQtLibName(i)) {
             return result;
         }
     }

QIFData/config/configLinux.xml

@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.0.36</Version>
+    <Version>1.5.0.37</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

QIFData/config/configWin.xml

@@ -3,7 +3,7 @@
     <WizardDefaultWidth>640px</WizardDefaultWidth>
     <WizardDefaultHeight>400px</WizardDefaultHeight>
     <Name>CQtDeployer</Name>
-    <Version>1.5.0.36</Version>
+    <Version>1.5.0.37</Version>
     <Title>CQtDeployer</Title>
     <Publisher>QuasarApp</Publisher>
     <StartMenuDir>CQtDeployer</StartMenuDir>

QIFData/packages/cqtdeployer.1_5/meta/package.xml

@@ -2,7 +2,7 @@
 <Package>
     <DisplayName>CQtDeployer 1.5</DisplayName>
     <Description>CQtDeployer 1.5</Description>
-    <Version>1.5.0.36</Version>
+    <Version>1.5.0.37</Version>
     <Default>true</Default>
     <ForcedInstallation>false</ForcedInstallation>
     <Script>installscript.js</Script>

UnitTests/tst_deploytest.cpp

@@ -1465,8 +1465,8 @@ void deploytest::testMd5() {
 }
 
 void deploytest::customTest() {
-//    runTestParams({"-confFile", "path",
+    runTestParams({"-confFile", "/home/andrei/Qt/Examples/Qt-6.1.0/quick3d/build-particles3d-Desktop_Qt_6_1_0_GCC_64bit-Release/CQtDeployer.json",
-//                   "qifFromSystem"});
+                   "qifFromSystem"});
 }
 
 void deploytest::testQmlExtrct() {

snap/gui/cqtdeployer.desktop

@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.5.0.36
+Version=1.5.0.37
 Name=CQtDeployer
 Comment=CQtDeployer Help.
 Exec=cqtdeployer
@@ -10,6 +10,6 @@ Categories=Application;
 X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=CQtDeployer
 X-GNOME-Bugzilla-Component=General
-X-GNOME-Bugzilla-Version=1.5.0.36
+X-GNOME-Bugzilla-Version=1.5.0.37
 StartupNotify=true
 Name[ru_RU]=CQtDeployer

snap/snapcraft.yaml

@@ -6,7 +6,7 @@
 #
 
 name: cqtdeployer # you probably want to 'snapcraft register <name>'
-version: '1.5.0.36' # just for humans, typically '1.2+git' or '1.3.2'
+version: '1.5.0.37' # just for humans, typically '1.2+git' or '1.3.2'
 summary: deploy your qt projects # 79 char long summary
 description: |
   Console app for deploy qt libs.