Merge http://code.haskell.org/~thielema/haddock/ into ghc-7.4

1 files changed, 7 insertions, 2 deletions

diff --git a/src/Main.hs b/src/Main.hs
index c0b7df4b..4f0784eb 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -190,6 +190,11 @@ renderStep flags pkgs interfaces = do
 render :: [Flag] -> [Interface] -> [InstalledInterface] -> SrcMap -> IO ()
 render flags ifaces installedIfaces srcMap = do
 
+  opt_qualification <-
+    case qualification flags of
+      Left msg -> throwE msg
+      Right q -> return q
+
   let
     title                = fromMaybe "" (optTitle flags)
     unicode              = Flag_UseUnicode `elem` flags
@@ -199,7 +204,6 @@ render flags ifaces installedIfaces srcMap = do
     opt_index_url        = optIndexUrl       flags
     odir                 = outputDir         flags
     opt_latex_style      = optLaTeXStyle     flags
-    opt_qualification    = qualification     flags
 
     visibleIfaces    = [ i | i <- ifaces, OptHide `notElem` ifaceOptions i ]
 
@@ -229,7 +233,8 @@ render flags ifaces installedIfaces srcMap = do
   when (Flag_GenContents `elem` flags) $ do
     ppHtmlContents odir title pkgStr
                    themes opt_index_url sourceUrls' opt_wiki_urls
-                   allVisibleIfaces True prologue pretty opt_qualification
+                   allVisibleIfaces True prologue pretty
+                   (makeContentsQual opt_qualification)
     copyHtmlBits odir libDir themes
 
   when (Flag_Html `elem` flags) $ do