diff options
| author | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-07-07 01:08:10 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2019-07-10 15:31:41 +0000 |
| commit | 4ee71d9c1e8fc6d0d12cd562a920e43c53196ece (patch) | |
| tree | bf1fc209bee004fe3e22928aad8496e744ac2c7b /share | |
| parent | 6785335b3be5be4c388fa8d967d880e19b70244c (diff) | |
ios: Move cpp.entryPoint from Qt.Core to Qt.gui
It seems, that console ios apps should not try to do a _qt_main_wrapper
trick since there's no platform plugin linked to the app and linker
fails to find wrapper.
Change-Id: I607db658d5e25d6029626b4a7efb46b2e228ab52
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/core.qbs | 4 | ||||
| -rw-r--r-- | share/qbs/module-providers/Qt/templates/gui.qbs | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/share/qbs/module-providers/Qt/templates/core.qbs b/share/qbs/module-providers/Qt/templates/core.qbs index 2c9ee9a14..98bc0c4d3 100644 --- a/share/qbs/module-providers/Qt/templates/core.qbs +++ b/share/qbs/module-providers/Qt/templates/core.qbs @@ -106,10 +106,6 @@ Module { cpp.linkerVariant: "gold" } - cpp.entryPoint: qbs.targetOS.containsAny(["ios", "tvos"]) - && Utilities.versionCompare(version, "5.6.0") >= 0 - ? "_qt_main_wrapper" - : undefined cpp.cxxLanguageVersion: Utilities.versionCompare(version, "5.7.0") >= 0 ? "c++11" : original cpp.enableCompilerDefinesByLanguage: ["cpp"].concat( qbs.targetOS.contains("darwin") ? ["objcpp"] : []) diff --git a/share/qbs/module-providers/Qt/templates/gui.qbs b/share/qbs/module-providers/Qt/templates/gui.qbs index eb69e0cad..a3c427175 100644 --- a/share/qbs/module-providers/Qt/templates/gui.qbs +++ b/share/qbs/module-providers/Qt/templates/gui.qbs @@ -1,5 +1,6 @@ import qbs.FileInfo import qbs.ModUtils +import qbs.Utilities import '../QtModule.qbs' as QtModule QtModule { @@ -50,6 +51,11 @@ QtModule { libFilePathRelease: @libFilePathRelease@ pluginTypes: @pluginTypes@ + cpp.entryPoint: qbs.targetOS.containsAny(["ios", "tvos"]) + && Utilities.versionCompare(version, "5.6.0") >= 0 + ? "_qt_main_wrapper" + : undefined + cpp.defines: @defines@ cpp.includePaths: @includes@ cpp.libraryPaths: @libraryPaths@ |