diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-30 22:59:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-07-02 11:23:45 +0200 |
| commit | e3ed2281c0c891cf3b15c95f9f7cdae42e9f233a (patch) | |
| tree | aae8da6ce616eae02b69fb1fcdcb4383c8fe6811 /configure.pri | |
| parent | 3be141d5bc199080b524d8f6f5ce514e8f74d23a (diff) | |
| parent | e75e4b39b78ba05ea2cd45dc96acf99fc89c5915 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_dragging.mm
src/plugins/platforms/ios/qiosinputcontext.mm
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/tools/androiddeployqt/main.cpp
Was moved from qttools into qtbase in 5.11.
So re-apply 32398e4d here.
tests/auto/corelib/global/qlogging/test/test.pro
tests/auto/corelib/global/qlogging/tst_qlogging.cpp
tests/auto/corelib/io/qfile/tst_qfile.cpp
tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
tests/auto/corelib/thread/qthreadstorage/test/test.pro
tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
tests/auto/widgets/kernel/qapplication/test/test.pro
Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/configure.pri b/configure.pri index f75c6c211a..5200ad1342 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 { |