diff options
author | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-12-02 13:42:49 +0200 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2019-12-02 12:02:20 +0000 |
commit | a5cbff60f063d271500e31eba5bd236741d2367b (patch) | |
tree | d36f45e85d772fc09f7d53f6b93d5d4870a66eee | |
parent | d027860201c55b686b9f8330c559f84799442d68 (diff) |
Fix configure after updating qt license filev5.14.0-rc1
License file (LICENSE.QT-LICENSE-AGREEMENT-4.0) was recently updated to
version 4.2 and that broke the configure.
Remove qt license file version number from file name to avoid configure
update need when license file is updated
Change-Id: I77b4a4e7c6e590bbbce79d1c86cbcfb965841eae
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
-rw-r--r-- | LICENSE.QT-LICENSE-AGREEMENT (renamed from LICENSE.QT-LICENSE-AGREEMENT-4.2) | 0 | ||||
-rw-r--r-- | configure.pri | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/LICENSE.QT-LICENSE-AGREEMENT-4.2 b/LICENSE.QT-LICENSE-AGREEMENT index 7be8fb5d45..7be8fb5d45 100644 --- a/LICENSE.QT-LICENSE-AGREEMENT-4.2 +++ b/LICENSE.QT-LICENSE-AGREEMENT diff --git a/configure.pri b/configure.pri index 2b8d20d607..47882afeb6 100644 --- a/configure.pri +++ b/configure.pri @@ -92,7 +92,7 @@ defineReplace(qtConfFunc_licenseCheck) { hasOpenSource = true else: \ hasOpenSource = false - exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0): \ + exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT): \ hasCommercial = true else: \ hasCommercial = false @@ -222,7 +222,7 @@ defineReplace(qtConfFunc_licenseCheck) { affix = either } } else { - theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0, lines) + theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT, lines) theLicense = $$first(theLicense) showWhat = "Type '?' to view the $${theLicense}." } @@ -249,7 +249,7 @@ defineReplace(qtConfFunc_licenseCheck) { } else: equals(val, n)|equals(val, no) { return(false) } else: equals(commercial, yes):equals(val, ?) { - licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0 + licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT } else: equals(commercial, no):equals(val, l) { licenseFile = $$QT_SOURCE_TREE/LICENSE.LGPL3 } else: equals(commercial, no):equals(val, g):$$gpl2Ok { |