From 60e56f1679d69b3e7217fa77a1e2d69250ac049d Mon Sep 17 00:00:00 2001
From: Kai Koehne <kai.koehne@qt.io>
Date: Fri, 8 Jun 2018 11:41:04 +0200
Subject: Replace commercial preview license with Qt License Agreement 4.0

Do allow people to build from git using the Qt License Agreement 4.0.
The license agreement text is the same as in the installers, except
that some Unicode characters got normalized to their ASCII variants,
and things have been properly wrapped.

[ChangeLog][Licensing] The commercial preview license in the git
checkout has been replaced by the Qt License Agreement 4.0 text.
This makes it explicit that commercial customers of The Qt Company
can use the git version under commercial terms. However, support
is (still) only provided for builds from released branches of Qt.

Task-number: QTBUG-52222
Change-Id: I9e99b68e236a09610b798ba7a841e5a9d1ce6898
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 configure.pri | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

(limited to 'configure.pri')

diff --git a/configure.pri b/configure.pri
index 0512ef0144..f1c63f575d 100644
--- a/configure.pri
+++ b/configure.pri
@@ -72,7 +72,7 @@ defineReplace(qtConfFunc_licenseCheck) {
         hasOpenSource = true
     else: \
         hasOpenSource = false
-    exists($$QT_SOURCE_TREE/LICENSE.PREVIEW.COMMERCIAL)|exists($$QT_SOURCE_TREE/bin/licheck*): \
+    exists($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0): \
         hasCommercial = true
     else: \
         hasCommercial = false
@@ -128,14 +128,18 @@ defineReplace(qtConfFunc_licenseCheck) {
             qtConfFatalError("This is the Qt Open Source Edition." \
                              "Cannot proceed with -commercial.")
 
-        exists($$QT_SOURCE_TREE/LICENSE.PREVIEW.COMMERCIAL) {
+        !exists($$QT_SOURCE_TREE/.release-timestamp) {
+            #  Build from git
+
             logn()
-            logn("This is the Qt Technology Preview Edition.")
+            logn("This is the Qt Commercial Edition.")
 
-            EditionString = "Technology Preview"
-            config.input.qt_edition = Preview
+            EditionString = "Commercial"
+            config.input.qt_edition = Commercial
             export(config.input.qt_edition)
         } else {
+            # Build from a released source package
+
             equals(QMAKE_HOST.os, Linux) {
                 !equals(QMAKE_HOST.arch, x86_64): \
                     Licheck = licheck32
@@ -194,7 +198,7 @@ defineReplace(qtConfFunc_licenseCheck) {
             affix = either
         }
     } else {
-        theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.PREVIEW.COMMERCIAL, lines)
+        theLicense = $$cat($$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0, lines)
         theLicense = $$first(theLicense)
         showWhat = "Type '?' to view the $${theLicense}."
     }
@@ -221,7 +225,7 @@ defineReplace(qtConfFunc_licenseCheck) {
             } else: equals(val, n)|equals(val, no) {
                 return(false)
             } else: equals(commercial, yes):equals(val, ?) {
-                licenseFile = $$QT_SOURCE_TREE/LICENSE.PREVIEW.COMMERCIAL
+                licenseFile = $$QT_SOURCE_TREE/LICENSE.QT-LICENSE-AGREEMENT-4.0
             } else: equals(commercial, no):equals(val, l) {
                 licenseFile = $$QT_SOURCE_TREE/LICENSE.LGPL3
             } else: equals(commercial, no):equals(val, g):$$gpl2Ok {
-- 
cgit v1.2.3