fix libjpeg.lib name in qt4 and GDAL

SuperBuild/CMake/External_qt4.cmake

@@ -49,8 +49,14 @@ else()
       PATCH_COMMAND ${CMAKE_COMMAND} -E copy
         ${CMAKE_BINARY_DIR}/configure_qt4.bat
         ${QT4_SB_SRC}
-      DEPENDS ${${proj}_DEPENDENCIES}
-      )
+        DEPENDS ${${proj}_DEPENDENCIES} )
+
+    ExternalProject_Add_Step(${proj} _jpeg_lib_name
+      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/patches/${proj}/qjpeghandler.pri
+      ${QT4_SB_SRC}/src/gui/image/
+      DEPENDEES patch update
+      DEPENDERS configure  )
+
   else()
     ExternalProject_Add(${proj}
       PREFIX ${proj}

SuperBuild/patches/GDAL/nmake_gdal_extra.opt.in

@@ -17,7 +17,7 @@ GDAL_HOME="@CMAKE_WIN_INSTALL_PREFIX@"
 #if using an external jpeg library uncomment the follwing lines
 JPEG_EXTERNAL_LIB = 1
 JPEGDIR = @CMAKE_WIN_INSTALL_PREFIX@\include
-JPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\libjpeg.lib
+JPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\jpeg.lib
 
 #if using an external png library uncomment the follwing lines
 PNG_EXTERNAL_LIB = 1
@@ -86,7 +86,7 @@ OPENJPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\openjp2.lib
 #		$(LIBKML_DIR)/third_party\expat.win32/libexpat.lib \
 #		$(LIBKML_DIR)/third_party\uriparser-0.7.5.win32/release/uriparser.lib \
 #		$(LIBKML_DIR)/third_party\zlib-1.2.3.win32/lib/minizip.lib \
-#		$(LIBKML_DIR)/third_party\zlib-1.2.3.win32/lib/zlib.lib		
+#		$(LIBKML_DIR)/third_party\zlib-1.2.3.win32/lib/zlib.lib
 
 
 # Uncomment the following and update to enable NCSA HDF Release 4 support.
@@ -97,5 +97,4 @@ OPENJPEG_LIB = @CMAKE_WIN_INSTALL_PREFIX@\lib\openjp2.lib
 # Uncomment the following and update to enable NCSA HDF Release 5 support.
 #HDF5_PLUGIN = NO
 #HDF5_DIR =	c:\warmerda\supportlibs\hdf5\5-164-win
-#HDF5_LIB =	$(HDF5_DIR)\dll\hdf5dll.lib 
-
+#HDF5_LIB =	$(HDF5_DIR)\dll\hdf5dll.lib

SuperBuild/patches/QT4/qjpeghandler.pri

+# common to plugin and built-in forms
+INCLUDEPATH *= $$PWD
+HEADERS += $$PWD/qjpeghandler_p.h
+SOURCES += $$PWD/qjpeghandler.cpp
+contains(QT_CONFIG, system-jpeg) {
+    if(unix|win32-g++*): LIBS += -ljpeg
+    else:win32:          LIBS += jpeg.lib
+} else {
+    include($$PWD/../../3rdparty/libjpeg.pri)
+}