From: duplo <duplo@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Thu, 23 Sep 2010 10:03:26 +0000 (+0000)
Subject: Remove rcc dependency. Use pyrcc4 instead, to generate the 'bertos_rc.py'
X-Git-Tag: 2.6.0~135
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=09cdc8f1ac355b000ec7ada0070f57d9714cc605;p=bertos.git

Remove rcc dependency. Use pyrcc4 instead, to generate the 'bertos_rc.py'
python module, containing the resources.



git-svn-id: https://src.develer.com/svnoss/bertos/trunk@4266 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/wizard/bertos.py b/wizard/bertos.py
index 3aa845f3..ebc91357 100755
--- a/wizard/bertos.py
+++ b/wizard/bertos.py
@@ -119,10 +119,10 @@ def main():
     app.settings = QSettings("Develer", "Bertos Configurator")
     # Development utility lines, to be removed for production
     datadir = DATA_DIR
-    qrc, rcc = os.path.join(datadir, 'bertos.qrc'), os.path.join(datadir, 'bertos.rcc')
-    if not (hasattr(sys, "frozen") and sys.frozen) and newer(qrc, rcc):
-        os.system("rcc -binary \"%s\" -o \"%s\"" %(qrc, rcc))
-    QResource.registerResource(rcc)
+    qrc, bertos_rc = os.path.join(datadir, 'bertos.qrc'), os.path.join(datadir, 'bertos_rc.py')
+    if not (hasattr(sys, "frozen") and sys.frozen) and newer(qrc, bertos_rc):
+        os.system("pyrcc4 \"%s\" -o \"%s\"" %(qrc, bertos_rc))
+    import bertos_rc
     if len(sys.argv) == 3 and sys.argv[1] == "--edit":
         editProject(os.path.abspath(sys.argv[2]))
     else: