diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
|---|---|---|
| committer | Ivan Komissarov <abbapoh@gmail.com> | 2021-02-19 10:57:25 +0100 |
| commit | 36f139c4f405e057baa768e4728704b22de6519d (patch) | |
| tree | 4b554ff21e92698c185d0683b50c7cd742c18817 /share/qbs/module-providers/Qt | |
| parent | 2bc823ec00cec8a1d58981710eb50ba85b4f58d7 (diff) | |
| parent | 7b50dca83a5a75a5c24b5ef329f25990daf2ff50 (diff) | |
Merge branch '1.18'
Change-Id: I4e437865514add88558f66420718bc02fb39e41d
Diffstat (limited to 'share/qbs/module-providers/Qt')
| -rw-r--r-- | share/qbs/module-providers/Qt/setup-qt.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/module-providers/Qt/setup-qt.js b/share/qbs/module-providers/Qt/setup-qt.js index a67f79d89..70acc753c 100644 --- a/share/qbs/module-providers/Qt/setup-qt.js +++ b/share/qbs/module-providers/Qt/setup-qt.js @@ -197,6 +197,8 @@ function fillEntryPointLibs(qtProps, debug) { var qtMainCandidates = ["qtmain"]; if (isMinGW && qtProps.qtMajorVersion === 5) qtMainCandidates.push("qt5main"); + if (qtProps.qtMajorVersion === 6) + qtMainCandidates.push("Qt6EntryPoint"); for (var i = 0; i < qtMainCandidates.length; ++i) { var baseNameCandidate = qtMainCandidates[i]; |