eric6/Project/ProjectResourcesBrowser.py

changeset 8228
772103b14c18
parent 8220
006ee31b4835
child 8235
78e6d29eb773
--- a/eric6/Project/ProjectResourcesBrowser.py	Mon Apr 12 19:05:23 2021 +0200
+++ b/eric6/Project/ProjectResourcesBrowser.py	Mon Apr 12 19:21:40 2021 +0200
@@ -648,9 +648,8 @@
         self.buf = ""
         
         if self.project.getProjectLanguage() == "Python3":
-            if self.project.getProjectType() in ["PyQt5", "PyQt5C"]:
-                self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
-            elif self.project.getProjectType() in ["E6Plugin"]:
+            if self.project.getProjectType() in ["PyQt5", "PyQt5C",
+                                                 "E6Plugin"]:
                 self.rccCompiler = Utilities.generatePyQtToolPath('pyrcc5')
             elif self.project.getProjectType() in ["PySide2", "PySide2C"]:
                 self.rccCompiler = Utilities.generatePySideToolPath(
@@ -873,11 +872,10 @@
                     return
                 if (
                     not os.path.exists(ofn) or
-                    os.stat(ifn).st_mtime > os.stat(ofn).st_mtime
+                    os.stat(ifn).st_mtime > os.stat(ofn).st_mtime or
+                    self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime)
                 ):
                     changedResources.append(fn)
-                elif self.__checkResourcesNewer(ifn, os.stat(ofn).st_mtime):
-                    changedResources.append(fn)
             progress.setValue(len(self.project.pdata["RESOURCES"]))
             QApplication.processEvents()
             

eric ide

mercurial