diff options
| author | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-01-11 17:07:08 +0100 |
|---|---|---|
| committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2019-01-14 08:07:47 +0000 |
| commit | b0f84b4fff781b4656ea0b9d27c8394009d400aa (patch) | |
| tree | 64016f76e6083f6e354774eb64958acbb0489210 | |
| parent | 25a8c32e77692f6ffc5d73136cd6d74cf293e081 (diff) | |
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 <simon.hausmann@qt.io>
| -rw-r--r-- | src/createchangelog/main.go | 2 |
1 files changed, 1 insertions, 1 deletions
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() { |