qtah-generator 0.1.0 → 0.1.1

raw patch · 3 files changed

+22/−7 lines, 3 files

Files

• qtah-generator.cabal +1/−1
• src/Graphics/UI/Qtah/Generator/Flags.hs +21/−4
• src/Graphics/UI/Qtah/Generator/Interface/Core/QList.hs-boot +0/−2

@@ -1,5 +1,5 @@ name: qtah-generator-version: 0.1.0+version: 0.1.1 synopsis: Generator for Qtah Qt bindings homepage: http://khumba.net/projects/qtah license: LGPL-3

@@ -99,13 +99,30 @@       let version = map (read :: String -> Int) strs       case version of         [_, _] -> return version-        [x] -> queryQmakeQtVersion ["-qt=" ++ show x]+        [x] -> queryQmakeQtVersion $ Just x         _ -> fail $ concat              ["qtah-generator: Internal error, incorrect parsing of QTAH_QT value ", show str, "."]-    Nothing -> queryQmakeQtVersion []+    Nothing -> queryQmakeQtVersion Nothing -  where queryQmakeQtVersion :: [String] -> IO Version-        queryQmakeQtVersion extraArgs = do+  where queryQmakeQtVersion :: Maybe Int -> IO Version+        queryQmakeQtVersion maybePreferredMajorVersion = do+          case maybePreferredMajorVersion of+            Nothing ->+              -- No major version preference, so take whatever Qt is available.+              queryQmakeQtVersion' []+            Just preferredMajorVersion -> do+              -- Even though we have a preferred major version, we don't want to+              -- run "qmake -qt=X -version" initially because we might be on a+              -- system (NixOS) where qtchooser isn't available and the only+              -- qmake available *is* the desired version.  Only pass "-qt=X" if+              -- we get the wrong default version.+              defaultVersion <- queryQmakeQtVersion' []+              case defaultVersion of+                (x:_) | x == preferredMajorVersion -> return defaultVersion+                _ -> queryQmakeQtVersion' ["-qt=" ++ show preferredMajorVersion]++        queryQmakeQtVersion' :: [String] -> IO Version+        queryQmakeQtVersion' extraArgs = do           qmakePath <- findQMake           let args = extraArgs ++ ["-version"]           (exitCode, out, err) <- readProcessWithExitCode qmakePath args ""

@@ -15,8 +15,6 @@ -- You should have received a copy of the GNU Lesser General Public License -- along with this program.  If not, see <http://www.gnu.org/licenses/>. -{-# LANGUAGE CPP #-}- -- | Bindings for @QList@. module Graphics.UI.Qtah.Generator.Interface.Core.QList (   c_QListQObject,