Merge pull request #1707 from Be-ing/2.1_windows_build

fix 2.1 build with Qt4 on Windows
mixxxdj · Jun 11, 2018 · 786452e · 786452e
2 parents 4302cd0 + 688312e
commit 786452e
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/build/depends.py b/build/depends.py
@@ -446,8 +446,10 @@ def configure(self, build, conf):
                 build.env.Append(LIBS = 'qico')
                 build.env.Append(LIBS = 'qsvg')
                 build.env.Append(LIBS = 'qtga')
-                build.env.Append(LIBS = 'qgif')
-                build.env.Append(LIBS = 'qjpeg')
+                # not needed with Qt4
+                if qt5:
+                    build.env.Append(LIBS = 'qgif')
+                    build.env.Append(LIBS = 'qjpeg')
 
                 # accessibility plugins (gone in Qt5)
                 if not qt5: