1 files changed, 15 insertions, 17 deletions
diff --git a/Swift/QtUI/SConscript b/Swift/QtUI/SConscript
index 6e90cd4..858df19 100644
--- a/Swift/QtUI/SConscript
+++ b/Swift/QtUI/SConscript
@@ -1,7 +1,7 @@
-import os, shutil, datetime, re, time
+import os, datetime, re, time
 import Version
 
 def generateDefaultTheme(dir) :
   sourceDir = dir.abspath
   result = "<!-- WARNING: This file is automatically generated. Any changes will be overwritten. -->\n"
   result += "<RCC version =\"1.0\">"
@@ -355,31 +355,31 @@ if env["PLATFORM"] == "darwin" :
   commonResources[""] = commonResources.get("", []) + ["#/Swift/resources/MacOSX/Swift.icns"]
   app = myenv.AppBundle("Swift", version = myenv["SWIFT_VERSION"], resources = commonResources, frameworks = frameworks, handlesXMPPURIs = True)
   if env["DIST"] :
     myenv.Command(["#/Packages/Swift/Swift-${SWIFT_VERSION}.dmg"], [app], ["Swift/Packaging/MacOSX/package.sh " + app.path + " Swift/Packaging/MacOSX/Swift.dmg.gz $TARGET $QTDIR"])
     dsym = myenv.Command(["Swift-${SWIFT_VERSION}.dSYM"], ["Swift"], ["dsymutil -o ${TARGET} ${SOURCE}"])
     myenv.Command(["#/Packages/Swift/Swift-${SWIFT_VERSION}.dSYM.zip"], dsym, ["cd ${SOURCE.dir} && zip -r ${TARGET.abspath} ${SOURCE.name}"])
-    
+
 if env.get("SWIFT_INSTALLDIR", "") :
   env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "bin"), swiftProgram + openURIProgram)
   env.InstallAs(os.path.join(env["SWIFT_INSTALLDIR"], "share", "pixmaps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm")
   icons_path = os.path.join(env["SWIFT_INSTALLDIR"], "share", "icons", "hicolor")
   env.InstallAs(os.path.join(icons_path, "32x32", "apps", "swift.xpm"), "#/Swift/resources/logo/logo-icon-32.xpm")
   env.InstallAs(os.path.join(icons_path, "scalable", "apps", "swift.svg"), "#/Swift/resources/logo/logo-icon.svg")
   for i in ["16", "22", "24", "64", "128"] :
     env.InstallAs(os.path.join(icons_path, i + "x" + i, "apps", "swift.png"), "#/Swift/resources/logo/logo-icon-" + i + ".png")
   env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "applications"), "#/Swift/resources/swift.desktop")
-  for dir, resource in commonResources.items() : 
+  for dir, resource in commonResources.items() :
     env.Install(os.path.join(env["SWIFT_INSTALLDIR"], "share", "swift", dir), resource)
-    
+
 if env["PLATFORM"] == "win32" :
   if env["DIST"] or ARGUMENTS.get("dump_trace") :
     commonResources[""] = commonResources.get("", []) + [
-        #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
+        #os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),
         #os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll"),
-        "#/Swift/resources/images",  
+        "#/Swift/resources/images",
       ]
     if env["SWIFTEN_DLL"] :
       commonResources[""] = commonResources.get("", []) + ["#/Swiften/${SWIFTEN_LIBRARY_FILE}"]
     qtplugins = {}
     qtplugins["imageformats"] = ["gif", "ico", "jpeg", "mng", "svg", "tiff"]
     qtlibs = ["QtCore", "QtGui", "QtNetwork", "QtWebKit", "QtXMLPatterns"]
@@ -389,17 +389,18 @@ if env["PLATFORM"] == "win32" :
     else :
       qtlibs += ['QtQuick', 'QtQml', 'QtPositioning', 'QtMultimedia', 'QtSql', 'QtSensors', 'QtWidgets', 'QtWebKitWidgets', 'QtMultimediaWidgets', 'QtOpenGL', 'QtPrintSupport']
       qtlibs = [lib.replace('Qt', 'Qt5') for lib in qtlibs]
       qtlibs += ['icuin51', 'icuuc51', 'icudt51', 'libGLESv2', 'libEGL']
       qtplugins["platforms"] = ['windows']
       qtplugins["accessible"] = ["taccessiblewidgets"]
-    windowsBundleFiles = myenv.WindowsBundle("Swift", 
-      resources = commonResources,
-      qtplugins = qtplugins,
-      qtlibs = qtlibs,
-			qtversion = qt_version)
+
+    windowsBundleFiles = myenv.WindowsBundle("Swift",
+         resources = commonResources,
+         qtplugins = qtplugins,
+         qtlibs = qtlibs,
+         qtversion = qt_version)  
 
   if env["DIST"] :
     #myenv.Append(NSIS_OPTIONS = [
     #    "/DmsvccRedistributableDir=\"" + env["vcredist"] + "\"", 
     #    "/DbuildVersion=" + myenv["SWIFT_VERSION"]
     #  ])
@@ -412,34 +413,31 @@ if env["PLATFORM"] == "win32" :
         for line in infile:
           for char in line.decode("utf-8") :
             if ord(char) > 127 :
               # FIXME: This is incorrect, because it only works for latin1.
               # The correct way is \u<decimal utf16 point>? , but this is more
               # work
-              outfile.write("\\'%X" % ord(char)) 
+              outfile.write("\\'%X" % ord(char))
             else :
               outfile.write(char)
           outfile.write('\\par ')
         outfile.write('}')
         outfile.close()
         infile.close()
       copying = env.Command(["Swift/COPYING.rtf"], ["COPYING"], convertToRTF)
-
       wixvariables = {
         'VCCRTFile': env["vcredist"],
-        'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + "." + str(myenv["SWIFT_VERSION_PATCH"])	
+        'Version': str(myenv["SWIFT_VERSION_MAJOR"]) + "." + str(myenv["SWIFT_VERSION_MINOR"]) + "." + str(myenv["SWIFT_VERSION_PATCH"])
       }
       wixincludecontent = "<Include>"
       for key in wixvariables:
         wixincludecontent += "<?define %s = \"%s\" ?>" % (key, wixvariables[key])
       wixincludecontent += "</Include>"
       myenv.WriteVal("..\\Packaging\\Wix\\variables.wxs", env.Value(wixincludecontent))
       myenv["WIX_SOURCE_OBJECT_DIR"] = "Swift\\QtUI\\Swift"
       myenv.WiX_Heat('..\\Packaging\\WiX\\gen_files.wxs', windowsBundleFiles + copying)
       myenv.WiX_Candle('..\\Packaging\\WiX\\Swift.wixobj', '..\\Packaging\\WiX\\Swift.wxs')
       myenv.WiX_Candle('..\\Packaging\\WiX\\gen_files.wixobj', '..\\Packaging\\WiX\\gen_files.wxs')
       myenv.WiX_Light('#/Packages/Swift/Swift-' + myenv["SWIFT_VERSION"] + '.msi', ['..\\Packaging\\WiX\\gen_files.wixobj','..\\Packaging\\WiX\\Swift.wixobj'])
-        
+
       if myenv["debug"] :
             myenv.InstallAs('#/Packages/Swift/Swift-' + myenv["SWIFT_VERSION"] + '.pdb', "Swift.pdb")
-
-