From b0f84b4fff781b4656ea0b9d27c8394009d400aa Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Fri, 11 Jan 2019 17:07:08 +0100 Subject: createchangelog: use a simpler regex for .qmake.conf version The raw regex from hashicorp/go-version doesn't seem to work for some reason, even though that lib can still parse the version number after it's been extracted. Change-Id: Ib7b5d084e553987e0d7d35bb56c763ea31a8de0e Reviewed-by: Simon Hausmann --- src/createchangelog/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/createchangelog/main.go b/src/createchangelog/main.go index 3bb757e0..ebb31d6e 100644 --- a/src/createchangelog/main.go +++ b/src/createchangelog/main.go @@ -88,7 +88,7 @@ func detectCurrentQtVersionFromQMakeConf() (*version.Version, error) { return nil, fmt.Errorf("Error opening .qmake.conf - are you in the right directory?") } - moduleVersionRegExp := regexp.MustCompile(`\s*MODULE_VERSION\s*=\s*(` + version.VersionRegexpRaw + `).*`) + moduleVersionRegExp := regexp.MustCompile(`\s*MODULE_VERSION\s*=\s*([0-9\.]*).*`) scanner := bufio.NewScanner(qmakeConfFile) for scanner.Scan() { -- cgit v1.2.3