Win32: Include the Qt JPEG image format plugin

The Qt plugin for reading and writing JPEG images is now included in the distribution. Todo: Test it.
skyjake · Jun 15, 2012 · 7045d65 · 7045d65
1 parent 8028419
commit 7045d65
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/distrib/win32/setup.iss.template b/distrib/win32/setup.iss.template
@@ -64,6 +64,7 @@ Source: "bin\QtCore4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Component
 Source: "bin\QtGui4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\QtNetwork4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\QtOpenGL4.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
+Source: "bin\imageformats\qjpeg4.dll"; DestDir: "{app}\bin\imageformats"; Flags: ignoreversion; Components: Engine
 Source: "bin\SDL.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\eax.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine
 Source: "bin\libogg-0.dll"; DestDir: "{app}\bin"; Flags: ignoreversion; Components: Engine

diff --git a/doomsday/dep_deng2.pri b/doomsday/dep_deng2.pri
@@ -5,7 +5,7 @@ QT += core network gui opengl
 
 win32 {
     # Install the required Qt DLLs into the products dir.
-    INSTALLS *= qtlibs
+    INSTALLS *= qtlibs qtplugins
     deng_debug: qtver = "d4"
     else:       qtver = "4"
     qtlibs.files += \
@@ -14,6 +14,9 @@ win32 {
         $$[QT_INSTALL_BINS]/QtGui$${qtver}.dll \
         $$[QT_INSTALL_BINS]/QtOpenGL$${qtver}.dll
     qtlibs.path = $$DENG_LIB_DIR
+
+    qtplugins.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg4.dll
+    qtplugins.path = $$DENG_LIB_DIR/imageformats
 }
 
 macx {