diff --git a/SuperBuild/CMake/External_qt4.cmake b/SuperBuild/CMake/External_qt4.cmake
index 66377b9e980b82b52cce4fda6ce972c2a15d618a..b3bb1c780a80fa0aaab38fb0d820706599c8fe35 100644
--- a/SuperBuild/CMake/External_qt4.cmake
+++ b/SuperBuild/CMake/External_qt4.cmake
@@ -32,29 +32,35 @@ if(UNIX)
   else() #Linux
     set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -sm -xrender -xrandr -gtkstyle")
   endif()
+  set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -no-nis -no-javascript-jit -v")
+elseif(MSVC)
+  set(QT4_SB_CONFIG "${QT4_SB_CONFIG} -mp")
 endif()
 
-STRING(REGEX REPLACE "/$" "" CMAKE_WIN_INSTALL_PREFIX ${SB_INSTALL_PREFIX})
-STRING(REGEX REPLACE "/" "\\\\" CMAKE_WIN_INSTALL_PREFIX ${CMAKE_WIN_INSTALL_PREFIX})
+if(USE_SYSTEM_FREETYPE)
+  set(FT_INCLUDE ${FREETYPE_INCLUDE_DIRS})
+else()
+  set(FT_INCLUDE ${_SB_FREETYPE_INCLUDE_DIRS})
+endif()
 
-if(MSVC)
-  configure_file(
-    ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.bat.in
-    ${CMAKE_BINARY_DIR}/configure_qt4.bat
-    @ONLY)
+file(TO_NATIVE_PATH ${FT_INCLUDE} FT_INCLUDE_NATIVE)
+file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX} QT4_INSTALL_PREFIX_NATIVE)
+file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/include QT4_INCLUDE_PREFIX_NATIVE)
+file(TO_NATIVE_PATH ${SB_INSTALL_PREFIX}/lib QT4_LIB_PREFIX_NATIVE)
 
+if(WIN32)
+  set(QT4_BIN_EXT ".exe")
+  file(TO_NATIVE_PATH ${QT4_SB_SRC}/configure.exe QT4_CONFIGURE_SCRIPT)
   set(QT4_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt4.bat)
-
+  set(QT4_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.bat.in)
 else()
-  configure_file(
-    ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.sh.in
-    ${CMAKE_BINARY_DIR}/configure_qt4.sh
-    @ONLY)
-
+  set(QT4_BIN_EXT "")
+  file(TO_NATIVE_PATH ${QT4_SB_SRC}/configure QT4_CONFIGURE_SCRIPT)
   set(QT4_CONFIGURE_COMMAND ${CMAKE_BINARY_DIR}/configure_qt4.sh)
-
+  set(QT4_CONFIGURE_COMMAND_IN ${CMAKE_SOURCE_DIR}/patches/QT4/configure_qt4.sh.in)
 endif()
 
+configure_file(${QT4_CONFIGURE_COMMAND_IN} ${QT4_CONFIGURE_COMMAND} @ONLY )
 
 #Remove left over or previous installation from install prefix.
 #Existing files in install prefix was disturbing a second installation.
@@ -74,11 +80,12 @@ add_custom_target(QT4-uninstall
   COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/plugins"
   COMMAND ${CMAKE_COMMAND} -E remove_directory "${SB_INSTALL_PREFIX}/translations"
   COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/lib/libQt*"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/qmake"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/lrelease"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/moc"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/rcc"
-  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/uic"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/qmake${QT4_BIN_EXT}"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/lrelease${QT4_BIN_EXT}"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/moc${QT4_BIN_EXT}"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/rcc${QT4_BIN_EXT}"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/uic${QT4_BIN_EXT}"
+  COMMAND ${CMAKE_COMMAND} -E remove -f "${SB_INSTALL_PREFIX}/bin/libQt*"
   WORKING_DIRECTORY "${SB_INSTALL_PREFIX}"
   )
 
