Re #5218. Pick up the correct qt.conf in the NSIS installer.

mantidproject · May 1, 2012 · dd096f5 · dd096f5
1 parent 720b5d5
commit dd096f5
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Code/Mantid/Build/CMake/WindowsNSIS.cmake b/Code/Mantid/Build/CMake/WindowsNSIS.cmake
@@ -34,7 +34,7 @@
 	install ( FILES ${CMAKE_LIBRARY_PATH}/Python27/python.exe ${CMAKE_LIBRARY_PATH}/Python27/python27.dll DESTINATION bin )
 
 	install ( DIRECTORY ${CMAKE_LIBRARY_PATH}/qt_plugins/imageformats DESTINATION plugins/qtplugins PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE )
-	install ( FILES ${CMAKE_LIBRARY_PATH}/qt.conf DESTINATION bin )
+	install ( FILES ${CMAKE_CURRENT_SOURCE_DIR}/Installers/WinInstaller/qt.conf DESTINATION bin )
 
 	#Handle includes
 	install ( DIRECTORY ${CMAKE_INCLUDE_PATH}/boost DESTINATION include PATTERN ".svn" EXCLUDE PATTERN ".git" EXCLUDE )
@@ -180,4 +180,4 @@
 		
 		    RMDir \\\"$INSTDIR\\\\docs\\\"
 	    ")
-	endif()
+	endif()