Fix Ubuntu build and add staticdeps hack to qt5.py.

mixxxdj · Jun 8, 2016 · c7b8529 · c7b8529
1 parent 37995c2
commit c7b8529
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/build/qt4.py b/build/qt4.py
@@ -846,7 +846,7 @@ def locateQt4Command(env, command, qtdir) :
         from SCons.Script.SConscript import SConsEnvironment
         SConsEnvironment.EnableQt4Modules = enable_modules
 
-def enable_modules(self, modules, staticdeps, debug=False, crosscompiling=False) :
+def enable_modules(self, modules, debug=False, crosscompiling=False, staticdeps=False) :
     import sys
 
     validModules = [

diff --git a/build/qt5.py b/build/qt5.py
@@ -860,7 +860,7 @@ def locateQt5Command(env, command, qtdir) :
         from SCons.Script.SConscript import SConsEnvironment
         SConsEnvironment.EnableQt5Modules = enable_modules
 
-def enable_modules(self, modules, debug=False, crosscompiling=False) :
+def enable_modules(self, modules, debug=False, crosscompiling=False, staticdeps=False) :
     validModules = [
         # Qt Essentials
         'QtCore',
@@ -905,6 +905,8 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
     ]
     staticModules = [
     ]
+    if sys.platform == "win32" and staticdeps :
+        staticModules.extend(validModules)
     invalidModules=[]
     for module in modules:
         if module not in validModules :