diff --git a/SuperBuild/patches/QT4/configure_qt4.bat.in b/SuperBuild/patches/QT4/configure_qt4.bat.in
index eb1c7be79f6ebef487eac0fe30db3a31e635a0cd..6a8fea292039abc1c90a7c81b434b15c7a6fb8d4 100755
--- a/SuperBuild/patches/QT4/configure_qt4.bat.in
+++ b/SuperBuild/patches/QT4/configure_qt4.bat.in
@@ -1,10 +1,10 @@
 set SB_SAVE_INCLUDE=%INCLUDE%
 set SB_SAVE_LIB=%LIB%
 
-set INCLUDE=%INCLUDE%;@CMAKE_WIN_INSTALL_PREFIX@\include
-set LIB=%LIB%;@CMAKE_WIN_INSTALL_PREFIX@\lib
+set INCLUDE=%INCLUDE%;@QT4_INCLUDE_PREFIX_NATIVE@;@FT_INCLUDE_NATIVE@
+set LIB=%LIB%;@QT4_LIB_PREFIX_NATIVE@
 
-configure -prefix @CMAKE_WIN_INSTALL_PREFIX@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -system-sqlite -qt-sql-sqlite -plugin-sql-sqlite -L @CMAKE_WIN_INSTALL_PREFIX@\lib -I @CMAKE_WIN_INSTALL_PREFIX@\include -no-qt3support -no-openssl -fast -no-declarative -system-libpng -no-libtiff -system-libjpeg -no-libmng -system-zlib
+@QT4_CONFIGURE_SCRIPT@ -prefix @QT4_INSTALL_PREFIX_NATIVE@ -L @QT4_LIB_PREFIX_NATIVE@ -I @QT4_INCLUDE_PREFIX_NATIVE@ -I @FT_INCLUDE_NATIVE@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative  -no-qt3support -no-xmlpatterns -system-sqlite -qt-sql-sqlite -plugin-sql-sqlite -no-openssl -no-libtiff -no-libmng -system-libpng -system-libjpeg  -system-zlib @QT4_SB_CONFIG@
 
 set INCLUDE=%SB_SAVE_INCLUDE%
 set LIB=%SB_SAVE_LIB%
diff --git a/SuperBuild/patches/QT4/configure_qt4.sh.in b/SuperBuild/patches/QT4/configure_qt4.sh.in
index 7348ab338798049759a2d72d8db8ea04c912c152..8237f12f1151de51fc7d3e8b0b49dd6c16ed03bb 100755
--- a/SuperBuild/patches/QT4/configure_qt4.sh.in
+++ b/SuperBuild/patches/QT4/configure_qt4.sh.in
@@ -1 +1 @@
-@QT4_SB_SRC@/configure -prefix @SB_INSTALL_PREFIX@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative -no-nis -no-javascript-jit -no-qt3support -no-xmlpatterns  -plugin-sql-sqlite -no-libtiff -no-libmng -system-libjpeg -system-libpng -system-zlib -system-sqlite -L @SB_INSTALL_PREFIX@/lib -I @SB_INSTALL_PREFIX@/include -I @SB_INSTALL_PREFIX@/include/freetype2 -no-openssl -no-declarative  @QT4_SB_CONFIG@ -v
+@QT4_CONFIGURE_SCRIPT@ -prefix @QT4_INSTALL_PREFIX_NATIVE@ -L @QT4_LIB_PREFIX_NATIVE@ -I @QT4_INCLUDE_PREFIX_NATIVE@ -I @FT_INCLUDE_NATIVE@ -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-audio-backend -no-webkit -no-declarative  -no-qt3support -no-xmlpatterns -system-sqlite -qt-sql-sqlite -plugin-sql-sqlite -no-openssl -no-libtiff -no-libmng -system-libpng -system-libjpeg  -system-zlib @QT4_SB_CONFIG@
\ No newline at end of file